3591 individual conflicts
Update build.js
Update install_node.sh
Update byond.js
oh my fucking god
hat
slow
huh
holy shit
we all fall down
2 more I missed
2900 individual conflicts
2700 Individual conflicts
replaces yarn file with tg version, bumping us down to 2200-ish
Down to 2000 individual conflicts
140 down
mmm
aaaaaaaaaaaaaaaaaaa
not yt
575
soon
900 individual conflicts
600 individual conflicts, 121 file conflicts
im not okay
160 across 19 files
29 in 4 files
0 conflicts, compiletime fix time
some minor incap stuff
missed ticks
weird dupe definition stuff
missed ticks 2
incap fixes
undefs and pie fix
Radio update and some extra minor stuff
returns a single override
no more dupe definitions, 175 compiletime errors
Unticked file fix
sound and emote stuff
honk and more radio stuff
* scream if you love poland !!!!
* oh yeah its all coming together
* WAR
* dme fixes before i break everything
* f1
* WHAGG
* expect more similarly poorly named commits in the future
* war pt 2
* ooprs
* sharpshooter icon fix
* that should be everything actually
* i forgot demo mod exists
* deletes now unused ak ammo
* thats not real anymore
* every test failure ever
* reduces the weapon weight of the bobr
* tweaks opfor weapons since they all changed since i last saw them
* fixes the plasma pistols and tweaks their numbers a little
* deletes the luk, delete lanca proj dam mod, decreases lanca firerate
* tweaks the outfits that use these guns a bit and makes the miecz one han
* removes the luk from that one mapping helper
* puts the sakhno back on order
* tweaks around the lanca's ammo capacity
* updates the milsim domain stuff
* fixes some of the stuff
* makes the lanca and miecz magazines not normal size
---------
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* oh yeah oh woag
* maybe we can make uncommon into that
* gunnenshooter
* hard work work
* just now realised i forgot inhands
* inhands and worn
* soundsmith tf2
* does the rifles
* puts some of the pistol suppressor images in
* awawawa
* shotgun override apparently
* pistola
* grendae launcher
* dont forget the evil one too
* yeah lets fix that
* oops
* now lets see what kind of errors compiling gives us
* should hopefully be all the compile errors
* i understand morbius now
* surely it will work now
* fixes shrapnel grenades runtiming
* also fixed grenade rangefinding
* how'd I mess thta up
* fixes various issues
* granata!!!
* haha surely this will gow ell
* should fix the grendades for real
* opening this pr then dropping dead
* uhhh fixes some stuff i think?
* armory stuff
* random mapping things pt 2
* blehh :3
* fixes it forever and ever
* whar??
* turns out that needs a tweak
* curious
* that'll work 4 sure now
* fixes vr
* come on over wont you sway with me
* mhm yup
* should hopefully be all that's it?
* missing icons
* makes the rifle more expensive
* makes the smg a little less awful feeling
* dollar store suppressors, just a week away
* mmsmrmmrsgg
* lets the shotguns actually be sawn off
* the propaganda
* hey thats important
* sprite error (comical)
* gives the casings custom materials for printing
* i love code ordering
* 'lets just be safe' ifies the weight classes of mags and ammo boxes
* reworks the sol defense selection a bit
* Update modular_skyrat/modules/ammo_workbench/code/design_disks.dm
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* act three
* defines
* undefine
* restores the clothing
* some stuff part 3
* fixes the outfit guns not existing
* adjusts firerates and grenade launcher sprites
* fixes .35 sol revolvers??
* slightly un-nerfs the rifle firing rates
* makes the revolver jus tuse the normal sound
* makes the pistol case the right path
* its a machinegun!
* slight little tiny tweaks
* british weather service
* puts the blueshield gun box in their locker
* makes rifle less lethals a bit more normal
* slightly changes the smg burst and firerate
* the pepperball had raygun
* pepperball caliber
* forgot to push the include
* i love testmerges
* revolver sillies
* makes the kiboko's examine_more not just the rifle's
* smallens the eland and enlargens the cost of the kiboko
* lets change the machinegun a bit too why not
* gfl larp (real)
* fixes modular armory templates
* lets cases be ordered dont worry about the other stuff
* makes the takbok say its from the right company
* makes sawn off shotgun suppressors visibile
* those aren't used at all
* tweaks some of the rifle sprites
* shortens the shotgun a bit
* puts the pixel shifting out of initialize to make certain things work b
* granata!!!1!!!
* large number of weapon and ammo tweaks
* windup autofire seems broken somehow?
* fixes the inhands
* outfit sanity
* .40 armor piercing ammo box name correction
* removes var that doesnt exist anymore
* .40 armor piercing rework
---------
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* [ready] unit tests all worn icons (#72370)
Fixes#71692🆑 ShizCalev
code: Added a unit test for ALL worn icons.
fix: Fixed a bunch of broken worn icons!
/🆑
* [ready] unit tests all worn icons
* Should have fixed most of the failures now
* Here, hopefully that should fix what was left
* Okay maybe it just hadn't been fixed yet
* I can be a bit dumb sometimes
* Okay, now it's going to work, I promise
* I'm so tired of this
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* Changes the missing food icon test to cover ALL /obj's
* Update implant.dm
* Hopefully fixes all the failing integration tests!
* Fixes more missing icons
* Even more icon fixes
* Hopefully that was all of them
* Okay now SURELY that's all of them
* I'm tired of this shit man
* Hopefully that's all, for real this time!
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* Easy's Super Omega "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits.
* Removed all the conflicts, and started converting all the arms and legs to the proper typepaths
* Actually makes the game compile :)
* Makes the maps compile too!
* Early mirror of #71143 because it's more relevant to us
Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Update inhands.dm
* ci fix
* ew
* wew
* ew
* wew
* wew
* some hats
* rings and donator clothing
* more guns, pillows, devices
* crush hammer
* Fixing the inhands for the fake announcement device
* traitor_announcer
* Just a handful more fixes, for now.
* lost track of what I changed
* more
* weh
* Okay, now will you pass?
* Update code/modules/projectiles/guns/ballistic/bow.dm
Co-authored-by: tastyfish <crazychris32@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* i erm
* what the fuck is toolbox.dm
* huh
* first batch
* should be it
* Update armament_miscellaneous.dm
* Update armor.dm
* Mesa Glock 17 to Glock 20; MP5 to MP5/10
* finally, EASes
* spreading the tapes too
* making baseturf generators subjectively better
* pain and suffering for explorators
* -1 bad idea
* Update blackmesa.dmm
* Update fluff.dm
* Apply suggestions from code review
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
* Update modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
* should be it???
* chicken nuggies :)
* Squashed commit of the following:
commit 1ffe4f6044
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 07:51:38 2022 +0200
Automatic changelog generation for PR #16517 [ci skip]
commit 2f03042f73
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 07:51:35 2022 +0200
[MIRROR] Icebox atmos mini re-piping [MDB IGNORE] (#16517)
* Icebox atmos mini re-piping (#70092)
Having omni layer adapters everywhere is sin and a pain in the ass to work around. Moving them backward into the windows gives a little more room, too, without sacrificing functionality.
Any other changes are just for freeing up space, really. There's no functionality really lost or gained here.
There is certainly more to be done with this IMO but I'm not the best mapper and it's a start.
* Icebox atmos mini re-piping
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit 118ff3def9
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 07:24:40 2022 +0200
Automatic changelog generation for PR #16503 [ci skip]
commit b61a3f981d
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 07:24:37 2022 +0200
[MIRROR] Unit tests powernets to make sure the whole station is connected. [MDB IGNORE] (#16503)
* Unit tests powernets to make sure the whole station is connected. (#70090)
* Unit tests powernets to make sure the whole station is connected.
* fixes cable tests for blueshift and raptor
* single cable misplacement
* hard map reset
* hec
* tramstation armory stray cable
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit 8721fd64c5
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 05:54:56 2022 +0200
Automatic changelog generation for PR #16516 [ci skip]
commit 3d1013078d
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 05:54:54 2022 +0200
[MIRROR] "It has been 0 days since the last incident" sign [MDB IGNORE] (#16516)
* "It has been 0 days since the last incident" sign (#70099)
Adds a fun sign to various places in engineering which tracks how many days (read: rounds) it has been since last time the engine delaminated.
* "It has been 0 days since the last incident" sign
Co-authored-by: Jacquerel <hnevard@gmail.com>
commit 0338734f18
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 03:37:30 2022 +0200
Automatic changelog generation for PR #16519 [ci skip]
commit cdfe281599
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 03:37:27 2022 +0200
[MIRROR] Curator Suit Resprite! [MDB IGNORE] (#16519)
* Curator Suit Resprite! (#70171)
imageadd: Resprites suits associated with the curator job!
* Curator Suit Resprite!
Co-authored-by: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
commit acca73c450
Author: Changelogs <action@github.com>
Date: Thu Sep 29 01:02:11 2022 +0000
Automatic changelog compile [ci skip]
commit 3b78b06ca2
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 01:40:34 2022 +0200
Automatic changelog generation for PR #16515 [ci skip]
commit 00a4a99e30
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu Sep 29 01:40:32 2022 +0200
[MIRROR] Gives the microwave sprite a little tune-up [MDB IGNORE] (#16515)
* Gives the microwave sprite a little tune-up (#70160)
imageadd: Gives the microwave a fresh coat of paint
* Gives the microwave sprite a little tune-up
Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
commit 85f60ca4bc
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 23:20:12 2022 +0200
Automatic changelog generation for PR #16506 [ci skip]
commit 63f635d57a
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 23:20:10 2022 +0200
[MIRROR] events now have to check parent to see if they can run [MDB IGNORE] (#16506)
* events now have to check parent to see if they can run (#70128)
* events now have to check parent to see if they can run
* update supermatter_surge
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit 3802dbb3ec
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 23:10:28 2022 +0200
Automatic changelog generation for PR #16504 [ci skip]
commit 5a044ef44c
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 23:10:25 2022 +0200
[MIRROR] Reverts #68155 (Fix simple mob deaths causing deadchat notifications), Fixes living level mobs being able to die while dead [MDB IGNORE] (#16504)
* Reverts #68155 (Fix simple mob deaths causing deadchat notifications), Fixes living level mobs being able to die while dead
* conflicts, poppy
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit 0fc5c98909
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 22:39:01 2022 +0200
Automatic changelog generation for PR #16487 [ci skip]
commit 32db6d2411
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 22:38:59 2022 +0200
[MIRROR] Properly checks flags with & instead of == [MDB IGNORE] (#16487)
* Properly checks flags with & instead of ==
* merge fixed for changeling
* skyrat equipment updated
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit de331bbe60
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 22:17:48 2022 +0200
[MIRROR] Remove uneccesary var copy paste from vehicles [MDB IGNORE] (#16513)
* Remove uneccesary var copy paste from vehicles (#70167)
Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>
* Remove uneccesary var copy paste from vehicles
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>
commit a280a8e12a
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 21:39:18 2022 +0200
Automatic changelog generation for PR #16453 [ci skip]
commit 842be04245
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 21:39:15 2022 +0200
[MIRROR] Ensures areas are allowed to be non unique [MDB IGNORE] (#16453)
* Ensures areas are allowed to be non unique
* merge
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit a7a8924848
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 21:21:15 2022 +0200
[MIRROR] Automatic TGS DMAPI Update [MDB IGNORE] (#16471)
* Automatic TGS DMAPI Update (#70155)
Update TGS DMAPI
Co-authored-by: tgstation-server <tgstation-server@ users.noreply.github.com>
* Automatic TGS DMAPI Update
Co-authored-by: orange man <61334995+comfyorange@users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ users.noreply.github.com>
commit 110fd07f34
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 21:19:43 2022 +0200
[MIRROR] Micros the lighting subsystem (Saves a second of init) [MDB IGNORE] (#16461)
* Micros the lighting subsystem (Saves a second of init)
* Update stat_tracking.dm
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
commit bc982a87f6
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 21:17:49 2022 +0200
Automatic changelog generation for PR #16474 [ci skip]
commit 3c1d7e3041
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 21:17:46 2022 +0200
[MIRROR] Airlock open delay audit [MDB IGNORE] (#16474)
* Airlock open delay audit
* Update traits.dm
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
commit 57dc287b9f
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 16:10:57 2022 +0200
Automatic changelog generation for PR #16481 [ci skip]
commit 4351a49bf6
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 16:10:55 2022 +0200
[MIRROR] Cleans up events folder, moves stray round_event_control/round_event pairs to events module [MDB IGNORE] (#16481)
* Cleans up events folder, moves stray round_event_control/round_event pairs to events module (#70147)
* Cleans up events folder, moves stray round_event_control/round_event pairs to events module
Co-authored-by: Rhials <Datguy33456@gmail.com>
commit 3bd9ed0a71
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 16:07:25 2022 +0200
Automatic changelog generation for PR #15696 [ci skip]
commit 08dbe654cb
Author: Stalkeros2 <42087567+Stalkeros2@users.noreply.github.com>
Date: Wed Sep 28 19:07:22 2022 +0500
Izhevsk Coalitioning (#15696)
* i am tired :(
* boolet
* slight AK-25 buff
* Bison fixes
* spelling issue
* Update gunsgalore_guns40x32.dmi
* amog
* Update ammo.dm
* THANK YOU ZONESPACE
* Update advanced_choice_beacon.dm
* Apply suggestions from code review
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
* Update modular_skyrat/modules/gunsgalore/code/ammo/ammo.dm
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
* better ammo box code
* gub
* Update ammo.dm
* Update izhevsk.dm
* Update ammo.dm
* recoil change
* should be it?..
* Update packs.dm
* finally, ammo boxes
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
commit 8810185afb
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 16:06:06 2022 +0200
Automatic changelog generation for PR #16496 [ci skip]
commit d1b023fc9c
Author: nevimer <77420409+nevimer@users.noreply.github.com>
Date: Wed Sep 28 07:06:00 2022 -0700
ashwalkers now understand the marked one (#16496)
ashwalkers now understand
commit 55fb2abc7e
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 16:04:47 2022 +0200
[MIRROR] Adds a unit test for dupe planes [MDB IGNORE] (#16489)
* Adds a unit test for dupe planes (#70129)
* Adds a unit test for dupe planes
Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit 543d7437dd
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 14:51:23 2022 +0200
Automatic changelog generation for PR #16511 [ci skip]
commit 9c15a50069
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 14:51:21 2022 +0200
[MIRROR] Adds Nightcaps (2nd try) [MDB IGNORE] (#16511)
* Adds Nightcaps (2nd try)
* Update code/modules/clothing/head/hat.dm
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
commit 2014586c6d
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 14:29:38 2022 +0200
Automatic changelog generation for PR #16476 [ci skip]
commit 8e8145d934
Author: Microvolnovka19 <59139863+Microvolnovka19@users.noreply.github.com>
Date: Wed Sep 28 19:29:36 2022 +0700
Make Aquatics able to breath underwater (#16476)
* akulas
* aqua tiks
commit 530be5de69
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 14:23:08 2022 +0200
Automatic changelog generation for PR #16443 [ci skip]
commit 8bc6b83404
Author: Halcyon <81479835+Ebin-Halcyon@users.noreply.github.com>
Date: Wed Sep 28 05:23:05 2022 -0700
New frill options, neck frills. For lizards. (#16443)
shit
commit 12163f1796
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 14:17:51 2022 +0200
Automatic changelog generation for PR #16237 [ci skip]
commit 71d39e9208
Author: Plum <50682821+Plum-but-gayer@users.noreply.github.com>
Date: Wed Sep 28 08:17:49 2022 -0400
Moving iRCD 3 pack out of goodies. (#16237)
* Fixes headpats toggling wag
* Update code/modules/mob/living/carbon/carbon_defense.dm
getting rid of the src. If I just press this I assume this changes it?
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* Moving AFAD and iRCD out of goodies.
* putting AFAD back in goodies
* Fixes all those master update skews - you're welcome :)
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
commit 144f70c30b
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 14:16:17 2022 +0200
Automatic changelog generation for PR #16431 [ci skip]
commit 39a7f364a7
Author: Tastyfish <crazychris32@gmail.com>
Date: Wed Sep 28 08:16:14 2022 -0400
[MODULAR] Fixes airbag balloon text conflict (#16431)
Fixes airbag balloon text conflict
commit a1f6b8dc7c
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:21:38 2022 +0200
Automatic changelog generation for PR #16486 [ci skip]
commit 1eab5a8364
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:21:35 2022 +0200
[MIRROR] Heretics cannot be converted, and are immune to cult stun hands. Instead, the cult is rewarded for sacrificing them with the bloody bastard sword, an oversized SPIN2WIN funblade. + Soul Stealing Fantasy Affix [MDB IGNORE] (#16486)
* Heretics cannot be converted, and are immune to cult stun hands. Instead, the cult is rewarded for sacrificing them with the bloody bastard sword, an oversized SPIN2WIN funblade. + Soul Stealing Fantasy Affix (#69725)
About The Pull Request
Heretics can no longer be converted to a cult, as they follow their own Forgotten Gods.
Instead, Nar'Sie will reward the cult for managing to sacrifice one, with the bastard sword.
The bloody bastard sword has been cleaned up codewise and all that. Because it is a free reward instead of a (removed) progression mechanic of cult, it swings just a bit slower during the spin and doesn't have a jaunt. It's still a !fun! swinging sword of hilarity and death.
BLOODY BASTARD https://www.youtube.com/watch?v=ukznXQ3MgN0
Fantasy weapons can now roll "soul-stealing" weapons. They, on killing something, capture its soul inside the item.
Add fail conditions that instantly end a spin2win, ala how
Mimes can now hold a baguette like a sword by right clicking it #69592 works
Why It's Good For The Game
Bloody bastard sword was fun, it made no sense that heretics were valid converts when they're already worshipping a DIFFERENT evil god granting them powers. Should be in a good spot as a nice little antag to antag special interaction. I fucking love antag to antag special interactions, we should have more of 'em
Fantasy affixes are always a neat thing to throw a new component into
Changelog
cl
add: Heretics can no longer be converted to cult. But sacrificing them is very valuable to Nar'Sie, and she will grant special weapons if you manage to do so.
add: Fantasy affixes can also include soul-stealing items!
/cl
* Heretics cannot be converted, and are immune to cult stun hands. Instead, the cult is rewarded for sacrificing them with the bloody bastard sword, an oversized SPIN2WIN funblade. + Soul Stealing Fantasy Affix
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit 3925c9dd7f
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:12:50 2022 +0200
Automatic changelog generation for PR #16500 [ci skip]
commit 4ebeed965c
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:12:47 2022 +0200
[MIRROR] Adds Support For Exotic Bloodtypes To Operating Computer [MDB IGNORE] (#16500)
* Adds Support For Exotic Bloodtypes To Operating Computer (#70149)
Hey there,
So basically, whenever you had an ethereal or some other species with an exotic blood type (ethereals bleed liquid electricity)- you would get a standard blood type that came from... somewhere? No idea what that was reading. Anyways, this PR just fixes the DM-side code to pass either the actual Rhesus blood type if it's genuine blood, or if it's something special (like a clown on April Fool's day)- it'll say that instead. Splendid!
* Adds Support For Exotic Bloodtypes To Operating Computer
Co-authored-by: san7890 <the@san7890.com>
commit ff3b89d108
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:12:11 2022 +0200
Automatic changelog generation for PR #16501 [ci skip]
commit 2e8df5ddea
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:12:08 2022 +0200
[MIRROR] Updates the description of the eyepatch HUD [MDB IGNORE] (#16501)
* Updates the description of the eyepatch HUD (#70133)
* Updates the description of the eyepatch HUD
Co-authored-by: VexingRaven <msgerbs@users.noreply.github.com>
commit be5256ad4f
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:11:44 2022 +0200
[MIRROR] Delete old changelog gen TGS script [MDB IGNORE] (#16502)
* Delete old changelog gen TGS script (#70159)
* Delete old changelog gen TGS script
Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com>
commit 7db8cb7348
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:09:50 2022 +0200
[MIRROR] Removes newscaster admin topics and vars [MDB IGNORE] (#16505)
* Removes newscaster admin topics and vars (#70158)
* Removes newscaster admin topics and vars
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
commit 3beb326b62
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:09:17 2022 +0200
Automatic changelog generation for PR #16507 [ci skip]
commit f0b2b19f2c
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:09:14 2022 +0200
[MIRROR] Increases the capacity of command disks [MDB IGNORE] (#16507)
* Increases the capacity of command disks (#70105)
* Increases the capacity of command disks
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
commit 424617d367
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:08:40 2022 +0200
Automatic changelog generation for PR #16509 [ci skip]
commit 41c53c8714
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 12:08:37 2022 +0200
[MIRROR] [s] You can no longer Summon Cultist to get out of Admin Prison [MDB IGNORE] (#16509)
* [s] You can no longer Summon Cultist to get out of Admin Prison (#70156)
There's an old issue report that detailed how, using the Summon Cultist rune, you could be able to escape the Admin Prison (!!!) from CentCom (and could even go back to the station from CentCom using this in general!). This is very bad! So, let's do TWO things to fix this issue report.
The first is just to ensure that you can not summon a cultist from CentCom. They are "too far away from the veil" to be reachable. I can un-add this, but I think there's no reason we shouldn't leave it in.
The second is to ensure that the Summon Cultist rune respects TRAIT_NO_TELEPORT, so let's do that. I also whipped up a fast component that tracks the location of the "prisoner" that we send to Admin Prison, and ensure that the trait easily clears if an admin determines they are worthy of re-entering the game (so they don't have to delete the trait/component/whatever themselves, because that is non-intuitive). Should be all good now in this edge-case.
* [s] You can no longer Summon Cultist to get out of Admin Prison
Co-authored-by: san7890 <the@san7890.com>
commit 4885a448b8
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 05:16:35 2022 +0200
Automatic changelog generation for PR #16451 [ci skip]
commit 0339798a42
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 05:16:32 2022 +0200
[MIRROR] Removes network cards and printers from tablets [MDB IGNORE] (#16451)
* Removes network cards and printers from tablets
* merge tablet_presets
* printer.dm should have been deleted, missed change
* update contractor tablet
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit a827c3d01b
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 05:05:40 2022 +0200
[MIRROR] Moves the new HoS winter trenchcoat from the wintercoat file into the proper armor file [MDB IGNORE] (#16355)
* Moves the new HoS winter trenchcoat from the wintercoat file into the proper armor file
* Fixes dat conflict yo
* Whoops now the icons are gone for real!
* HOS winter coat digi no new icon
Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit afaa1b9f79
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 04:02:07 2022 +0200
Automatic changelog generation for PR #16479 [ci skip]
commit 86e99e566e
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 04:02:04 2022 +0200
[MIRROR] Fix for clown car not bumping [MDB IGNORE] (#16479)
* Fix for clown car not bumping (#70144)
* Fix for clown car not bumping
Co-authored-by: TerraGS <40574831+TerraGS@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit a9caade05e
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 03:50:10 2022 +0200
[MIRROR] Lets vehicle abilties actually be removed (#16485)
* Lets vehicle abilties actually be removed (#70151)
Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>
* Lets vehicle abilties actually be removed
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: TiviPlus <572233640+TiviPlus@ users.noreply.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit 4c2e6f0199
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 03:47:59 2022 +0200
Automatic changelog generation for PR #16491 [ci skip]
commit 69da319171
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 03:47:57 2022 +0200
[MIRROR] Adds Balloon Alerts To Valve Open/Closing [MDB IGNORE] (#16491)
* Adds Balloon Alerts To Valve Open/Closing (#70138)
* Adds Balloon Alerts To Valve Open/Closing
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit a061677da2
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 03:47:27 2022 +0200
Automatic changelog generation for PR #16493 [ci skip]
commit 8f135875da
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 03:47:24 2022 +0200
[MIRROR] Fixes the skill cape drop pod's murderous tendancies [MDB IGNORE] (#16493)
* Fixes the skill cape drop pod's murderous tendancies (#70154)
Fixes the skill cape drop pod yeeting people's organs on impact
* Fixes the skill cape drop pod's murderous tendancies
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
commit 478258535c
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 03:46:06 2022 +0200
Automatic changelog generation for PR #16275 [ci skip]
commit 1341c1f09d
Author: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com>
Date: Tue Sep 27 21:46:03 2022 -0400
Reverts the heretic sacrifice point buff (#16275)
Update sacrifice_knowledge.dm
commit 58f152cb7a
Author: Changelogs <action@github.com>
Date: Wed Sep 28 00:57:10 2022 +0000
Automatic changelog compile [ci skip]
commit 1d1c056c01
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 02:49:23 2022 +0200
Automatic changelog generation for PR #16492 [ci skip]
commit 87816aee89
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 02:49:20 2022 +0200
[MIRROR] Minor Tramstation fixes: Enzyme, cold room maint, court room, extra cables [MDB IGNORE] (#16492)
* Minor Tramstation fixes: Enzyme, cold room maint, court room, extra cables (#70122)
* Gives Service access to Cold Room Maint, adds enzyme to kitchen, adds Brig access restrictions to Courtroom Holding Cell
* Deletes extra wires in prison
* Minor Tramstation fixes: Enzyme, cold room maint, court room, extra cables
Co-authored-by: VexingRaven <msgerbs@users.noreply.github.com>
commit 95d4afe7e3
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 02:48:20 2022 +0200
Automatic changelog generation for PR #16488 [ci skip]
commit e89df49573
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 02:48:17 2022 +0200
[MIRROR] Fixes an area issue in the Medbay Storage of Icebox [MDB IGNORE] (#16488)
* Fixes an area issue in the Medbay Storage of Icebox (#70150)
* Fixes an area issue in the Medbay Storage of Icebox
Co-authored-by: SpaceSmithers <105393050+SpaceSmithers@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit 2ec7ef8478
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed Sep 28 01:15:05 2022 +0200
Automatic changelog generation for PR #16458 [ci skip]
commit 9abbbd331e
Author: LYNXEMS <mateuszpietrzakpl@gmail.com>
Date: Wed Sep 28 01:15:03 2022 +0200
Void Raptor Minor Fixes (Cargo Shuttle Pilot Begone Edition) (#16458)
Minor Fixes
commit 5eef6f41e1
Author: Tastyfish <crazychris32@gmail.com>
Date: Tue Sep 27 18:34:06 2022 -0400
[MODULAR][MDB IGNORE] Fixes lavaland_surface_arena.dmm (#16490)
Fixes lavaland_surface_arena
commit e142e098b4
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 23:52:53 2022 +0200
[MIRROR] Removes overlay queuing, saves 6/7 seconds of initialize. Lightly modifies stat tracking macros [MDB IGNORE] (#16449)
* Removes overlay queuing, saves 6/7 seconds of initialize. Lightly modifies stat tracking macros
* merge conflict
* other changes
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit cfc788851f
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 23:52:27 2022 +0200
Automatic changelog generation for PR #16381 [ci skip]
commit d0b706c041
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 23:52:24 2022 +0200
[MIRROR] Removes AI and Charge parts from tablets, adds support for more later. [MDB IGNORE] (#16381)
* Removes AI and Charge parts from tablets, adds support for more later.
* merge conflict
* remove modular tablet loadout item
* fix SR maps referencing tablets, add clear PDA instead of modular tablet loadout
* remove pda loadout item
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit 3ddbc27081
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:52:40 2022 +0200
Automatic changelog generation for PR #16470 [ci skip]
commit 216f0fba1e
Author: Halcyon <81479835+Ebin-Halcyon@users.noreply.github.com>
Date: Tue Sep 27 13:52:37 2022 -0700
Refits upstream paramedic uniforms to fit digi, removes the Bee version of the dark paramedic uniform (#16470)
* bump
* makes it a variant instead.
commit c3ecd9fe6f
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:50:06 2022 +0200
Automatic changelog generation for PR #16336 [ci skip]
commit 4c00e8d50b
Author: Halcyon <81479835+Ebin-Halcyon@users.noreply.github.com>
Date: Tue Sep 27 13:50:03 2022 -0700
Hotfixes for sec stuff that I missed on the first resprite. (#16336)
* Secmed fixes
* fixes bulletproof helms
* adds Orion's stuff
* fixes the emissive
* does it for the bluesec vest as well
* conflix
* ugh
* fixes the HoS jacket issue
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
commit 2d936b78a7
Author: Tastyfish <crazychris32@gmail.com>
Date: Tue Sep 27 16:46:26 2022 -0400
[MODULAR] Fixes very bad flag conflict for the borg boop module (#16484)
ohno
commit 572b49a531
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:46:04 2022 +0200
Automatic changelog generation for PR #16465 [ci skip]
commit 24bd013ffe
Author: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Tue Sep 27 16:46:02 2022 -0400
Swaps Armadyne and Lopland for the security winter coat logo (#16465)
Swaps Armadyne and Interdyne for the security winter coat logo
commit 5808b3ded8
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:45:31 2022 +0200
Automatic changelog generation for PR #16469 [ci skip]
commit a26347d1b4
Author: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Tue Sep 27 16:45:29 2022 -0400
Xenos now only spawn midround from dynamic, as intended (#16469)
Xenos can now only spawn from dynamic*
*except when they spawn from that damn egg in xenobiology (hopefully we do something better for it at some point)
commit bd6f1be1ec
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:44:29 2022 +0200
Automatic changelog generation for PR #16467 [ci skip]
commit 0e32be3c7d
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:44:26 2022 +0200
[MIRROR] Fixes weather sounds [MDB IGNORE] (#16467)
* Fixes weather sounds (#69944)
* Fixes weather sounds
Timber changed the args to this signal in cbc6f35f54, and didn't update my code.
Damn you timber.
Thanks to that bro in coderbus who told me about this
* Fixes weather sounds
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
commit c9fb687867
Author: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Tue Sep 27 13:44:13 2022 -0700
Modularizes crafting list edits (#16464)
* I SAID I'D DO IT
* guh
commit 6f2f7aeca2
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:43:47 2022 +0200
Automatic changelog generation for PR #16466 [ci skip]
commit 8ec2657a71
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:43:44 2022 +0200
[MIRROR] Fixes syndie bomb uplink text from being inaccurate [MDB IGNORE] (#16466)
* Fixes syndie bomb uplink text from being inaccurate (#70077)
* Updates the syndie bomb description to use a define on how long bomb timers should be, as it was previously using an outdated number.
* Fixes syndie bomb uplink text from being inaccurate
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
commit 1925dceab9
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:42:23 2022 +0200
[MIRROR] Fixes a bug with null clients in parallax code [MDB IGNORE] (#16473)
* Fixes a bug with null clients in parallax code (#70141)
* Fixes a bug with null clients in parallax code
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
commit 88fe8c787f
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:42:07 2022 +0200
Automatic changelog generation for PR #16478 [ci skip]
commit 051379781b
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:42:04 2022 +0200
[MIRROR] energy gun infinite cell runtime fix [MDB IGNORE] (#16478)
* energy gun infinite cell runtime fix (#70115)
* energy gun infinite cell runtime fix
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
commit da9d5fe5ee
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 22:41:44 2022 +0200
Automatic changelog generation for PR #15851 [ci skip]
commit cb40a9d511
Author: dawsonkeyes <76002401+dawsonkeyes@users.noreply.github.com>
Date: Tue Sep 27 14:41:42 2022 -0600
[MODULAR] Marked One Buffs and Adjustments - HAI YO (#15851)
* HAI
* YAI
* FORCES
* HAI
* YAI
* FORCES
* HAI
* YAI
* FORCES
* marked one sprites
* god willing
* minor spelling mistake
* woohooo
* yeeehooo
* shoop da woop
* bug fixing's a good job mate
* i love this shit
* Update gladiator_items.dm
* what is it good for
* cave johnson, we're done here
* final touch
* speen
* sprite fix
* quality of life descriptions
* BA
* SA
* KAAAA
* final bug fix 1
* arena remake !!
* finishing touches
* berkin' time
* linterfucker 9000
* final final real final fix
* real real actual final stuff
* actual real final fixes
* CLANG
* real clang hours
* clang x2
* CLONG
* fuck()
* wry
* \proper
* #def
* redundancy
* span text my ass
* define my nuts
* fix it fucker
* fuck
* ehhh linters doc
* hai yo
* fuck map
* attempted blood shit fix
* does this work let's find out
* FIX IT
* FIX IT
* overlay my nuts
* concession
* CLA
* AAA
* ANG
* examine formatting
* more fixes
* changes
* _ PHASE
* phase tweaks
* (
* //code doc
* stain-b-gone
* you drive me to drink
* why
* in
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* get_fucked
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* more fixin'
* get_fucked (2)
* slight fixes
* marked one corpse inspect
* charge fixes
* fixes slow lava
* hope this works
* piercing
* woop
* CLANG
* global proc gaming
* stomp attack
* fix
* last one i swear
* powaaa
* no more invisi-click
* balanced armor feat. tf4
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* more balanced stomp
* no more spoopy
* \proper
* way fairer stomp attacks
* whoops
* fixes repeat messages
* murder murder in my mind
* spinnin'
* bulkin'
* -1000 health
* doc these nuts
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
commit ee76135ac2
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 20:28:24 2022 +0200
Automatic changelog generation for PR #16379 [ci skip]
commit bd265161a9
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 20:28:22 2022 +0200
[MIRROR] Replaces obj flag `being_shocked` and flag_1 `shocked_1` with `TRAIT_BEING_SHOCKED` [MDB IGNORE] (#16379)
* Replaces obj flag `being_shocked` and flag_1 `shocked_1` with `TRAIT_BEING_SHOCKED` (#69978)
* Replaces `being_shocked` and `shocked_1` with `TRAIT_BEING_SHOCKED`, removing a flag_1, taking us away from the possibility of hitting the flag limit.
* Replaces obj flag `being_shocked` and flag_1 `shocked_1` with `TRAIT_BEING_SHOCKED`
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
commit 33c8e24857
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 03:38:11 2022 +0200
Automatic changelog generation for PR #16376 [ci skip]
commit e3222fdcf0
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 03:38:08 2022 +0200
[MIRROR] Fixes radio implant chilling in Icebox tool storage [MDB IGNORE] (#16376)
* Fixes radio implant chilling in Icebox tool storage (#70062)
swaps out internal radio for a regular one
* Fixes radio implant chilling in Icebox tool storage
Co-authored-by: Capsandi <38051413+Capsandi@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit 64e29a7aca
Author: Changelogs <action@github.com>
Date: Tue Sep 27 01:15:48 2022 +0000
Automatic changelog compile [ci skip]
commit be98b5389a
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:56:17 2022 +0200
Automatic changelog generation for PR #16362 [ci skip]
commit 04c4641e37
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:56:14 2022 +0200
[MIRROR] Adds Missing Mining GPSs to Icebox Public Mining [MDB IGNORE] (#16362)
* Adds Missing Mining GPSs to Icebox Public Mining (#70049)
Adds 6 mining GPSs to Icebox public mining, 1 for each set of mining equipment.
* Adds Missing Mining GPSs to Icebox Public Mining
Co-authored-by: moocowswag <62126254+moocowswag@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit 76a4e00d91
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:25:33 2022 +0200
Automatic changelog generation for PR #16361 [ci skip]
commit e811f3cfce
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:25:30 2022 +0200
[MIRROR] Uncovers a hidden vent on icebox [MDB IGNORE] (#16361)
* Uncovers a hidden vent on icebox (#70043)
Moves a vent outside science on icebox up one tile so it isn't obscured by the experimental destructive scanner
* Uncovers a hidden vent on icebox
Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit 37f4d08118
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:24:42 2022 +0200
Automatic changelog generation for PR #16334 [ci skip]
commit 937c2055c8
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:24:39 2022 +0200
[MIRROR] Removes extra fax machine from the Cargo Office on Tram Station [MDB IGNORE] (#16334)
* Removes extra fax machine from the Cargo Office on Tram Station (#70010)
Removes an anchored device lying on the ground which you would constantly trip over while trying to use the cargo console.
You can't even unwrench it and sell it because fax machines are shuttle banned.
* Removes extra fax machine from the Cargo Office on Tram Station
Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit db96166c30
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 02:05:23 2022 +0200
[MIRROR] Fixes a really dumb mistake with Delta atmos that i'm surprised no one's found for this long [MDB IGNORE] (#16395)
* Fixes a really dumb mistake with Delta atmos that i'm surprised no one's found for this long (#70082)
Removes these pipes on the left side hidden under grilles
* Fixes a really dumb mistake with Delta atmos that i'm surprised no one's found for this long
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
commit 9c6e8d8fe4
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 01:53:51 2022 +0200
Automatic changelog generation for PR #16320 [ci skip]
commit 256f5c53f7
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 01:53:48 2022 +0200
[MIRROR] removes duplicate paper bin with pen in caps office(metastation) [MDB IGNORE] (#16320)
* removes duplicate paper bin with pen in caps office(metastation) (#69995)
* removes duplicate paper bin with pen in caps office(metastation)
Co-authored-by: Salex08 <33989683+Salex08@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit ddb8b0a048
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 01:20:39 2022 +0200
Automatic changelog generation for PR #16319 [ci skip]
commit 9f56bf6f7b
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 01:20:37 2022 +0200
[MIRROR] Multiple Minor Kilo fixes because I was too lazy to split them into 4 PRs, funny red circle edition [MDB IGNORE] (#16319)
* Multiple Minor Kilo fixes because I was too lazy to split them into 4 PRs, funny red circle edition (#69993)
* Duplicate Mass Driver Controls
* Things near the station are now near the station
* Incinerator is now air-tight because part of it is not in space.
* The Kilo fix-athon continues.
fix: A duplicate mass driver controller on Kilo has been deleted, you can no longer operate the toxins mass driver from maintenance.
fix: Kilo's north escape pod now correctly has its catwalk in the nearstation area.
fix: Kilo no longer has a random incinerator area in space.
fix: removed a random decal from arrivals on Kilo.
* Multiple Minor Kilo fixes because I was too lazy to split them into 4 PRs, funny red circle edition
Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
commit 2e23eb27ce
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 01:20:06 2022 +0200
Automatic changelog generation for PR #16295 [ci skip]
commit 50a65188ec
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 01:20:04 2022 +0200
[MIRROR] Trio of misc map fixes [MDB IGNORE] (#16295)
* Trio of misc map fixes (#69965)
Moves an air vent out from underneath a disposals bin in the Meta incinerator.
Replaces a regular intercom with a prisoner intercom in the Icebox prisoner transfer.
Replaces the window spawners in Meta departures (the ones in the middle of the room) with plain windows so you can see the flowers.
* Trio of misc map fixes
Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit 85b0f936b2
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:52:11 2022 +0200
Automatic changelog generation for PR #16291 [ci skip]
commit f3e2a646f8
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:52:09 2022 +0200
[MIRROR] Tramstation: Modular Maintenance Insanity [MDB IGNORE] (#16291)
* Tramstation: Modular Maintenance Insanity
* I fucking love merge conflicts!!!
* errors found, please try again
Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit 663e860d8a
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:36:35 2022 +0200
Automatic changelog generation for PR #16463 [ci skip]
commit a80408f00e
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:36:32 2022 +0200
[MIRROR] Tramstation crossing lights actually indicate the danger of crossing [MDB IGNORE] (#16463)
* Tramstation crossing lights actually indicate the danger of crossing (#70132)
Updating signal timing, adding amber on tram travel check
* Tramstation crossing lights actually indicate the danger of crossing
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
commit 858e761ffa
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:11:26 2022 +0200
Automatic changelog generation for PR #16462 [ci skip]
commit a92db67a13
Author: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Date: Mon Sep 26 18:11:23 2022 -0400
re-add the water basin and forging workbench (#16462)
I am a horrible person
commit 3fdc383205
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:02:08 2022 +0200
Automatic changelog generation for PR #16444 [ci skip]
commit 4a92d40f86
Author: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com>
Date: Mon Sep 26 18:02:06 2022 -0400
Makes breakfast end at 35 minutes, as opposed to 15 (#16444)
Update food.dm
commit c0624236bd
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue Sep 27 00:00:51 2022 +0200
[MIRROR] Paramedic: the respritening [MDB IGNORE] (#16460)
* Paramedic: the respritening (#70104)
* Paramedic: the respritening
Co-authored-by: Halcyon <81479835+Ebin-Halcyon@users.noreply.github.com>
commit 38dd542e21
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:56:26 2022 +0200
Automatic changelog generation for PR #16410 [ci skip]
commit eefbd40ce6
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:56:24 2022 +0200
[MIRROR] Adds macros to help with common `set_`- and `adjust_timed_status_effect` uses [MDB IGNORE] (#16410)
* Adds macros to help with common `set_`- and `adjust_timed_status_effect` uses
* merge conflicts
* modular skyrat and missed changes
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit d55ee2d3c3
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:55:21 2022 +0200
Automatic changelog generation for PR #16457 [ci skip]
commit 0e525c9bd6
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:55:19 2022 +0200
[MIRROR] fixes scrubber event runtimes on runtime station [MDB IGNORE] (#16457)
* fixes scrubber event runtimes on runtime station (#70114)
* fixes scrubber event runtimes on runtime station
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
commit aad223bc0b
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:54:33 2022 +0200
Automatic changelog generation for PR #16450 [ci skip]
commit 8175a8bc22
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:54:31 2022 +0200
[MIRROR] Adds springrolls [MDB IGNORE] (#16450)
* Adds springrolls (#70119)
The chefs have come up with a new use for rice and made these delicious vegetarian spring rolls to add to their menu.
* Adds springrolls
Co-authored-by: SomethingFish <73157400+SomethingFish@users.noreply.github.com>
commit 02a394dae2
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:54:05 2022 +0200
Automatic changelog generation for PR #16452 [ci skip]
commit fcebe79690
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:54:03 2022 +0200
[MIRROR] Prevents Regal Rats from being possessed pre-round [MDB IGNORE] (#16452)
* Prevents Regal Rats from being possessed pre-round (#70055)
* Prevents Regal Rats from being possessed pre-round
Co-authored-by: Rhials <Datguy33456@gmail.com>
commit 45f0d0cfea
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:53:47 2022 +0200
[MIRROR] Disambiguates a ternary [MDB IGNORE] (#16455)
* Disambiguates a ternary (#70121)
Co-authored-by: ike709 <ike709@ github.com>
* Disambiguates a ternary
Co-authored-by: ike709 <ike709@users.noreply.github.com>
Co-authored-by: ike709 <ike709@ github.com>
commit fe6278dff7
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:53:03 2022 +0200
[MIRROR] Fixes invalid path in the garbage spawner [MDB IGNORE] (#16454)
* Fixes invalid path in the garbage spawner (#70127)
* Fixes invalid path in the garbage spawner
Co-authored-by: Tastyfish <crazychris32@gmail.com>
commit b1d24eea83
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:32:10 2022 +0200
Automatic changelog generation for PR #16430 [ci skip]
commit 62345b01c1
Author: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Date: Mon Sep 26 17:32:08 2022 -0400
incompatible species for ghostroles, and character pref for black market dealer (#16430)
* incompatible species for ghostroles
* Update code/modules/mob_spawn/mob_spawn.dm
adds a space?
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
* Update code/modules/mob_spawn/mob_spawn.dm
add a space.
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
commit 00b4151cee
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:29:35 2022 +0200
Automatic changelog generation for PR #16375 [ci skip]
commit c6de4c93b9
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:29:32 2022 +0200
[MIRROR] Macro optimizes SSmapping saving 50% [MDB IGNORE] (#16375)
* Macro optimizes SSmapping saving 50%
* fix merge issues, update to current turf_blacklist api
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
commit 20fb529cf5
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 23:24:50 2022 +0200
Automatic changelog generation for PR #16426 [ci skip]
commit 7b2183ed5c
Author: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Date: Mon Sep 26 15:24:47 2022 -0600
[MDB IGNORE][Fix] Re-enables digi legs on shorts (#16426)
why did TG do this
commit 54e154f2c5
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 14:15:11 2022 +0200
Automatic changelog generation for PR #16439 [ci skip]
commit f64e766a00
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 14:15:08 2022 +0200
[MIRROR] Creates a proper CentCom group for orbit UI [MDB IGNORE] (#16439)
* Creates a proper CentCom group for orbit UI (#70098)
add: Added new grouping to orbit menu for CentCom agents.
* Creates a proper CentCom group for orbit UI
Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
commit 4fd30d5da3
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 14:13:57 2022 +0200
Automatic changelog generation for PR #16446 [ci skip]
commit deb87e9ec0
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 14:13:55 2022 +0200
[MIRROR] Fixes gravity pulse and transparent floor plane sharing a layer [MDB IGNORE] (#16446)
* Fixes gravity pulse and transparent floor plane sharing a layer (#70124)
fixes gravity pulse and transparent floor plane sharing a layer
Broken by #69642 , sorry
I'll open up a seperate PR later today with a unit test to catch these cases
(my later today is in like 10 hours)
closes#70123 (weird fucking floors)
* Fixes gravity pulse and transparent floor plane sharing a layer
Co-authored-by: Time-Green <timkoster1@hotmail.com>
commit 4734ca7490
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 14:13:24 2022 +0200
[MIRROR] Fixes linda heat capacity errors [MDB IGNORE] (#16445)
* Fixes linda heat capacity errors (#70071)
We make the assumption that a turf's heat capacity will never be 0. This is safe because we've got an override of /datum/gas_mixture for turfs that overrides 0 heat cap with 7000 (SPACE)
This is done to make cold actually flow through empty tiles, because we are hacks.
I forgot to include type in my gas mixture creation logic, so this was being dropped. FIXXXX
* Fixes linda heat capacity errors
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
commit 31d925a31d
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 12:40:04 2022 +0200
Automatic changelog generation for PR #16438 [ci skip]
commit 66a7f4cb77
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 12:40:01 2022 +0200
[MIRROR] Fixes IceBox Homestead Ruin to have Proper snow [MDB IGNORE] (#16438)
* Fixes IceBox Homestead Ruin to have Proper snow (#70093)
Replaces the area turfs around the homestead ruin from "mining" to "mining explore" so it can snow properly.
* Fixes IceBox Homestead Ruin to have Proper snow
Co-authored-by: uaioy <114047053+uaioy@users.noreply.github.com>
commit c724fde844
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 09:37:21 2022 +0200
Automatic changelog generation for PR #16273 [ci skip]
commit 03713325a8
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 09:37:18 2022 +0200
[MIRROR] Fixing 2 single tile map issues in Meta Chapel [MDB IGNORE] (#16273)
* Fixing 2 single tile map issues in Meta Chapel (#69914)
1: The bookshelf in the chapel was in the funeral area despite being in a different room. Its area has now been corrected to Chapel
2: The door between the Chapel and Funeral Parlor has been made public, I checked with EOB if this was intended and they've confirmed that it should be public.
* Fixing 2 single tile map issues in Meta Chapel
Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
commit 79beedc0cb
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 06:52:38 2022 +0200
Automatic changelog generation for PR #16441 [ci skip]
commit f1b060a1cd
Author: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon Sep 26 06:52:36 2022 +0200
[MIRROR] Moves pepperspray dispenser in science sec outpost one tile down [MDB IGNORE] (#16441)
* Moves pepperspray dispenser in science sec outpost one tile down (#70109)
YEAH THERE WE GO APC IS MOVED MISSION ACCOMPLISHED
* Moves pepperspray dispenser in science sec outpost one tile down
Co-authored-by: Striders13 <53361823+Striders13@users.noreply.github.com>
* slight turret buff
mp5_bolt_locked
* should be it
* Update blackmesa.dmm
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
* Removes ComponentInitialize()
* Fixes a leftover merge conflict marker
* Fixes the oversight that came from the upstream merge skew
* Fixes all of the instances where we used ComponentInitialize() when we shouldn't've been
* Fixes CI being broken because of the HEV suits
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* This tail refactor turned into an organ refactor. Funny how that works.
* Firstly, fixing all the conflicts.
* Fixes all our maps (hopefully)
* Actually, this should fix pod people hair :)
* Almost everything is working, just two major things to fix
* Fixed a certain kind of external organ
* Cleaning up some more stuff
* Turned tail_cat into tail because why the fuck are they separate?
* Moved all the tails into tails.dmi because that was just dumb to have like 3 in a different file
* Adds relevant_layers to organs to help with rendering
* Makes stored_feature_id also check mutant_bodyparts
* Fixes the icon_state names of ALL the tails (pain)
* Fixes wagging, gotta refactor most mutant bodyparts later on
* I Love Added Failures
* Fixed some organs that slipped through my searches
* This could possibly fix the CI for this?
* It doesn't look like it did fix it
* This will make it pass, even if it's ugly as sin.
* Fixed Felinids having a weird ghost tail
* Fixes instances of snouts and tails not being properly colored
Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Fixes navigation computers giving too many port jumping actions (#64054)
* Fixes navigation computers giving too many port jumping actions
I'm adding a vestigial proc here, remove_jumpable_port
I prefer this over not fully implementing the behavior, hopefully it'll be of use to someone
* Fixes navigation computers giving too many port jumping actions
* Fixes navigation computers giving too many port jumping actions
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* [Ready] MODsuits
* we dont need to add these people as codeowners, goodness gracious
* have to remove this because upstream
* part 1 of these fixes
* EEEE
* Update peacekeeper_clothing.dm
* E
* E
* Auto stash before merge of "upstream-merge-59109" and "origin/upstream-merge-59109"
* E
* Update expeditionary_trooper.dm
* more removal
* nice
* modsuti modstui modusuti
* fixes
* E
* ITS MODsuit not HARDSUIT
* more hardsuit references
* MODSUIT NOT HARSUITEDSA
* Maps
* More ,map
* oop
* e
* oo aa
* 0
* ting tang
* Update modsuit_tailsprites.dm
* hi fikou
* bs tech update
Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton)
* EEEE
* E
* follow the fucking guidelines
* E
* Update CentCom_skyrat.dmm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
* renames metal sheets to iron sheets
* Merge branch 'master' into upstream-merge-56643
* yay metal
* Update DeltaStation2_skyrat.dmm
* a
* Update CentCom_skyrat_z2.dmm
* a
* a
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
Alexis