Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports several Unathi and Skrell hair from Neb and Bay #9170

Merged
merged 4 commits into from
Aug 5, 2023

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Jul 23, 2023

  • Ports a split tendrils state for Skrell from Nebula, which I believe came from a downstream fork. I'm not sure of the original source.
  • Ports several horn and frill styles from Bay, with conversion to match Polaris' colour ramp. I believe most of these were done by Azlan. These are Pawn's work originally.

@MistakeNot4892
Copy link
Contributor Author

CI fail is unrelated.

@Sypsoti
Copy link
Contributor

Sypsoti commented Jul 24, 2023

Thumbs up from Unathi maintainer.

@Atermonera Atermonera added the Feature The PR adds new functionality in some way. label Aug 5, 2023
@Atermonera Atermonera merged commit 0c3f01c into PolarisSS13:master Aug 5, 2023
github-merge-queue bot pushed a commit to Aurorastation/Aurora.3 that referenced this pull request Oct 8, 2023
Coroneljones added a commit to Coroneljones/New-Horizons-JonesDev that referenced this pull request Nov 13, 2023
* Automatic Changelog compile [ci skip]

* a (#17371)

* Automatic Changelog compile [ci skip]

* Intro Text Tweak (#17352)

* Automatic Changelog compile [ci skip]

* TGUI Flavour Text (#17363)

* TGUI Flavour Text

* cl

* we love linetrs

* Automatic Changelog compile [ci skip]

* Ta Shroud Raising (#17351)

* Ta Shroud Raising

* sprite back

* Automatic Changelog compile [ci skip]

* Moves Polos from Undershirts to Loadout (#17349)

* graves

* shadow

* Update shirts.dm

* ac130

* shadow 01

* Update html/changelogs/CampinKiller24-polo.yml

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/client/preference_setup/loadout/items/accessories.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/client/preference_setup/loadout/items/accessories.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/client/preference_setup/loadout/items/accessories.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/client/preference_setup/loadout/items/accessories.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/clothing/under/accessories/shirts.dm

Co-authored-by: SleepyGemmy <[email protected]>

---------

Co-authored-by: SleepyGemmy <[email protected]>

* Automatic Changelog compile [ci skip]

* Tajara loadout expansion: far from home edition (#17270)

* A lot of tajaran stuff

* Changelog

* moved this for better organization

* god fix

* Update code/modules/clothing/rings/xeno/tajara.dm

Co-authored-by: Cody Brittain <[email protected]>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <[email protected]>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <[email protected]>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <[email protected]>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <[email protected]>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <[email protected]>

* Flame source

* imrpoper

* passport

* matt fixes

* Fixes conflict

* fixes

* kitchen

---------

Co-authored-by: Cody Brittain <[email protected]>

* Automatic Changelog compile [ci skip]

* Tajara religious loadout fixes (#17395)

* Loadout fixes

* changelog

* Automatic Changelog compile [ci skip]

* Observable move not unregistering correctly  fix (#17387)

* Atomization

* oh the irony

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Automatic Changelog compile [ci skip]

* Adds the Dionae Xrimsong accent (#17370)

* Adds the xrim accent icon

* Adds the code for the xrimsong accent

* Makes the xrimsong accent an option for the xrim culture

* adds the define for xrimsong

* changelog

* fixes description being desc

* Automatic Changelog compile [ci skip]

* Horizon's shuttles' navpoints moved to be at their airlocks & Automatic/clearing shuttle landmark updated (#17375)

* intrepid

* a

* c

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Assorted Bug Fixes (#17399)

* Automatic Changelog compile [ci skip]

* Third deck generic docks fixed to new standard (#17377)

* a

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Grab Stuff (#16337)

* Grab Stuff

* Extra Stuff

* typo on main

* matt changes

* update cl

* Automatic Changelog compile [ci skip]

* No Free Loadout Items (#17405)

Increases the cost of all free loadout items to 1.

Currently all loadout items in all possible loadout variants (3) are json_encoded into a single string.
Somewhere along the way to the db server the query string is cut off after a certain length.
-> Thats why we have a limit of 3 loadout variants and dont allow 0 point loadout items as they can cause errors when saving due to exceeding that query string length.

Co-authored-by: Werner <[email protected]>

* Automatic Changelog compile [ci skip]

* InUs Game-Helm Upgrade (#15684)

* InUs Game-Helm Upgrade

* forgor

* bribed

* Automatic Changelog compile [ci skip]

* a (#17410)

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* More spacemandmm harnessing against bad code (#17376)

* sdfaf

* ssdasd

* dfsd

* try to apply a linter to spot violations of editorconfig

* sfdas

* asf

* sadfas

* sfasf

* asfsda

* sdaf

* sfsad

* totally not for testing

* aaaaaaaaaaaaaaa

* asfsadf

* saf

* sdfaf

* Automatic Changelog compile [ci skip]

* [WORK IN PROGRESS] Konyang and Point Verdant (#16714)

* starting point verdant

* major progress

* PAIN

* test

* zlevels AAGHHH OH NO

* im scream

* kawnyang

* dam thats good

* Biff Largehuge

* Look Gordon, ropes!

* wawagh

* rgrhgrhrgrh

* Gordon, you're alive! Thank God for that hazard suit.

* help

* frownie face

* wegh

* Gordon! Get away from the beams!

* Good morning, Gordon.

* Signs

* fix multiple proc definition

* initial ambience

* gay rain

* beach and some pebbles literally

* fixing conflicts aUGH

* generation

* guh?

* sewers and beach additions

* maping

* map

* womp womp

* landing zone

* fixing missing shit

* buddha

* ass

* major map updates

* implemented key doors, fixed baloon alert and tasks

* mineral color, adds ozone layer

* real fake walls

* vending subtypes for the regional market

* mooooar

* minimart pt 1

* haneunim skybox

* station mapping progress

* minimart and roboclinic

* offices progress

* bar work

* size change, some polishing of the office + police station

* map size update. Also a fuckton

* tunnels

* more work

* Why doesnt the map initialize

* broke shit

* fixing point verdant spawning, also ocean landing zone

* finishing some buildings

* mapping, village, not finished

* village, main road

* village stuff

* village stuff

* village stuff

* village stuff

* anchoring

* village stuff

* random space tiles fix

* random space tiles fix

* bin fixes

* missing initialize hint on new floors

* fix open space on basement level

* idk

* missing initialize hint

* tests again please

* tests rerun please

* oven/small be gone

* remove shuttle landmarks idk

* bad stairs fix maybe

* fix missing open space above stairs

* tests rerun please

* CircularRandomTurfAround fix

* spaces to tabs

---------

Co-authored-by: atteria <[email protected]>
Co-authored-by: Fluffy <[email protected]>
Co-authored-by: DreamySkrell <[email protected]>

* Fixed ZASDBG, Added ZAS logging subsystem, Removed FIREDBG and consolidated it under ZASDBG (#17386)

* Atomization

* asfsa

* sdaf

* sdfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Automatic Changelog compile [ci skip]

* Economic Status: Ruined  (#17227)

* Update mobs.dm

* Update game_mode.dm

* Update job.dm

* Update job.dm

* Update mobs.dm

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Add files via upload

* Update HanSolo1519-PR-#17227.yml

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: Fluffy <[email protected]>

* Add files via upload

* Update and rename V075_ruined_economic_status.sql to V002__ruined_economic_status.sql

* Delete SQL/migrate/V002__ruined_economic_status.sql

* Add files via upload

* Fix PR Number

---------

Co-authored-by: SleepyGemmy <[email protected]>
Co-authored-by: Fluffy <[email protected]>

* Automatic Changelog compile [ci skip]

* Merchant shuttle landmarks updated to newest standard (#17378)

* huhh

* a

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* asfas (#17421)

* Automatic Changelog compile [ci skip]

* Makes konyang not always spawn (#17423)

* Various Minor Fixes/Backend-Changes (#17419)

* Removes the dynamic maps system

* Adds some basic doc strings to the gear tweaks / Fix startup lag

* Adds the pull request labeler to (partially) replace the bot

* Changelog

* Fix spelling mistake

* Fix compile error
Add javascript and sounds to labeler

* Log Query during SQL Errors

* Use log_sql for sql connection errors

* Fix extra space in dbcore

* Fix mapping label names

---------

Co-authored-by: Werner <[email protected]>

* Automatic Changelog compile [ci skip]

* a (#17414)

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Fixes a few organ mending surgery oddities. (#17404)

* Fixes a few organ mending surgery oddities.

* ssss

---------

Co-authored-by: Matt Atlas <[email protected]>

* Automatic Changelog compile [ci skip]

* The Food Sortening, Extra Pain-In-My-Ass Edition (#17393)

* The Food Sortening, Extra Pain-In-My-Ass Edition

Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.

Planning to add more shit down the line. Makes everyone's lives easier.

* changelol

* finally

* inhands

* merge conflict

* this really "ticked" me off HAHAHAHAHS

* fixes

* make megalinter happy

* Automatic Changelog compile [ci skip]

* New Cell Charger, Suit Storage, Drying Rack and Smartfridge Sprites (#17390)

* New Cell Charger, Suit Storage and Smartfridge Sprites

title, ported from /tg/

* Update wezzy-RandomBetterSprats.yml

* oops

* merge conflict

* konyang shit

* Automatic Changelog compile [ci skip]

* Implant Improvements (#16905)

* Modernize and improve implant code

* Lint fix

* Fix initialize hint in implant cases

* fix tabulations

---------

Co-authored-by: Fluffy <[email protected]>

* Automatic Changelog compile [ci skip]

* Fix labeler - changelog required (#17434)

Co-authored-by: Werner <[email protected]>

* Unto The Somewhat Known - The Coalition Survey Ship (#17314)

* repath & surveyor map

* surveyor code

* survey ship 3

* mining conveyor fix

* conveyor fix 2

* sectors

* real airlock!

* docking port

* directional landmark

* plating -> airless

* grauwolf gaming

* plating & ship guns

* firedoor

* Automatic Changelog compile [ci skip]

* Nerfs .45 bullets and buffs 9mm bullets. (#17406)

* Nerfs .45 bullets and buffs 9mm bullets.

* whoops

---------

Co-authored-by: Matt Atlas <[email protected]>

* Automatic Changelog compile [ci skip]

* Updates tools/hooks & Fixes mapmerge2 (#17416)

* a

* python ver

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Halves blood loss from lasers. (#17407)

Co-authored-by: Matt Atlas <[email protected]>

* Automatic Changelog compile [ci skip]

* sfas (#17446)

* Automatic Changelog compile [ci skip]

* Tarwa Conglomerate Diona Limbs (#17316)

* lets fucking go

* tarwa limbs 2

* fixes var overlap

* Update maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa_ghostroles.dm

Co-authored-by: Fluffy <[email protected]>

---------

Co-authored-by: Fluffy <[email protected]>

* Automatic Changelog compile [ci skip]

* Diona / Nymph language learning and messages (#16266)

* Changes + changelog

* sfa

* sdaf

* Automatic Changelog compile [ci skip]

* Examinable Armor (#17364)

* Examinable Armor

* horse react this linter

* me coder

* changes

* Update tgui/packages/tgui/interfaces/ArmorValues.tsx

Co-authored-by: Matt Atlas <[email protected]>

* capitalize

* cl newline

---------

Co-authored-by: Matt Atlas <[email protected]>

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant northern edge (#17431)

* a

* b

* a

* a

* tests rerun please

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* asdf (#17447)

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant Pharmacy (#17433)

* a

* a

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Hivenet Electronic Warfare + Black K'ois Tweaks (#17234)

* hivenet emergency transmission

* no phoron + harder to remove

* a fuckton of stuff

* hive verbs

* hive admin verbs

* admin verbs again

* encrypt

* mute

* Camera Access, Neural Shock & More

* electronic warfare

* changelog

* changelog 2

* more changelog updates

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Cody Brittain <[email protected]>

* Update html/changelogs/RustingWithYou - willofthequeens.yml

Co-authored-by: Cody Brittain <[email protected]>

* test failures begone

* ok, now test failures begone

* addresses requested changes

* more requested changes

* missing span classes

* fullshield

* traits!

* addresses requested changes

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>
Update code/modules/admin/topic.dm

Co-authored-by: SleepyGemmy <[email protected]>
addresses requested changes

* Update code/modules/mob/living/carbon/human/human_powers.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>

* hivenet checks to proc, admin socket to var

* Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <[email protected]>

* parasite.dm span fixes

* spacing

* purge a couple unnecessary returns

* fuck your spaces

* dominia is right bots should be destroyed

---------

Co-authored-by: Cody Brittain <[email protected]>
Co-authored-by: SleepyGemmy <[email protected]>

* Automatic Changelog compile [ci skip]

* Fixes Examine Crashes (#17430)

* Fixes Examine Crashes

* fukken indentations

* Automatic Changelog compile [ci skip]

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA (#17463)

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Icon smoothing subsystem update (#17383)

* sfasdf

* sfsaf

* sadfas

* sdfasdf

* Automatic Changelog compile [ci skip]

* Glass sliding doors for urban maps (#17448)

* doors

* adjustments and fix

* Automatic Changelog compile [ci skip]

* this is why we test (#17466)

* Automatic Changelog compile [ci skip]

* Refactored do_after to use a flag-based system for options (#17127)

* Refactored do_after to use a flag-based system for options

* More flags

* Ditto

* Use the HAS_FLAG macro

* do_after pass

* Fix burning paper code

* Resolve issues from Fluffy's code reviews

* .

* Automatic Changelog compile [ci skip]

* Abandoned Industrial Station: post-3/4 fixes (#17331)

* mapping

* floor_damage defs

* random_broken

* floor damage

* mapping

* changelog

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Mining Vendor TGUI (#17426)

* Mining Vendor TGUI

* nice

* Update tgui/packages/tgui/interfaces/MiningVendor.tsx

Co-authored-by: Wowzewow (Wezzy) <[email protected]>

---------

Co-authored-by: Wowzewow (Wezzy) <[email protected]>

* Automatic Changelog compile [ci skip]

* Adds Pleig's custom item (#17413)

* Adds Pleig's custom item

* Changes Raqa'Nuul fluff + sprite to more generic Lyukal

* langechog

* icon state fix

* Automatic Changelog compile [ci skip]

* Shuttle & Dock Guidelines (#17392)

* docks

* shuttles

* a

* a

* a

* a

* a

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* epic fail fix

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant Robotics Clinic (#17445)

* Konyang: Point Verdant, east docks, sewers closed off (#17452)

* Automatic Changelog compile [ci skip]

* Antag shuttle landmarks fixed to newest standard (#17455)

* merc

* burglar

* raider

* a

* c

* a

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Docking Controller TGUI (#17435)

* Docking Controller TGUI

* linmter

* Automatic Changelog compile [ci skip]

* Hivenet Admin Fix (#17468)

* fixes available_vaurca

* changelog

* Automatic Changelog compile [ci skip]

* a (#17464)

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* CCIA Variable Fax Stamp Text (#17444)

Allows CCIA to use a customizable Test for the "This paper has been stamped..."-Text on the faxes.

Co-authored-by: Werner <[email protected]>

* Automatic Changelog compile [ci skip]

* Mining Coin Tweak (#17441)

* Automatic Changelog compile [ci skip]

* Sprite and Bug Fixes Again Again (#17477)

* Sprite and Bug Fixes Again Again

Fixes #17465
Fixes #17462
Fixes #17456
Fixes #17450
Fixes #17458
Fixes #17422

* changelog

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant west edge bridge (#17453)

* a

* c

* a

* tests rerun please

* w

---------

Co-authored-by: DreamySkrell <>

* TGUI Mining Processor (#17428)

* TGUI Mining Processor

* cl

* Apply suggestions from code review

Co-authored-by: Wowzewow (Wezzy) <[email protected]>

* Update code/modules/mining/machine_processing.dm

Co-authored-by: Wowzewow (Wezzy) <[email protected]>

---------

Co-authored-by: Wowzewow (Wezzy) <[email protected]>

* Automatic Changelog compile [ci skip]

* hivenet broadcasting fix (#17469)

* Automatic Changelog compile [ci skip]

* Remove Megalinter (#17480)

Primarily putting that PR up for discussion.
Megalinter is currently only used to check if the indentation of the files aligns with the editorconfig

Co-authored-by: Werner <[email protected]>

* Help Emote Tweak (#17457)

* Automatic Changelog compile [ci skip]

* Escape Pod Escapes (#17436)

* Escape Pod Escapes

* changelog newline

* she merge on my artifact till i changelog required

* Automatic Changelog compile [ci skip]

* Shuttle TGUI (#17432)

* Shuttle TGUI

* eqeqeq

* escapeescapeescape

* bawkses

* linter

* Automatic Changelog compile [ci skip]

* Mining Vendor Equipment Fix (#17478)

* Automatic Changelog compile [ci skip]

* Docking Controller Fix (#17491)

* Ground Ore Fix (#17486)

* Automatic Changelog compile [ci skip]

* Mining Machine ID Fix (#17490)

* Automatic Changelog compile [ci skip]

* Updates subsystem definitions to new standards. (#17470)

* My heart is dragging me down into...

...oblivion!

* drifting closer to the edge but she won't have me

* ever round me we are dead before we meet her

* for the last time

* wake up in sweat

* n

* fff

* uff

---------

Co-authored-by: Matt Atlas <[email protected]>

* Automatic Changelog compile [ci skip]

* god gives his tiniest fixes to his shittiest coders (#17494)

* Automatic Changelog compile [ci skip]

* Chips Expansion (#17343)

* TAKE 3

* newline

* Automatic Changelog compile [ci skip]

* Added NanoTrasen Corporation gear to the uplink for antagonist usage. (#17153)

* Added NanoTrasen Corporation gear for antagonist usage.

Correct description of hardsuit armor value

* Fix Indents

---------

Co-authored-by: Cody Brittain <[email protected]>

* Automatic Changelog compile [ci skip]

* Mining Vendor Tweak (#17489)

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant Corporate Offices (#17499)

* a

* n

* a

* a

* c

* o

* a

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Updated CI to use byond 515.1616 (#17483)

* sdfa

* das

* 1616

* Ore Detector Tweaks (#17488)

* Ore Detector Tweaks

* yippee

* Automatic Changelog compile [ci skip]

* HoS skrellmet (#17472)

* Test

* aaaaa

* Tweak1

* Argh

* SPAAAACE!

* Automatic Changelog compile [ci skip]

* Kinetic Accelerator Kit (#17496)

* Konyang: Point Verdant Police Station (#17460)

* Automatic Changelog compile [ci skip]

* Mechs runtime (#17508)

* Atomization

* sdsda

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* The Visible Hand - Golden Deep Merchant Ship (#17424)

* golden deep ship skeleton

* more gold

* files & access

* i fucking love gold, i fucking love capitalism

* sectors & fluff

* changelog

* more drip

* whoops

* ENTRY POINTS

* some changes

* airlocks

* grates

* hallway & dock changes

* fixes dock unit test

* switches misplaced docks

* Automatic Changelog compile [ci skip]

* Fixes some bad air tiles on a old asteroid ruin (#17506)

* 1

* 2

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Fixes mapdiffbot2 not rendering maps properly (#17521)

* toml

* cryingf

* Revert "cryingf"

This reverts commit 62802d341d90bef00b834bc349a56971ad2b1081.

* changelog

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Motioncameras refdrop more (#17507)

* Atomization

* fsda

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Automatic Changelog compile [ci skip]

* Small Horizon Map Fixes (#17519)

* Map Changes + Changelog

* Xenoarchaeology Atmos Fixes

* APC + Fire Alarm + Air Alarm Fixes

* Coalition Surveyor Map Fixes (#17518)

* Map Changes + Changelog

* Replaced all APCs with proper presets.

* sdafa (#17516)

* FIND_REF_NO_CHECK_TICK loopchecks disable (#17515)

* Atomization

* sdfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Off-Duty crew now spawn with their faction gear (#17500)

Co-authored-by: Cody Brittain <[email protected]>

* Fix indentations (#17481)

* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda

* Adds Stinger Grenades (#17474)

* balls

* lint this

* lint deez

* le change

* Update stinger.dm

* i am going to murder the new linter

* sprite

* Update CampinKiller24-ready-or-not.yml

* Xenobiology serum sprite fixes/changes (#17529)

* xenobiology serum sprite fixes

* sets item_state

* the contained_spritening

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant Sake Brewery (#17502)

* g

* m

* 8

* 9

* 0

* Update code/game/objects/random/food.dm

Co-authored-by: Alberyk <[email protected]>

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Alberyk <[email protected]>

* Konyang: Point Verdant Fake Metro (#17503)

* a

* a

* 1

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Adds smaller variants of the Vaurca Mecha Eyes; allows for color customization (#17479)

* adds normal-sized mecha eyes + removes rogue pixels

* changelog

* Implements Roostercat's suggestion

* langechog update

* darkens the eyes a bit

* Automatic Changelog compile [ci skip]

* Ruined COC Relay Station (#17485)

* coc relay station

* areas, fuck

* oops

* i fucking hate dmes

* fuck you stev

* cock removal

* Energy Rifle Buff (#17498)

Co-authored-by: Cody Brittain <[email protected]>

* Pump Action KAs (#17484)

* Pump Action KAs

* Update code/modules/custom_ka/cells.dm

Co-authored-by: Fluffy <[email protected]>

---------

Co-authored-by: Fluffy <[email protected]>

* Automatic Changelog compile [ci skip]

* Mechs screen refdrop (#17511)

* Atomization

* sfaasf

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Automatic Changelog compile [ci skip]

* Exosuit Clamp Tweak (#17492)

* Automatic Changelog compile [ci skip]

* Cult buffs. (#17373)

* Cult buffs.

* Update code/game/gamemodes/cult/structures/altar.dm

Co-authored-by: Fluffy <[email protected]>

---------

Co-authored-by: Matt Atlas <[email protected]>
Co-authored-by: Fluffy <[email protected]>

* Automatic Changelog compile [ci skip]

* Hostile mobs runtime fix (#17513)

* Atomization

* sadf

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Added old and antique Biesel flags (#17170)

* Added old and antique Biesel flags

Update lore desc to make clear, that displaying something that is a direct threat to the SCC is a -very- bad move.

* Add the antique flag to the loadout

---------

Co-authored-by: Cody Brittain <[email protected]>

* Automatic Changelog compile [ci skip]

* MMI QDEL brain (#17512)

* Atomization

* sdafasfd

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Automatic Changelog compile [ci skip]

* Adds teleporter beacon to Canary (#17473)

* Hijack no more

* Test

* Automatic Changelog compile [ci skip]

* Drill Dropper Shortwave (#17442)

* Automatic Changelog compile [ci skip]

* Unathi Origin Traits & Accent Stuff (#17358)

* lizard origin traits and accent expansion

* Update code/modules/background/origins/origins/unathi/queendom.dm

Co-authored-by: SleepyGemmy <[email protected]>

* Update code/modules/background/origins/origins/unathi/traditionalist.dm

Co-authored-by: SleepyGemmy <[email protected]>

---------

Co-authored-by: SleepyGemmy <[email protected]>

* Uplink tgui (#17336)

* add uplink.tsx

* a

* a

* a

* a

* a

* exploitables

* close gui

* a

* delete uplink.tmpl

* 1

* ooooooooooooooooooooooooo

* lint

* c

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Ports the fusion reactor from Baystation12, replacing the Tesla. (#17415)

* There's no tomorrow

Life is but an echo

* delirious

* the fire burns within me yet again

* OBLIVIOOOOOOOOOOOOON

* too weary to die

* ffff

* Finished R-UST map

* fusion core ui improvements

* mais tu me tue!

* drag me down

* take me in

* fix that wire

* cl

* R-UST -> INDRA

* cc

* UTs

* sss

* thanks mapdiff

* sd

---------

Co-authored-by: Matt Atlas <[email protected]>
Co-authored-by: shaky-jake <[email protected]>
Co-authored-by: ShakyJake <[email protected]>

* Automatic Changelog compile [ci skip]

* Better Bodyscanners and Surgery Stuff  (#17520)

* Better Bodyscanners and Surgery Stuff

* ope

* i can't believe that worked

* adv

* bodyscanner fixes

* Automatic Changelog compile [ci skip]

* Add summoning stone user to antags list. (#17544)

This way they won't get instabilitied to death

Aurorastation/Aurora.3#17085

* Fixes Vaurca mecha eye offset (#17533)

* Golden Deep Map Tweaks & Fixes (#17525)

* fixes

* changelog

* Added a Gadpathurian variant of the vulture voidsuit (#17523)

* Added a Gadpathurian variant of the vulture voidsuit

* CL

* Vulture suit lore (also applies to the Gadpathur variant)

---------

Co-authored-by: Cody Brittain <[email protected]>

* Atmospherics N2O Tweak, and Engine Room Lights (#17517)

* Map Changes

* Changelog

* Tribute for the CI Suite

* I sure hope this fixes the conflict and doesn't break anything

* Merge Conflict Repair part 2

* Automatic Changelog compile [ci skip]

* Ports Unathi hairstyles + tails, removes human hair (#17527)

* Ports Unathi hairstyles + tails

Sources: VOREStation/VOREStation#14614 PolarisSS13/Polaris#8754 PolarisSS13/Polaris#9170

* reinstates the mohawk

* Automatic Changelog compile [ci skip]

* Flags fix and minor refactor (#17543)

* Atomization

* afsd

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Add support for Bay-style terminals (which lack holographic features) (#17522)

CL

Co-authored-by: Cody Brittain <[email protected]>

* Adds an Expeditionary Channel and Intercoms & Gives the Interrogation Channel a Name (#17296)

* Expedition Comms

* mistyped

* Adds hailing to expedition intercomms

* Colour Change

* Forgot light mode

* ui fix

* Automatic Changelog compile [ci skip]

* unathi clothing availability (#17524)

* Automatic Changelog compile [ci skip]

* INDRA Map Bugfixes (#17556)

* Map Changes + Changelog

* Gas Sensor id_tag Fix

* Gas Injector id_tag Fix

* Update furrycactus-indra-map-tweaks.yml

* Gas Injector/Sensor Tweak, Addition of a Console

* I think it actually worked this time

* Test

* Adjusted Airlock Codes

* Automatic Changelog compile [ci skip]

* Ports tgstation geiger counter sprite (#17530)

Source: tgstation/tgstation#78236

* Automatic Changelog compile [ci skip]

* Konyang: PACHROM Water Barge (#17535)

* water barge

* changelog

* docking port changes

* smaller

* addresses requested changes

* fixes the fuckin uhhhh thing

* Automatic Changelog compile [ci skip]

* Tarwa medbay minor additions. (#17505)

* a

* b

* Automatic Changelog compile [ci skip]

* Map Changes + Changelog (#17561)

* Cultist teleport rune improvements (#17557)

* Cultist teleport rune improvements

* Add network message to tp talisman, add a space

* Changelog change

* grammar, sorry ci bots :(

* indent

* actually embed the message..

* use SPAN_CULT, add default value to is_rune

* Flags fix overlooked addition (#17559)

* Atomization

* asfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>

* Automatic Changelog compile [ci skip]

* Konyang: Uniforms (#17541)

* konyang uniforms

* lieutenant uniform

* sprite names

* Tajara can now select pronouns (#17538)

* Adds pronouns

* Fix

* Konyang: Away Site Spawning & Planet Tweaks (#17539)

* konyang & point verdant tweaks

* changleog

* city poi icon

* Flagpatches on sleeves : Sleevepatches (#17440)

* Flagpatches on sleeves : Sleevepatches

Adds the ability to use the flip verb so you can wear flagpatches on your sleeve. No, I'm not making an entirely new verb.

* indent

* cooked

* Automatic Changelog compile [ci skip]

* Konyang: Point Verdant Maint/Janitorial (#17532)

* a

* c

* 6

* 5

---------

Co-authored-by: DreamySkrell <>

* Automatic Changelog compile [ci skip]

* Modular system framework

Signed-off-by: INKVD <[email protected]>

* I forgot to gitkeep this one.

* Redo  PR template &  how changelog is generated.

* Epic typo moment

* Revert several chemical details back to their real life counterparts.

* Requested changes

* Cut out more exceptions

* Revert "Revert "Adrenaline Sac Rebalancing (#16936)""

* Revert "Revert "Revert "Adrenaline Sac Rebalancing (#16936)"""

This reverts commit c073a6a.

---------

Signed-off-by: INKVD <[email protected]>
Co-authored-by: AuroraBuildBot <[email protected]>
Co-authored-by: DreamySkrell <[email protected]>
Co-authored-by: Geeves <[email protected]>
Co-authored-by: CampinKiller24 <[email protected]>
Co-authored-by: SleepyGemmy <[email protected]>
Co-authored-by: Alberyk <[email protected]>
Co-authored-by: Cody Brittain <[email protected]>
Co-authored-by: Fluffy <[email protected]>
Co-authored-by: Yonnimer <[email protected]>
Co-authored-by: Wowzewow (Wezzy) <[email protected]>
Co-authored-by: Werner <[email protected]>
Co-authored-by: Werner <[email protected]>
Co-authored-by: kyres1 <[email protected]>
Co-authored-by: atteria <[email protected]>
Co-authored-by: HanSolo1519 <[email protected]>
Co-authored-by: Matt Atlas <[email protected]>
Co-authored-by: Matt Atlas <[email protected]>
Co-authored-by: RustingWithYou <[email protected]>
Co-authored-by: Greenjoe12345 <[email protected]>
Co-authored-by: feartheblackout <[email protected]>
Co-authored-by: Cody Brittain <[email protected]>
Co-authored-by: Snowy1237 <[email protected]>
Co-authored-by: Joshie <[email protected]>
Co-authored-by: Pirouette <[email protected]>
Co-authored-by: shaky-jake <[email protected]>
Co-authored-by: ShakyJake <[email protected]>
Co-authored-by: AlaunusLux <[email protected]>
Co-authored-by: Sparky <[email protected]>
Co-authored-by: INKVD <[email protected]>
Co-authored-by: INKVD <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature The PR adds new functionality in some way.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants