| [initial(rule.name)] | \[[forced]\] | \[\ + force enabled /\ + force disabled /\ + reset\] |
| [rule.name] | \ +\[Weight : [rule.weight]\]\ + | \[[active][explanation]\] | \[\ + force enabled /\ + force disabled /\ + reset\] | \ +\[VV\] |
Name of offical to take action:
", + "Name of official to take action:
", "[___________________________________]
", "Official Decision:
", "[___________________________________]
", diff --git a/config/config.txt b/config/config.txt index 8d28b656c30c1b..e8abb56fed5046 100644 --- a/config/config.txt +++ b/config/config.txt @@ -137,11 +137,14 @@ VOTE_PERIOD 600 ## players' votes default to "No vote" (otherwise, default to "No change") # DEFAULT_NO_VOTE -## disable abandon mob -NORESPAWN - -## Respawn delay (deciseconds), which doesn't allow to return to lobby (default 10 minutes) -#RESPAWN_DELAY 6000 +## Determines if players can respawn after death +## 0 = Cannot respawn (default) +## 1 = Can respawn +## 2 = Can respawn if choosing a different character +ALLOW_RESPAWN 0 + +## Respawn delay (deciseconds), which doesn't allow to return to lobby +RESPAWN_DELAY 0 ## set a hosted by name for unix platforms HOSTEDBY Yournamehere diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt index 4332260d6becc9..b2574fd7fd62fd 100644 --- a/config/lavaruinblacklist.txt +++ b/config/lavaruinblacklist.txt @@ -11,8 +11,9 @@ ##RESPAWN #_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1_skyrat.dmm +#_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm #_maps/RandomRuins/AnywhereRuins/golem_ship.dmm ##SIN @@ -23,13 +24,24 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm ##MISC +#_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm +<<<<<<< HEAD #_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -39,4 +51,7 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm #_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm \ No newline at end of file +#_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm +======= +#_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm +>>>>>>> 0f5d14e68b1 (Mook village and basic mook refactor (#78789)) diff --git a/html/changelogs/AutoChangeLog-pr-23524.yml b/html/changelogs/AutoChangeLog-pr-23524.yml new file mode 100644 index 00000000000000..361042dc62ebe2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23524.yml @@ -0,0 +1,4 @@ +author: "nikothedude" +delete-after: True +changes: + - rscadd: "Sec/Medhuds can now see a small ! if a person has the DNR quick, as well as see a blurb in examine about it" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23580.yml b/html/changelogs/AutoChangeLog-pr-23580.yml new file mode 100644 index 00000000000000..291734c3a95454 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23580.yml @@ -0,0 +1,4 @@ +author: "burgerenergy" +delete-after: True +changes: + - qol: "Both versions of Interdyne received some map touch ups. Standouts include; a fax machine, dorm locks, a make shift brig area, a revamped bathroom, botany, and kitchen, as well as backporting Icemoon improvements to the Lavaland version." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23964.yml b/html/changelogs/AutoChangeLog-pr-23964.yml deleted file mode 100644 index a5a9ca339e284f..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23964.yml +++ /dev/null @@ -1,11 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - refactor: "Hivelords and Legions now use the basic mob framework. Please report any unusual behaviour." - - rscadd: "Hivelords shed more spawn when they are attacked." - - rscadd: "Legions have learned how to fling their skulls across long distances." - - rscadd: "Legions can heal other lavaland mobs with their skulls." - - rscadd: "Legions are better at preserving corpses they consume, and sometimes make use of their radios." - - rscadd: "Legions may leave behind an unpleasant surprise after you are rescued from them." - - balance: "The crew monitoring console will now display you as dead if you are dead, an critically injured if in crit, rather than setting those icons purely based on your current health." - - qol: "You won't continue burning to a husk if consumed by a snow legion after being set on fire by an ice drake." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23969.yml b/html/changelogs/AutoChangeLog-pr-23969.yml deleted file mode 100644 index e68c1f16a513ab..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23969.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "A.C.M.O." -delete-after: True -changes: - - bugfix: "Fixes the death sandwich, making it safe to examine." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23970.yml b/html/changelogs/AutoChangeLog-pr-23970.yml deleted file mode 100644 index 90c3560af2270d..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23970.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fix water puddle runtime when washing items" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23971.yml b/html/changelogs/AutoChangeLog-pr-23971.yml deleted file mode 100644 index 77882c152d7f0a..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23971.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Rhials" -delete-after: True -changes: - - bugfix: "The Polymorph Belt should now update its sprite when active." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23972.yml b/html/changelogs/AutoChangeLog-pr-23972.yml deleted file mode 100644 index cd5835f48b8c35..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23972.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - refactor: "Snakes have been refactored into basic mobs. This means that they are a bit more intelligent than previous snakes, making them more docile and averse to harming people (unless otherwise provoked). They do chomp all sorts of mice though. You can feed them a dead mouse to make them your friend if you'd want that." - - sound: "If you listen closely to snakes, you might be able to hear a small hissing sound..." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23973.yml b/html/changelogs/AutoChangeLog-pr-23973.yml deleted file mode 100644 index c78f143cc15f51..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23973.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "Add drinking water causes drunk mobs to become sober" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23974.yml b/html/changelogs/AutoChangeLog-pr-23974.yml deleted file mode 100644 index 0cb3b6568f5cc0..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23974.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - code_imp: "adds a gas connector component that allows connection to the atmos piping system without the need of repathing" - - refactor: "changes the cryo machine to use this new system" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23976.yml b/html/changelogs/AutoChangeLog-pr-23976.yml deleted file mode 100644 index 5069c636850827..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23976.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Head revolutionaries and heads of staff are no longer immediately considered disqualified when going AFK or disconnecting and are given a 2 minute grace period." - - admin: "Admins now get a log when a head revolutionary or head of staff disconnects or goes AFK during a revolution. They also get the same log 1 minute after to give them a chance to act on the information." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23978.yml b/html/changelogs/AutoChangeLog-pr-23978.yml deleted file mode 100644 index b42cf16ce625bc..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23978.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - code_imp: "Robot Customers have recently been touched codewise, please report any bugs or unexpected behavior as there really should not be any." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23979.yml b/html/changelogs/AutoChangeLog-pr-23979.yml deleted file mode 100644 index 3093dac19e2277..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23979.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - admin: "There is now a tool to apply a DNA Infuser entry to any human." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23980.yml b/html/changelogs/AutoChangeLog-pr-23980.yml deleted file mode 100644 index febc6a692b7b7b..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23980.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "Add candle design to biogenerator" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23981.yml b/html/changelogs/AutoChangeLog-pr-23981.yml deleted file mode 100644 index 29314e499ecc11..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23981.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "allowed names to start with a number if AI/Borg" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23982.yml b/html/changelogs/AutoChangeLog-pr-23982.yml deleted file mode 100644 index 41b052985ddcbf..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23982.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "fixed lobstrosities becoming unmovable when killed during their charge windup" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23983.yml b/html/changelogs/AutoChangeLog-pr-23983.yml deleted file mode 100644 index 7f6595037bfff6..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23983.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "dead bodies now cool down to room temperature over time" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23984.yml b/html/changelogs/AutoChangeLog-pr-23984.yml deleted file mode 100644 index 4cea4c40d9ceec..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23984.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Diabetics rejoice! Nerfed sugar OD/hyperglycaemic shock to be an immediate KO followed by drowsiness afterwards until the OD is gone." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23985.yml b/html/changelogs/AutoChangeLog-pr-23985.yml deleted file mode 100644 index eb6c6b29171d01..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23985.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "The Nuke Op MODsuit AI downloader only works once per purchase, as intended." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-23986.yml b/html/changelogs/AutoChangeLog-pr-23986.yml deleted file mode 100644 index 6febb0c667cf05..00000000000000 --- a/html/changelogs/AutoChangeLog-pr-23986.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "sergeirocks100" -delete-after: True -changes: - - bugfix: "Undershirts will now look as they should if you have a body type that differs from the gender default." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-24174.yml b/html/changelogs/AutoChangeLog-pr-24174.yml new file mode 100644 index 00000000000000..cd5b645f5c9e0f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24174.yml @@ -0,0 +1,6 @@ +author: "Hatterhat" +delete-after: True +changes: + - bugfix: "The CIN replicator medipen pouch and pocket first-aid kit no longer have bag-like functionality (scooping/the action button), which they didn't need to fit in your pockets anyway." + - balance: "First-aid pouches (the ones through Cargo for 300 cr) now have five slots; one up from four." + - rscadd: "Ammo pouches can now be reskinned into casing pouches, which let them hold ten individual shell casings in your pocket. Yes, this includes shotgun shells. This is also primarily intended for shotgun users." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-24175.yml b/html/changelogs/AutoChangeLog-pr-24175.yml new file mode 100644 index 00000000000000..6f65e92a12f3f0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24175.yml @@ -0,0 +1,5 @@ +author: "Hatterhat" +delete-after: True +changes: + - spellcheck: ".50 BMG surplus, incendiary, and marksman have now been given more SR-lore-accurate names." + - bugfix: "10mm Reaper can't be printed in ammo benches like it was intended. If you don't know what this means, don't worry about it." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-24283.yml b/html/changelogs/AutoChangeLog-pr-24283.yml new file mode 100644 index 00000000000000..b2c323707047e7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24283.yml @@ -0,0 +1,10 @@ +author: "LT3" +delete-after: True +changes: + - rscadd: "Introducing Nanotrasen Wave! A Nanotrasen exclusive, Waveallows your PDA to be charged wirelessly through microwave frequencies. You can Wave-charge your device by placing it inside a compatible microwave and selecting the charge mode." + - rscadd: "Microwaves can be upgraded to add wireless charging" + - rscadd: "Cell-swappable microwave for the engineer on-the-go" + - rscadd: "Microwave now has a wire to swap charge/cook modes" + - rscadd: "Furnishings RCD upgrade now includes wireless microwave" + - rscadd: "Tramstation and Birdshot engineering break rooms now have microwave and donk pockets. Some microwaves come pre-equipped with wireless charging and an upgraded cell." + - bugfix: "The microwave in the snowdin ruin is now real, not a fluff prop" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-24284.yml b/html/changelogs/AutoChangeLog-pr-24284.yml new file mode 100644 index 00000000000000..78e4247ee9f58a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24284.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - refactor: "Gorillas now use the basic mob framework. Please report any unusual side effects." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-24289.yml b/html/changelogs/AutoChangeLog-pr-24289.yml new file mode 100644 index 00000000000000..14a3193bacce17 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24289.yml @@ -0,0 +1,6 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "The Holy Hand Grenade's effect on revealing a revenant had its duration accidentally nerfed, it is now back to 10 seconds." + - bugfix: "Revenant midrounds should now properly run." + - bugfix: "Revenant harvesting should now let you actually pass the final do_after so you can harvest that sweet essence." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-24291.yml b/html/changelogs/AutoChangeLog-pr-24291.yml new file mode 100644 index 00000000000000..3f65148a845fc0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-24291.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - qol: "The rollerdome is now better - the dance floor works now, and the bar is groovier." \ No newline at end of file diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index 976efdac110c16..a45513671cec74 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -1154,3 +1154,109 @@ tattle: - qol: Basic animals now make sounds for audible emotes - sound: Added new sound effects for chicks, chickens, crabs, and insects +2023-09-29: + A.C.M.O.: + - bugfix: Fixes the death sandwich, making it safe to examine. + BurgerBB: + - bugfix: Scrubbers and Vents will no longer reset their settings on map load. + GoldenAlpharex: + - server: Added a way for calls to be made to interfere with player ranks on live + servers (updating the players if they're connected) from outside of the game. + Rhials: + - qol: The freedom implant has received minor feedback and other minor usage improvements. + - bugfix: The Polymorph Belt should now update its sprite when active. + SkyratBot: + - qol: allowed names to start with a number if AI/Borg + - rscadd: Add drinking water causes drunk mobs to become sober + - balance: Diabetics rejoice! Nerfed sugar OD/hyperglycaemic shock to be an immediate + KO followed by drowsiness afterwards until the OD is gone. + - code_imp: Robot Customers have recently been touched codewise, please report any + bugs or unexpected behavior as there really should not be any. + - admin: There is now a tool to apply a DNA Infuser entry to any human. + - bugfix: The Nuke Op MODsuit AI downloader only works once per purchase, as intended. + - code_imp: adds a gas connector component that allows connection to the atmos piping + system without the need of repathing + - refactor: changes the cryo machine to use this new system + - refactor: Hivelords and Legions now use the basic mob framework. Please report + any unusual behaviour. + - rscadd: Hivelords shed more spawn when they are attacked. + - rscadd: Legions have learned how to fling their skulls across long distances. + - rscadd: Legions can heal other lavaland mobs with their skulls. + - rscadd: Legions are better at preserving corpses they consume, and sometimes make + use of their radios. + - rscadd: Legions may leave behind an unpleasant surprise after you are rescued + from them. + - balance: The crew monitoring console will now display you as dead if you are dead, + an critically injured if in crit, rather than setting those icons purely based + on your current health. + - qol: You won't continue burning to a husk if consumed by a snow legion after being + set on fire by an ice drake. + - bugfix: removes incorrect stack traces when using some admin secrets + - balance: Head revolutionaries and heads of staff are no longer immediately considered + disqualified when going AFK or disconnecting and are given a 2 minute grace + period. + - admin: Admins now get a log when a head revolutionary or head of staff disconnects + or goes AFK during a revolution. They also get the same log 1 minute after to + give them a chance to act on the information. + - refactor: Snakes have been refactored into basic mobs. This means that they are + a bit more intelligent than previous snakes, making them more docile and averse + to harming people (unless otherwise provoked). They do chomp all sorts of mice + though. You can feed them a dead mouse to make them your friend if you'd want + that. + - sound: If you listen closely to snakes, you might be able to hear a small hissing + sound... + - bugfix: fixed lobstrosities becoming unmovable when killed during their charge + windup + - bugfix: Splattercasting resets your blood to normal values when you transsform + into a vampire. + - bugfix: Gaining a new species will set your blood volume down to the normal volume + levels if higher than normal. + - bugfix: Fix water puddle runtime when washing items + - bugfix: the parole status and discharged status are now green and blue respectively + in the security record interface + - bugfix: Dimensional Anomalies no longer destroy wall-mounted equipment. + - code_imp: Your bodytype now decides what gendered sounds you make. + - bugfix: Fixed crabs not correctly (kinda) walking sideway. + - bugfix: dead bodies now cool down to room temperature over time + - rscadd: Add candle design to biogenerator + sergeirocks100: + - bugfix: Undershirts will now look as they should if you have a body type that + differs from the gender default. + softcerv: + - rscadd: Adds in the ability for certain NIFSofts to be kept between rounds. +2023-09-30: + DrDiasyl aka DrTuxedo: + - balance: Holsters can now be clipped to any suit, and house Captain antique gun + and HoS gun. You now can buy holsters from the SecTech premium section. + Paxilmaniac: + - qol: The half mask respirator can have its TTS voice muffling properties toggled + with control click + - qol: Icecats are now listed in the round end report, so you can see who was up + icing they cat + - bugfix: Icecats should hopefully spawn with their special language correctly now + SkyratBot: + - code_imp: removed some redundant code for airlocks + - admin: Mob abilities can be granted to arbitrary mobs via the VV menu in a similar + way to spells. + - bugfix: Lavaland syndicate operatives can no longer trivially use the jetpack + on their modsuit to fly over the lava. + - bugfix: If two cosmic heretics ascend in the same round, their star gazer survival + will be linked to each individual heretic and not shared by just one of them. + - bugfix: You can't click the Knock heretic portal to join as a mob while already + signed up to become a mob. + - balance: Cosmic heretics can't order the Star Gazer around while jaunting. + - balance: The Knock Heretic portal cannot summon Flesh Worms, but can summon Fire + Sharks. + - balance: The Knock Heretic portal will disperse if its creator is killed. + - rscadd: SM crystal can now dust someone or something if it falls on it. + - bugfix: The reverse revolver now looks like a normal Syndicate revolver on inspection. + - bugfix: fixed the stamp in the metastation CMO office always spawning on the floor + - bugfix: You can now spray paint the SM without getting dusted + Smol42: + - rscadd: Added some new hairstyles + Zergspower: + - bugfix: Crew Monitor works again properly + nikothedude: + - rscadd: A waterbreathing quirk + - qol: Waterbreathing is now documented on species pages of the species that have + it diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml new file mode 100644 index 00000000000000..265d5d5136b4e9 --- /dev/null +++ b/html/changelogs/archive/2023-10.yml @@ -0,0 +1,615 @@ +2023-10-01: + Hatterhat: + - balance: Bullets have had their base type's wound bonus reduced back to 0, down + from 20, because wounds are actually quite punishing. Funnily enough, most bullets + already have modified wound bonuses - except c9mm, c10mm, and most incendiaries, + so this probably doesn't change much. + - balance: .50 (used in the snipers and renamed to .416 or whatever) is now back + to TG balance standards. Knockdown on hit, 60 instead of 110 damage, etc. etc. + - bugfix: .50 Soporific was removed because disruptor ammo was right there and nobody + realized it existed. + - bugfix: After review of a missing equipment complaint, Nanotrasen remembered to + pay Lopland's quartermasters to put the customary flashbang and teargas grenade + boxes into the Void Raptor's armory. + Melbert: + - qol: Examine blocked out roundstart / latejoin job information. + - qol: Captain gets a little bit more information about how their radio works roundstart. + - bugfix: Fixed roundstart players not getting radio information. + Paxilmaniac: + - image: The buttondown shirts (underwear) have been updated with a better look + and more contrasted palette + SkyratBot: + - rscadd: A new export has arrived in the imports section, the Galactic Materials + Market! You can use this to buy and sell minerals for profit or cost, as well + as stock your station when you don't have any miners. + - rscadd: Insert sheets of minerals into the Galactic Materials Market to convert + them into a stock block, allowing you to lock in your price for 5 minutes. Wait + too long and it'll be subject to market value again! + - rscadd: Minerals can be bought on the market either using the station's cargo + budget by cargo crew, or privately by everyone else. + - rscdel: Any material stacks that can be bought and sold on the market before have + been removed from the cargo catalog. + - rscadd: Adds Bitrunning to supply department- a semi-offstation role that rewards + teamwork. + - rscadd: Adds new machines to complement the job- net pod, quantum server, quantum + consoles, and the nexacache vendor. + - rscadd: Adds several new maps which can be loaded and unloaded at will. + - rscadd: Some flair for the new bitrunning vendor. + - rscadd: Adds a new antagonist for the virtual domain only. Short lived ghost role + that fights bitrunners. + - rscdel: Removes the BEPIS machine, moves its tech into the Bitrunning vendor. + - bugfix: Fixes missing baseturfs and clowns in mining planet VDOM.. + - qol: Font settings in the chat panel applies to all text now. + - image: new chaplain outfit + - bugfix: Blob spores will respond to rallies more reliably (it won't runtime every + time they try and pathfind). + - bugfix: Blobbernaut pain animation overlays should align with the direction the + mob is facing instead of always facing South + - refactor: Blob spores, zombies, and blobbernauts now all use the basic mob framework. + They should work the same, but please report any issues. + - bugfix: Added warden to list of default required enemies for rulesets. + - bugfix: Blob Zombies and Blobbernauts have had their attack speed restored to + its original value + - refactor: Supermatter Spiders have been refactored into basic mobs, on the extremely + off chance you spot one and also notice any weird bugs regarding it, please + report it. + - balance: There are now 3 roundstart cyborg job slots open by default. + - rscadd: Quantum servers now talk over supply channel when they're done cooling + off. Go outside! + - bugfix: You can no longer use dragon swoop to bypass cordons. + - bugfix: Netpod brain damage is now properly reduced upon server upgrades. + - bugfix: Fixed an bug where swapping bodies in vdom prevented you from disconnecting. + - bugfix: Fixed a bug where a quantum server could get locked out of loading new + domains. + - bugfix: Changed quantum console UI to display "no bandwidth" rather than "none" + - bugfix: Actually fixed the hooked item exploit. + - rscadd: Heretic Rebalance + - balance: Researching the Main Knowledge paths that unlock Side Paths will grant + one Side Point that can be used only on those side paths. You can still spend + normal knowledge points on them if you wish. + - balance: Rune drawing time has been reduced from 30->20 seconds. Codex drawing + time has been reduced from 15->8. + - balance: 'Codex Cicatrix is now a roundstart knowledge, works as an amber focus + when held in-hand and opened, and has had its recipe changed to: 1 of any non-standard + pen (literally anything that isn''t the base pen), any book, and either animal + hide OR a corpse, any kind.' + - code_imp: Added support for using a list inside ritual requirements and a special + 'snowflake check' rituals can utilize. + - balance: The first non-path knowledge, the Mansus Hand Mark, has had its cost + reduced from 2->1 points. + - bugfix: Aloe and other baked foods that don't have reagents can be baked again + without turning to ash + Vekter: + - bugfix: Fixes the missing grinder in Birdshot's Virology department + jjpark-kb: + - bugfix: the ashwalker tendril will allow you to respawn again (the tendril blessing) + - bugfix: the round end report will accurately report ashwalker sacrifices + nikothedude: + - code_imp: Gauze removal is now handled by the gauze's destroy instead of seep_gauze + ninjanomnom: + - rscdel: An easter egg plushie that was spawning where it shouldn't has been brought + back home. + - rscadd: The secure closet can now spawn live gibtonite, enjoy your free bomb. +2023-10-02: + SkyratBot: + - balance: Sci now has access to the materials & canisters section in their departmental + order console + - rscadd: Expanded the fishing portal generator. It now comes with several portal + options that can be unlocked by performing fish scanning experiments, which + also award a modest amount of techweb points. + - balance: The fishing portal generator is now buildable and no longer orderable. + The board can be printed from cargo, service and science lathes. + - balance: Advanced fishing tech is no longer a BEPIS design. It now requires the + base fish scanning experiment and 2000 points to be unlocked. + - rscadd: The advanced fishing rod now comes with an incorporated experiscanner + specific for fish scanning. + - rscadd: Added a new skillchip that may change the icon of the "fish" shown in + the minigame UI to less generic ones. Reaching master level in fishing also + does that. + - qol: The experiment handler UI no longer shows unselectable experiments. + - bugfix: Security officers can now download the crew manifest PDA app that they + start with. + - rscadd: Wizards who complete the grand ritual can now gift everyone with eternal + life + distributivgesetz: + - bugfix: Font scaling in TGUI chat has been reverted to its original implementation. + softcerv: + - rscadd: Adds the mini-soulcatcher, a more lightweight soulcatcher that can be + attached to objects + - rscadd: Adds in the RSD brain interface, an item that allows for soulcatcher souls, + that died within a round and were scanned, to be transferred to a new brain. + - rscadd: Adds in the NIFSoft Scryer, a NIFSoft that gives the user a Scryer they + can use to communicate with other Scryer users. +2023-10-03: + SkyratBot: + - bugfix: fixed misplaced door on syndicate listening post + - rscadd: adds boxes of bandages, a quick healing item + - bugfix: Spiders, Morphs, Fire Sharks, and Regal Rats no longer have a reduced + click speed. + - image: Railings have had a visual update. + projectkepler-ru: + - balance: reverted the nerf on the X-01 + softcerv: + - rscadd: Adds in Purpura Eye, a NIFSoft that allows for the user to hypnotize others. + vinylspiders: + - bugfix: the pollution system will no longer try (and fail) to pollute a turf from + nullspace +2023-10-04: + Coded by Jacquerel, Sprited by Dalmationer: + - rscadd: Added tongs to the kitchen, which you can use to manipulate food from + further away + Fazzie: + - rscadd: Added a budget solar crate to the derelict teleporter room + - rscadd: Added a solar panel control to the north derelict solar + - qol: The derelict's AI coridoor is now shorter and prettier + - rscadd: A lot of new content has been added to the beach away mission + - qol: It also looks substantially better, too! + Motho: + - bugfix: An anonymous visitor to the NSV Void Raptor has turned in security's biosuit + to the lost and found. Security officers everywhere rejoice. + Paxilmaniac: + - rscadd: A significantly smaller selection of new SolFed weapons has taken the + place of the now missing Armadyne selection. + - rscdel: So basically, all of Armadyne is gone. + - qol: A large number of weapons now use singular interchangeable magazine types, + rather than having seven different 9mm magazines to do the same thing + - balance: Any weapon that was replaced is going to have different stats from what + they used to be, numbers subject to change + - sound: Several new firing sounds from TGMC for the new weapons + - image: Whole collection of new ammo, gun, case, and so on sprites by myself + - image: Gun case worn on the back sprites done by Zydras + - code_imp: Where applicable, containers spawning gun stuff use generate_items_inside, + which is much neater than spamming new x(src) + SkyratBot: + - bugfix: The Syndicate have fired their previous construction company after poor + results in recent outposts. + - qol: Departmental order consoles now alert their department via radio when their + cooldown expires + - bugfix: Fix butchered monkeys to transfer reagents and diseases to meat + - bugfix: Fix organs having no DNA and become bloody when violently removed. + - refactor: Raw Prophets now use the basic mob framework. Please report any unusual + behaviour. + - bugfix: Cutting open a hand-pressed paper bundle no longer deletes all of the + paper. + - balance: Kudzu will now be destroyed by adverse weather. + - balance: Kudzu will no longer spread over holes. + - refactor: fixed many instances of updatehealth() either being called needlessly + or not at all within on_mob_life() and in various other parts of the code + - refactor: damage procs now return useful information--the actual net change in + damage on the mob. added a unit test for this + - bugfix: Some icons for selecting character preferences are no longer scaled incorrectly. + ninjanomnom: + - admin: Appearance vars in VV now display instead of being left blank +2023-10-05: + FIoppie: + - sound: '*flap now makes a fluttering noise for moth wings' + - sound: Moths now have a death sound + - qol: '*tremble emote now is just "trembles!" instead of "trembles in fear!"' + LT3: + - image: Added colourable arm and leg wraps + Melbert: + - qol: Moved a lot of maintenance spawnpoints out of non-maintenance rooms. Some + antags (paradox clone, fugitives, nightmares, spiders) are now less likely to + spawn in obvious places like the morgue, tech storage, or dorms rooms. + Motho: + - image: Sector 13's station air alarms and fire alarms have been updated to be + more in line with other frontier station models. + SkyratBot: + - admin: Admins can turn off dynamic rulesets (or force them on despite not meeting + the qualification criteria) on a per-round basis. + - rscadd: The funds the syndicate have been saving by restricting galley access + has been suddenly funneled into a singular mosaic pattern in the experiments + wing. + - balance: CQC legsweeps now cause knockdown instead of paralysis. + - balance: CQC kicks now knockout a target on the floor for ten seconds if they + reach stam crit. Helmet protection shortens the knockout length. + - bugfix: Your heart will no longer be deleted if an admin heals you while you have + corazargh in your system. + - refactor: The cursed heart has been streamlined a bit, and now gives you a visual + cooldown for when you can beat your heart again. + Wallem: + - rscadd: Adds The Hand of Midas, an ancient Egyptian matchlock pistol. + honkpocket: + - bugfix: Extra magazines for all the Foam Force guns are now purchasable from cargo + imports + - rscadd: The Foam Force dart collector MOD modules are now purchasable from cargo + imports + - sound: added a unique racking sfx for the sol 'Renoster' shotgun + softcerv: + - qol: NIFSofts now use the same TGUI as their parent NIF. + tf-4: + - bugfix: Fixed some weirdness with mould mob attacks. + - qol: Mold mobs delete themselves on death. +2023-10-06: + LT3: + - image: Job icon for departmental guards, DS2 and other SR specific jobs are properly + aligned + Majkl-J: + - bugfix: Table to the cafe food processor + RatFromTheJungle: + - balance: Interdyne now spawns with Sidano SMG's, instead of .50 snipers + - bugfix: you can now actually wear the 'LIZARED' top, yippie! + SkyratBot: + - bugfix: The Galactic Materials Market now offers things for sale as it should. + - rscadd: Added blackout, happens when you drink...ALOT + - bugfix: plumbing reaction chamber now balances the ph of it's solution correctly + to the best of it's ability so no guarantees + - code_imp: converted plumbing reaction chamber & mixing chamber UI files to Typescript + - refactor: plumbing mixing chamber now also accepts an TGUI input list to input + it's chemicals + - image: We have received a new shipment of IDs, as the old ones were found out + to be haunted. + - image: Laser tag red team ID has received a massive nerf + - image: Station budget cards have gotten a facelift + - image: Emags and Doorjacks + - bugfix: Numbered prisoner IDs will now be legible + Wallem: + - rscadd: Buffs the Active Sonar module with a radial scan, and makes the power + costs more in-line with other modules. + softcerv: + - bugfix: the ghost role NIF boxes now contain the Purpura Eye NIFSoft + vinylspiders: + - bugfix: fixes gender shaping and height offsets on underwear + - bugfix: female gender shaping now works with digi jumpsuits + - bugfix: fixed rainbow jumpsuit digi sprite +2023-10-07: + GoldenAlpharex: + - bugfix: The round end report will no longer expose people's ckeys for the achievements + they obtained through the round, nor when they're contractor support agents. + LT3: + - bugfix: Adjusted Void Raptor shutters and firelocks in the pharmacy, hallway and + HoP line + - balance: Hypovial capacity now matches bottle capacity + - bugfix: Broken and placeholder hypovials can no longer be printed in the ChemMaster + Melbert: + - qol: AI, cyborg, and PAI camera (photo taking) behavior now uses balloon alerts + and has sound effects associated + - refactor: Refactored AI, cyborg, and PAI camera (photo taking) code + - bugfix: fixed being unable to print photos as a cyborg when below 50% toner, even + though photos only take 5% + SkyratBot: + - bugfix: Engineering borgs can no longer grab and drop their own iron/glass sheet + module. + - bugfix: It is no longer possible to chasm yourself on the geode. Again. + - rscadd: Fish analyzers can now be used to perform fish scanning experiments. + - balance: They can now be singularly bought as a goodie pack for 125 cr each, instead + of a crate of three for 500 cr. + - bugfix: Borgs will no longer become permanently upside-down if tipped over by + multiple people at the same time. + - balance: Despite earlier reports suggesting that the famous lethality of the Regal + Condor was largely a myth, there has been rumors that the gun has once again + started to display its true killing potential on any station that it 'manifests'. + - bugfix: The AI can no longer turn you off if you shapeshift into a robot. + - bugfix: Blood once again appears as small drops instead of splatters during minor + bleeding. + - bugfix: you are now made a ghost faster if you get gibbed + - bugfix: fixed bad food not having bad food reagents + - rscadd: The laser carbine, a weak but fully automatic sidegrade to the normal + laser gun, can now be ordered from cargo. + - bugfix: Adminheal will now properly clear negative mutations as intended. + - bugfix: Ice whelps can now use spells given to them by admins, and people who + have polymorphed into ice whelps can now polymorph back to normal. + - bugfix: Fixed silent catwalks. + - rscadd: Fake moustaches are now poorly slapped on top of what you're wearing + jjpark-kb: + - rscadd: ashwalker nest is now in the NE corner of lavaland + neocloudy: + - bugfix: MetaStation disposal pipes from Cargo to Disposals/the rest of the station + are working again. + nikothedude: + - rscadd: Synthetic wounds! Blunt, Pierce, Slash, Burn, Muscle. See PR 23733 for + more information + - rscadd: Robodrobe now has 2 chilled hercuri sprays for treating synthetic burn + wounds + - rscadd: Robodrobe now has 2 pairs of black gloves to let robotics painlessly meld + T3 synthetic blunt wounds + - balance: 'Synthetic damage multiplier: 1.3 -> 1.0' + - rscadd: '3 new cargo packs to science: 2 chilled hercuri, a synth trauma kit, + and synth medicine' + - balance: Quadruple amputee can now be picked with frail + - rscadd: Interdyne/DS2 now have advanced synthetic trauma kits in their medbays +2023-10-08: + LT3: + - image: Text alignment on ID cards slightly adjusted + Melbert: + - bugfix: Fixed an error from reading an ID card closely when you can't read + - config: Adds a config option for player respawning that enables respawns, but + forces you pick a new character. + - config: '"NORESPAWN" has been replaced with "ALLOW_RESPAWN 0". Unlimited respawns + is "ALLOW_RESPAWN 1" and character limited respawns is "ALLOW_RESPAWN 2".' + SkyratBot: + - bugfix: Fix bodies now lose fire stacks while husked. + - bugfix: Flesh Worms will move smoothly more consistently. + - balance: You can now remove and replace power cells from PDAs (with screwdriver). + - balance: PDAs now drain their power cells harder, and also take into account active + programs & their flashlight being on. + - balance: PDAs running out of charge now turn their flashlights off. + - qol: allows janitor keys to be stored in janitor wintercoats and janibets + - bugfix: PDA flashlights wont cause the cell to constantly drain faster and faster. + - bugfix: People who are irremediably bald can still grow a beard with barber aid. + - qol: Added slapcrafting to unloaded tech shells, click on them with ingredients + to quickly craft your shell. + - qol: gives empty fireaxe and mech removal crowbars cabinets directional helpers + - bugfix: fixed a PDA's messenger TGUI issue with handling of destroyed recipients. + - qol: '"prison" intercoms have been renamed to "receive-only" intercoms to make + it clearer they cannot transmit.' + - refactor: Rust Walkers, Ash Spirits, Flesh Stalkers, and The Maid in the Mirror + now use the basic mob framework. Please report any unusual behaviour. + - spellcheck: '"offical" has been officially corrected to "official" in several + official locations.' + - refactor: Sloths are now basic mobs, however their overall sluggish behavior shouldn't + have changed much- let us know if anything is broken. + - refactor: Refactored goats into basic mobs! Not much should have changed beyond + their endless desire to retaliate should you attack them, they're still just + as good as chomping away plant life as ever. + - qol: Miners can now tag monster spawners (necropolis tendrils, animal dens, demonic + portals, and netherworld links) by using their mining scanner on it, which updates + their GPS tag (and/or gives them one) to give it a numerical designation and + a short identifier for what it's spawning. + oranges: + - rscadd: Dogs now react to centrist grillers more realistically +2023-10-09: + Nerev4r: + - image: The crew's knowledge of origami and papercrafting has been extended to + making paper masks. Find them in the loadout, or just make them! + SkyratBot: + - qol: Supermatter shards can now be fastened with right click too. Now, just don't + forget to use a wrench. + - bugfix: Slaughter/Laughter demon melee cooldowns have been fixed and now attack + at the regular player character attack speed + - balance: The chemical gun and PKA pressure mod traitor items are now purchasable + within 15 minutes of the round starting rather than 20/30. + - balance: All preset bundle kits, the cash briefcase, the makarov, the revolver, + the throwing weapon kit, c4, the detomatix cartridge, the large EMP bomb, gorillas, + advanced mimery tome, pie cannon, clown car, His Grace, and the origami kit + are now all purchasable at the start of a round. + - refactor: ice demons have been refactored into basic mbos. please report any bugs + - rscadd: ice demons now have a unique trophy + - bugfix: Spider types get properly checked again. + nikothedude: + - bugfix: Borers work now +2023-10-10: + Fazzie: + - qol: NT's logo on Centcom's landing pad looks better + - qol: Centcom's Cargo and other rooms had their items rearanged to look marginally + better. Like you're every gonna see them! + - bugfix: The Thunderdome on Centcom now has up-to-date cooking machinery + GoldenAlpharex: + - qol: "You can now bind the Shift Layer Up/Down verbs to keybinds! Look for \"\ + shiftlayerup\" and \"shiftlayerdown\" respectively in your Game Preferences\ + \ >\_Keybindings to bind them, as they aren't bound by default (for now)!" + Hatterhat: + - qol: Internal health analyzer no longer displays both health and chem scans at + the same time; LMB for health, RMB for chems. + Melber: + - bugfix: Wearing bread (or roses, or other non-mask things) no longer prevents + you from TTS speaking. + Melbert: + - bugfix: Robotic bodyparts not attached to people are now properly affected by + EMPs. + - bugfix: Virtual Drink Glasses now look correct. + Motho: + - rscadd: Bitrunners can now have alternative job titles. FTU urges that these titles + are purely cosmetic and not representative of bitrunning ability. + - rscadd: Barbers, Botanists, Warehouse Techs, Coroners, Curators, Cyborgs, Geneticists, + Mimes, Nanotrasen Consultants, Roboticists, and Virologists enjoy new alternative + job titles. + - rscadd: Certain jobs now have Trainee/Newbie alternative job titles ordered at + the very bottom of the title selection dialog. If you or your character are + new to the job/department, set your title so your colleagues are aware! + - rscdel: Removed Engineering Trainee. + - qol: Alphabetized alt-titles excluding two key areas. The base title, and the + newbie title. + Nerev4r: + - image: One new long ring tail! + SkyratBot: + - bugfix: Warm donk-pockets should now have omnizine in them again. + - code_imp: COMSIG_GLOB_LIGHT_MECHANISM_COMPLETED is now COMSIG_GLOB_PUZZLE_COMPLETED + - qol: The autopsy tray (and surgery trays) can now hold the autopsy scanner + - bugfix: Metastation disposals will no longer infinitely loop garbage around the + station. + - bugfix: fixed gibbing from having too much blood not working in some cases + - refactor: Heavily refactored mirrors to be less ass cancer 1998 code. Player facing + changes are that mirrors now use a radial menu, women can get beards in magic + mirrors, made the magic mirror 'change sex' option Woke (it supports the 4 official + genders and physique as well) + - bugfix: Fixed Pride Mirror teleporting you into the space on the first use. Now + it waits until you officially cancel and say 'I am Done' so you can customize + yourself to your liking. + - bugfix: Cowardly mobs will consistently run away from you instead of getting tired + and just sort of standing there after an initial burst of movement. + - bugfix: Virtual domain gondola meat will no longer have a small chance to turn + you into a weaker gondola variant + - bugfix: Added extra checks to bitrunning domain cleanup so avatars are deleted + properly. + - rscadd: Quantum servers now look for a new machine called a byteforge to spawn + loot on- no longer on an invisible landmark. This should make the rooms rebuildable + after disasters. + - rscadd: '*Most* bitrunning machinery is now researchable and buildable via circuits + in the engineering protolathe.' + - refactor: Refactor gib code to be more robust. + - qol: Gibbing a mob will result in all items being dropped instead of getting deleted. + There are a few exceptions (like admin gib self) where this will not take place. + - code_imp: made an eensy teensie weensie change to some supermatter boilerplate + - code_imp: moved some global procs and vars related to reagents to its own dedicated + file. removed some unused procs and macros + - code_imp: heavy auto docs for a lot of procs + - refactor: adds reagent sanity and bound check code + - refactor: multiple reagents are more uniformly distributed when transferring them + between beakers or dropper & in every other reagent dependent operation + - code_imp: exploration drone adventures are now file-based and not database-based + - bugfix: Images are once more displayed as images in vv instead of as an appearance + TheSS13Melon: + - bugfix: Bitrunner now shows up with other cargo jobs on the suit sensors menu. + Wallem: + - rscadd: Nuclear Operatives now have ready access to ancient cowboy technology + in the form of the Outlaw Bundle. Now you too can roll into town on your horse. + honkpocket: + - bugfix: the OPFOR loadout 'Syndicate insurgent bundle' MODsuit is subtyped correctly + - bugfix: the OPFOR loadout 'Blood-Red MODsuit' is subtyped correctly + - balance: changes the mask in the 'Syndicate insurgent bundle' from SWAT to Syndicate + nikothedude: + - qol: SAD patients can now reject the treatment at the last step, preventing any + changes from being made + - balance: Synth tend wounds repeatable step now takes 2.5 seconds from 1 + - balance: 2 new synth tend wounds upgrades available to research + - bugfix: Synth tend wounds now gives proper feedback + - bugfix: Flipped tables now properly block movement + - balance: Defibrilators now EMP synths and apply a temporary brain trauma for 90 + seconds to them + - balance: Synth revival surgery time and steps vastly reduced/streamlined + ninjanomnom: + - rscadd: Pipes now have a colored visual display that shows their contents at a + glance. + softcerv: + - spellcheck: renames the purpura NIFSofts to libidine +2023-10-11: + GoldenAlpharex: + - bugfix: Frogs no longer make obnoxious sounds anymore (again). + Melbert: + - bugfix: Miner's Salve, Sterilizine, and Space Cleaner now all properly affect + burn wounds + Paxilmaniac: + - bugfix: The quartermaster's Rengo rifle will no longer have floating bayonets + SkyratBot: + - bugfix: moved a garbage spawner on Tramstation that was causing random runtimes + due to sometimes spawning in space depending on which module got loaded + - bugfix: fixes a runtime in organ on_death() + - bugfix: fixed some faulty research connections in between heretic's blade and + rust paths. + - bugfix: Heretic mobs will not be summoned with AI enabled, and won't turn into + small animals instead of summoning a flesh stalker. + - bugfix: Fixed some issues in the security camera UI - pressing next or back will + now loop through the cameras + - bugfix: Fixed some style issues in the camera console where selected cams weren't + showing as selected + - bugfix: Camera console search works again + - bugfix: you can no longer polymorph belt into a holoparasite + - refactor: Revenants, the mob that's split between planes of Life and Death, have + been refactored into a basic mob. While this alone shouldn't touch behavior, + a lot of the backend code has been gutted and refactored to try and furnish + a better antagonist experience. This might mean that some weird stuff can come + up and around, report something if it's utterly broken. + - code_imp: In order to better facilitate some code, you do not ghost outside of + a revenant on death, you simply get transferred into the ectoplasm. You should + still be able to speak with your ghost friends on how hard you got wrecked or + if you'll be able to resurrect though. + - code_imp: The timing on revenant stuff such as being revealed, stunned, and inhibited + (by holy weapons) should be tweaked a bit to allow better management. This should + mean that getting unstunned and such should be a bit more precise now. + - qol: Revenant instructions are now relayed in a neat little examine block. + - bugfix: Wound promotion and demotion no longer removes gauze from the limb + - balance: The Changeling Space Suit has been replaced by a new ability which makes + you passively spaceproof without replacing your clothing. + - admin: Editing the atmos sensitivity variables on a basic mob during the game + will now actually do something. + - qol: Adds a base physical description proc to gameplay species, displays it on + magic mirrors. It will give a description of not the lore of the species but + in what way they differ from base species. + - bugfix: Fixes a bad subtype on magical mirrors. + - bugfix: Magical mirrors now give the user ADVANCEDTOOLUSER and LITERACY if they + lack either of them, so monkey wizards aren't softlocked. + - bugfix: Borg modules can no longer be sold by pirates. + - balance: Unholy water acts as a coagulant for cultists. + - bugfix: bitrunners will no longer be lumped in with assistants on the crew monitor + console's display + - bugfix: count station food verb now counts food only onstation + - bugfix: Antiglow now probably has negative glow power. + - refactor: Harvester constructs have been updated to the basic mob framework. This + should have very little impact on their behavior, but please report any issues. + - bugfix: Fixes a few runtimes with TTS and skips some code if TTS isn't enabled. + - sound: Add burning sound loop to bonfires and fireplaces + - code_imp: Improved fireplaces to only process when lit + - bugfix: using a magic mirror to change gender or skintone will now update your + icon properly to match your selection + - rscadd: Adds practice carbines to all firing ranges. They don't deal damage. + - balance: Reviver Implant now able to revive dead people. + nikothedude: + - bugfix: Chest/Heads can now be augmented in the augment menu + - bugfix: Augments menu color wheels now properly recognize existing color + - rscadd: Science can now print advanced tools + - rscadd: Robotics can now print advanced medical tools and health analyzers + - rscadd: Roboticists can now randomly get advanced engi/medical tools in the mail + - rscadd: Table flipping now throws everything on the table +2023-10-12: + GoldenAlpharex: + - bugfix: Bitrunners and Coroners now have Akula outfits. + - bugfix: Shaft Miners now have the Cargo Akula outfit, rather than the default + one. + Hatterhat: + - balance: Blueshield's armor is now on par with a regular security vest's, with + comparatively improved fire/acid and barely improved bomb armor. (None of their + equipment covers their legs.) + - image: Blueshield's vest is now reskinnable, with three variants; the old slim + variant, a sec-vest variant, and a marine variant. + - image: Blueshield's earpiece is no longer a bright blue tumor on the side of their + head. + LT3: + - bugfix: After the untimely loss of too many novice HoPs, the Icebox "New IDs and + You" instructions have been moved from the icemoon wastes to the HoP's office, + ending this rite of passage + - bugfix: Added some missing firelocks in the pharmacy area. Icebox pharmacy now + has a shower + OrionTheFox: + - image: returns Lopland Security's blue ID trims, and updated a few modular ID + trims for DS2/NRI + SkyratBot: + - code_imp: removed round robin method of transferring reagents which would result + in some missing reagents after transferring. + - code_imp: added some more rounding for reagent operations. + - code_imp: cleaned up some plumbing & reaction chamber code + - code_imp: improves the performance of `update_total()` , `clear_reagents()` & + `del_reagent()` procs + - bugfix: plumbing setups will no longer output 0 or more than maximum available + volume of reagents. + - bugfix: removing, copying, transfering reagents is now done proportionally and + not equally again. + - refactor: examining individual reagents up close will display their volumes up + to 4 decimal places for accuracy. + - qol: droppers & beakers round the amount of reagents transferred before displaying + them to chat for easy readibility + - sound: the blood cult's rise to power is now accompanied by several new sound + effects + - rscadd: Adds a new lavaland ruin where you can find a unique egg. + - image: you can now change the style of lipstick to be higher or lower on the face + by alt-clicking the lipstick tube + - balance: Flesh Spiders heal automatically over time if they go a short time without + taking damage, instead of healing large chunks by clicking themselves and waiting + two seconds. + - qol: Spider egg clusters which only hatch into one kind of spider don't ask you + to select that one type from a radial menu with one option on it. + - qol: As a Flesh Spider, the game now tells you how you can heal yourself. + - bugfix: You cannot order with cargo budget if you don't have cargo access in the + Galactic Market + - bugfix: Private & Cargo orders no longer get mixed together in the same crate + if you order them interchangeably so no more embezzlement in the Galactic Market + - bugfix: Orders made with cargo budget come in a regular cargo crate thus allowing + you to open them without QM cargo budget card in the Galactic Market + - qol: Orders made in the Galactic Market will deduct money from your account/cargo + budget only after the order has been confirmed in the cargo request console + & after the shuttle arrives with your order. This way you drain the budget only + after your orders were successfully delivered and not before hand itself + - qol: You can now see what drones and gorillas are holding by examining them. + - admin: It's now easier to give handless mobs hands by applying the "dextrous" + element. + - balance: Spiders and Bears can now climb railings (you know if... they'd rather + do that than destroy them). + - refactor: venus human traps are basicmobs now + - balance: venus human traps have 100 health + - balance: venus human traps take damage out of range of kudzu, heal near kudzu, + are slightly slower, attack slower, and their damage output is slightly more + random + - balance: also venus human trap tangle ability now needs you to actually move backwards + to pull victims + - admin: Gondola supplypods are functional again. + - bugfix: Examining twice experiment handlers with an active fish-related experiment + now gives a comprehensible, correctly spaced list of scanned species rather + than something like "pufferfishguppyslimefishchasmchrab". + - bugfix: No more "line snapped" balloon messages everytime the fishing minigame + is over + - bugfix: Getting to the Master level of the fishing skill now correctly gives you + that slight helping hand to identify yet-to-be-caught fishes. + nikothedude: + - qol: Table flipping feedback is now in the form of balloon alerts + - rscadd: Robo can now print standard and alien surgical tools + - bugfix: Defibs now dont screw over organics if the user was robotic diff --git a/icons/area/areas_station.dmi b/icons/area/areas_station.dmi index b07ea38a1592b0..cbfe463efa5169 100644 Binary files a/icons/area/areas_station.dmi and b/icons/area/areas_station.dmi differ diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi index 38d1d44a000d13..31f26c3e6e11ea 100644 Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi index ae695c3227f3de..12e3ce9f7d5946 100644 Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ diff --git a/icons/effects/bitrunning.dmi b/icons/effects/bitrunning.dmi new file mode 100644 index 00000000000000..bfdc7c63436c2f Binary files /dev/null and b/icons/effects/bitrunning.dmi differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 29e59dc6c7148d..b01986a9522d0e 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/hud/fishing_hud.dmi b/icons/hud/fishing_hud.dmi index b68acee09b76af..58c478d071064c 100644 Binary files a/icons/hud/fishing_hud.dmi and b/icons/hud/fishing_hud.dmi differ diff --git a/icons/hud/radial.dmi b/icons/hud/radial.dmi index 897cb3a872e292..42d5c451018aec 100644 Binary files a/icons/hud/radial.dmi and b/icons/hud/radial.dmi differ diff --git a/icons/hud/radial_fishing.dmi b/icons/hud/radial_fishing.dmi new file mode 100644 index 00000000000000..65fd55176b7c82 Binary files /dev/null and b/icons/hud/radial_fishing.dmi differ diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi index a1fc01434e4564..0fa8ec218500ed 100755 Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 546e3da0f86aa6..d1a1777e4e4d8f 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/head/chaplain.dmi b/icons/mob/clothing/head/chaplain.dmi index efb6ec3c9e9082..100b7ee922fb91 100644 Binary files a/icons/mob/clothing/head/chaplain.dmi and b/icons/mob/clothing/head/chaplain.dmi differ diff --git a/icons/mob/clothing/head/plasmaman_head.dmi b/icons/mob/clothing/head/plasmaman_head.dmi index 9846cf02200117..1917ae7bcf538b 100644 Binary files a/icons/mob/clothing/head/plasmaman_head.dmi and b/icons/mob/clothing/head/plasmaman_head.dmi differ diff --git a/icons/mob/clothing/suits/chaplain.dmi b/icons/mob/clothing/suits/chaplain.dmi index 4b6368fb291d0e..8806bf5f679b44 100644 Binary files a/icons/mob/clothing/suits/chaplain.dmi and b/icons/mob/clothing/suits/chaplain.dmi differ diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi index cd924e847eb3e4..a6f25d91c59bfe 100644 Binary files a/icons/mob/clothing/suits/jacket.dmi and b/icons/mob/clothing/suits/jacket.dmi differ diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index 4bf30a67a2d7bd..180f0e4ec876fb 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/clothing/under/plasmaman.dmi b/icons/mob/clothing/under/plasmaman.dmi index 41cbfb4482b48b..fcc8f008cd7aa8 100644 Binary files a/icons/mob/clothing/under/plasmaman.dmi and b/icons/mob/clothing/under/plasmaman.dmi differ diff --git a/icons/mob/effects/debuff_overlays.dmi b/icons/mob/effects/debuff_overlays.dmi new file mode 100644 index 00000000000000..383ce22aabec7f Binary files /dev/null and b/icons/mob/effects/debuff_overlays.dmi differ diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi index 9a602eeb806abd..d71ba4b0940a67 100644 Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ diff --git a/icons/mob/human/human_face.dmi b/icons/mob/human/human_face.dmi index 6985cf07eee49a..6530b300aa676e 100644 Binary files a/icons/mob/human/human_face.dmi and b/icons/mob/human/human_face.dmi differ diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi index 7111ee4d7480b0..191c85cf4825c8 100644 Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi index 96756fc44db9cd..8038e7474ee870 100644 Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi index 757fb8b8593c72..8b9fa5256a9327 100644 Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi index c749a2ed98a8e0..c88f4d224444fc 100644 Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index 7ce3674c86aadf..feaed1690786ec 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index 6ceb5efe4d83cd..15ccf5c090e599 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/mob/simple/animal.dmi b/icons/mob/simple/animal.dmi index 6e8b31b7877c40..87fe3a21506b1d 100644 Binary files a/icons/mob/simple/animal.dmi and b/icons/mob/simple/animal.dmi differ diff --git a/icons/mob/simple/jungle/mook.dmi b/icons/mob/simple/jungle/mook.dmi index c9265b22a0ad20..fbc38d29d99deb 100644 Binary files a/icons/mob/simple/jungle/mook.dmi and b/icons/mob/simple/jungle/mook.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_monsters.dmi b/icons/mob/simple/lavaland/lavaland_monsters.dmi index 38b78cf468f1f1..f68e3db4a6cb91 100644 Binary files a/icons/mob/simple/lavaland/lavaland_monsters.dmi and b/icons/mob/simple/lavaland/lavaland_monsters.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi b/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi index 2be68ef4c6696e..808fdc59d9bae9 100644 Binary files a/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi and b/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi differ diff --git a/icons/obj/aquarium.dmi b/icons/obj/aquarium.dmi index 3a27c83c906a83..19e2e68c4f8f33 100644 Binary files a/icons/obj/aquarium.dmi and b/icons/obj/aquarium.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index a5c4e8283010bd..a5e34e9cc27cbf 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 20f24dd22402f8..fd898d3105fd88 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/head/chaplain.dmi b/icons/obj/clothing/head/chaplain.dmi index d95436fdd2d7ac..ed6f6248b317c6 100644 Binary files a/icons/obj/clothing/head/chaplain.dmi and b/icons/obj/clothing/head/chaplain.dmi differ diff --git a/icons/obj/clothing/head/plasmaman_hats.dmi b/icons/obj/clothing/head/plasmaman_hats.dmi index adcf9129c45830..f593a08b88c300 100644 Binary files a/icons/obj/clothing/head/plasmaman_hats.dmi and b/icons/obj/clothing/head/plasmaman_hats.dmi differ diff --git a/icons/obj/clothing/suits/chaplain.dmi b/icons/obj/clothing/suits/chaplain.dmi index 64474a04d31821..730e47cd6fa949 100644 Binary files a/icons/obj/clothing/suits/chaplain.dmi and b/icons/obj/clothing/suits/chaplain.dmi differ diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi index c63f262f104944..dc507017cd25d9 100644 Binary files a/icons/obj/clothing/suits/jacket.dmi and b/icons/obj/clothing/suits/jacket.dmi differ diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi index fc04a897d5ea86..63e40538899f7d 100644 Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ diff --git a/icons/obj/clothing/under/plasmaman.dmi b/icons/obj/clothing/under/plasmaman.dmi index 4277c43d54b405..4d416d5b05f1f2 100644 Binary files a/icons/obj/clothing/under/plasmaman.dmi and b/icons/obj/clothing/under/plasmaman.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index d89ee6e5d6408f..fe74b6c11c5c7d 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/economy.dmi b/icons/obj/economy.dmi index dc90265b6e9019..04abc41cae1753 100644 Binary files a/icons/obj/economy.dmi and b/icons/obj/economy.dmi differ diff --git a/icons/obj/fishing.dmi b/icons/obj/fishing.dmi index 39bcc853442005..f7ab9fc1ad9c2a 100644 Binary files a/icons/obj/fishing.dmi and b/icons/obj/fishing.dmi differ diff --git a/icons/obj/food/egg.dmi b/icons/obj/food/egg.dmi index c7661fca918f0c..58908d8247913d 100644 Binary files a/icons/obj/food/egg.dmi and b/icons/obj/food/egg.dmi differ diff --git a/icons/obj/machines/bepis.dmi b/icons/obj/machines/bepis.dmi deleted file mode 100644 index f348c2e1b05596..00000000000000 Binary files a/icons/obj/machines/bepis.dmi and /dev/null differ diff --git a/icons/obj/machines/bitrunning.dmi b/icons/obj/machines/bitrunning.dmi new file mode 100644 index 00000000000000..b3f8ad63a6c993 Binary files /dev/null and b/icons/obj/machines/bitrunning.dmi differ diff --git a/icons/obj/machines/computer.dmi b/icons/obj/machines/computer.dmi index 10974f97bac685..5ffa3445db6922 100644 Binary files a/icons/obj/machines/computer.dmi and b/icons/obj/machines/computer.dmi differ diff --git a/icons/obj/machines/microwave.dmi b/icons/obj/machines/microwave.dmi index 427a5d9daaee6c..7a72ba5d3dca3a 100644 Binary files a/icons/obj/machines/microwave.dmi and b/icons/obj/machines/microwave.dmi differ diff --git a/icons/obj/medical/stack_medical.dmi b/icons/obj/medical/stack_medical.dmi index d12949da595f1a..c4ec905786c699 100644 Binary files a/icons/obj/medical/stack_medical.dmi and b/icons/obj/medical/stack_medical.dmi differ diff --git a/icons/obj/mining_zones/artefacts.dmi b/icons/obj/mining_zones/artefacts.dmi index f3f7d00e4eef8f..d4c603834d21be 100644 Binary files a/icons/obj/mining_zones/artefacts.dmi and b/icons/obj/mining_zones/artefacts.dmi differ diff --git a/icons/obj/pipes_n_cables/!pipe_gas_overlays.dmi b/icons/obj/pipes_n_cables/!pipe_gas_overlays.dmi new file mode 100644 index 00000000000000..0262adcaeb2419 Binary files /dev/null and b/icons/obj/pipes_n_cables/!pipe_gas_overlays.dmi differ diff --git a/icons/obj/pipes_n_cables/!pipes_bitmask.dmi b/icons/obj/pipes_n_cables/!pipes_bitmask.dmi new file mode 100644 index 00000000000000..97643036fbe3bb Binary files /dev/null and b/icons/obj/pipes_n_cables/!pipes_bitmask.dmi differ diff --git a/icons/obj/pipes_n_cables/pipe_template_pieces.dmi b/icons/obj/pipes_n_cables/pipe_template_pieces.dmi new file mode 100644 index 00000000000000..d0d2f7ff7bb809 Binary files /dev/null and b/icons/obj/pipes_n_cables/pipe_template_pieces.dmi differ diff --git a/icons/obj/pipes_n_cables/pipes_bitmask.dmi b/icons/obj/pipes_n_cables/pipes_bitmask.dmi deleted file mode 100644 index 7a382fb55c5e40..00000000000000 Binary files a/icons/obj/pipes_n_cables/pipes_bitmask.dmi and /dev/null differ diff --git a/icons/obj/railings.dmi b/icons/obj/railings.dmi index 28332e21324550..3dbbd7c8318e70 100644 Binary files a/icons/obj/railings.dmi and b/icons/obj/railings.dmi differ diff --git a/icons/obj/service/kitchen.dmi b/icons/obj/service/kitchen.dmi index cb47ddf35a2a6b..aeafe2591e9bdf 100644 Binary files a/icons/obj/service/kitchen.dmi and b/icons/obj/service/kitchen.dmi differ diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi index 7ff4067c288600..d660e1b7bfe388 100644 Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi index cdaf8cae339f71..a55606fa3b33ba 100644 Binary files a/icons/obj/storage/storage.dmi and b/icons/obj/storage/storage.dmi differ diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi index 97b75335b91a0e..e45c5ee4869ed7 100644 Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ diff --git a/icons/obj/weapons/guns/magic.dmi b/icons/obj/weapons/guns/magic.dmi index fe3eb6ae895f63..7cab0cdfc25926 100644 Binary files a/icons/obj/weapons/guns/magic.dmi and b/icons/obj/weapons/guns/magic.dmi differ diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi index e1c70c4f5ade42..3c2d3ff452cd0c 100644 Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 8a1575fcec6407..6ddc178b98cdb3 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/modular_skyrat/master_files/code/datums/components/grillable.dm b/modular_skyrat/master_files/code/datums/components/grillable.dm new file mode 100644 index 00000000000000..42146559af1ff5 --- /dev/null +++ b/modular_skyrat/master_files/code/datums/components/grillable.dm @@ -0,0 +1,9 @@ +/datum/component/grillable + /// What type of pollutant we spread around as we are grilleed, can be none + var/pollutant_type + +/datum/component/grillable/Initialize(cook_result, required_cook_time, positive_result, use_large_steam_sprite, list/added_reagents, pollutant_type) + . = ..() + if(. == COMPONENT_INCOMPATIBLE) + return + src.pollutant_type = pollutant_type diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index b26e823b0e0436..f0bcde700876ed 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -1,8 +1,8 @@ // MODULAR ID TRIM ACCESS OVERRIDES GO HERE!! +//(Most) of Security has inverted IDs, with custom blue-on-black icons. This is to distinguish them from their head, who has a white-on-blue icon /datum/id_trim/job/head_of_security - trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' - subdepartment_color = COLOR_ASSEMBLY_BLACK // This actually is the shade of grey formerly used by the static icons! Didn't have to add anything extra! Just thought that was neat. + subdepartment_color = COLOR_ASSEMBLY_BLACK /datum/id_trim/job/warden trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' @@ -53,10 +53,10 @@ department_color = COLOR_COMMAND_BLUE subdepartment_color = COLOR_CENTCOM_BLUE // Not the other way around. I think. sechud_icon_state = SECHUD_BLUESHIELD - extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare + extra_access = list(ACCESS_BRIG, ACCESS_CARGO, ACCESS_COURT, ACCESS_GATEWAY, ACCESS_SECURITY) minimal_access = list( - ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, - ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, + ACCESS_BRIG_ENTRANCE, ACCESS_COMMAND, ACCESS_CONSTRUCTION, ACCESS_DETECTIVE, ACCESS_ENGINEERING, + ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_WEAPONS, ) minimal_wildcard_access = list(ACCESS_CAPTAIN) template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -68,13 +68,15 @@ subdepartment_color = COLOR_GREEN sechud_icon_state = SECHUD_NT_CONSULTANT extra_access = list() - minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINEERING, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_COMMAND, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_TELEPORTER, ACCESS_CENT_GENERAL) + minimal_access = list( + ACCESS_AI_UPLOAD, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_AUX_BASE, ACCESS_BAR, ACCESS_BRIG_ENTRANCE, + ACCESS_CENT_GENERAL, ACCESS_CHANGE_IDS, ACCESS_CHAPEL_OFFICE, ACCESS_COMMAND, ACCESS_CONSTRUCTION, + ACCESS_CREMATORIUM, ACCESS_COURT, ACCESS_ENGINEERING, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_HOP, ACCESS_HYDROPONICS, + ACCESS_JANITOR, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN, ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, + ACCESS_MEDICAL, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, + ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_PSYCHOLOGY, ACCESS_RC_ANNOUNCE, + ACCESS_RESEARCH, ACCESS_SECURITY, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_VAULT, ACCESS_WEAPONS + ) minimal_wildcard_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL) template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -86,9 +88,11 @@ subdepartment_color = COLOR_ASSEMBLY_BLACK sechud_icon_state = SECHUD_CORRECTIONS_OFFICER extra_access = list() - minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, - ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) + minimal_access = list( + ACCESS_BRIG, ACCESS_BRIG_ENTRANCE, ACCESS_COURT, + ACCESS_MAINT_TUNNELS, ACCESS_SECURITY, ACCESS_WEAPONS + ) + template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS, ACCESS_HOS) job = /datum/job/corrections_officer /datum/id_trim/job/barber @@ -99,6 +103,6 @@ subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_BARBER extra_access = list() - minimal_access = list(ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_BARBER, ACCESS_SERVICE) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + minimal_access = list(ACCESS_BARBER, ACCESS_MAINT_TUNNELS, ACCESS_SERVICE, ACCESS_THEATRE) + template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS, ACCESS_HOP) job = /datum/job/barber diff --git a/modular_skyrat/master_files/code/datums/storage/subtypes/pockets.dm b/modular_skyrat/master_files/code/datums/storage/subtypes/pockets.dm index 491eb74443a5f3..75a2f01aa9927f 100644 --- a/modular_skyrat/master_files/code/datums/storage/subtypes/pockets.dm +++ b/modular_skyrat/master_files/code/datums/storage/subtypes/pockets.dm @@ -4,18 +4,8 @@ . = ..() add_holdable(list( - // Adds pistol magazines from guncargo companies in their respective order - /obj/item/ammo_box/magazine/multi_sprite/pdh, - /obj/item/ammo_box/magazine/multi_sprite/ladon, - /obj/item/ammo_box/magazine/multi_sprite/firefly, - /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper, - /obj/item/ammo_box/magazine/multi_sprite/mk58, - /obj/item/ammo_box/magazine/m45, - /obj/item/ammo_box/magazine/pepperball, // boot pepper - /obj/item/ammo_box/magazine/multi_sprite/g17, - /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby, - /obj/item/ammo_box/magazine/multi_sprite/cfa_snub, - /obj/item/ammo_box/magazine/multi_sprite/makarov, + /obj/item/ammo_box/magazine/c35sol_pistol, + /obj/item/ammo_box/magazine/c585trappiste_pistol, /obj/item/ammo_box/magazine/m9mm_aps, /obj/item/ammo_box/magazine/toy/pistol, )) diff --git a/modular_skyrat/master_files/code/datums/traits/good.dm b/modular_skyrat/master_files/code/datums/traits/good.dm index 22987f7705d197..08f265145a9ea5 100644 --- a/modular_skyrat/master_files/code/datums/traits/good.dm +++ b/modular_skyrat/master_files/code/datums/traits/good.dm @@ -68,6 +68,16 @@ right_arm.unarmed_miss_sound = initial(right_arm.unarmed_miss_sound) right_arm.unarmed_sharpness = initial(right_arm.unarmed_sharpness) +/datum/quirk/water_breathing + name = "Water breathing" + desc = "You are able to breathe underwater!" + value = 2 + mob_trait = TRAIT_WATER_BREATHING + gain_text = span_notice("You become acutely aware of the moisture in your lungs and in the air. It feels nice.") + lose_text = span_danger("You suddenly realize the moisture in your lungs feels really weird, and you almost choke on it!") + medical_record_text = "Patient possesses biology compatible with aquatic respiration." + icon = FA_ICON_FISH + // AdditionalEmotes *turf quirks /datum/quirk/water_aspect name = "Water aspect (Emotes)" diff --git a/modular_skyrat/master_files/code/datums/traits/neutral.dm b/modular_skyrat/master_files/code/datums/traits/neutral.dm index 6ca79ee52b8593..0ab2f6e90b7cb2 100644 --- a/modular_skyrat/master_files/code/datums/traits/neutral.dm +++ b/modular_skyrat/master_files/code/datums/traits/neutral.dm @@ -1,5 +1,16 @@ #define TRAIT_HYDRA_HEADS "hydrahead" // We still dont have a centralised trait file +GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) + +/// Instantiates GLOB.DNR_trait_overlay by creating a new mutable_appearance instance of the overlay. +/proc/generate_DNR_trait_overlay() + RETURN_TYPE(/mutable_appearance) + + var/mutable_appearance/DNR_trait_overlay = mutable_appearance('modular_skyrat/modules/indicators/icons/DNR_trait_overlay.dmi', "DNR", FLY_LAYER) + DNR_trait_overlay.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA | KEEP_APART + return DNR_trait_overlay + + // SKYRAT NEUTRAL TRAITS /datum/quirk/excitable name = "Excitable!" @@ -31,6 +42,47 @@ mob_trait = TRAIT_DNR icon = FA_ICON_SKULL_CROSSBONES +/datum/quirk/dnr/add(client/client_source) + . = ..() + + quirk_holder.update_dnr_hud() + +/datum/quirk/dnr/remove() + var/mob/living/old_holder = quirk_holder + + . = ..() + + old_holder.update_dnr_hud() + +/mob/living/prepare_data_huds() + . = ..() + + update_dnr_hud() + +/// Adds the DNR HUD element if src has TRAIT_DNR. Removes it otherwise. +/mob/living/proc/update_dnr_hud() + var/image/dnr_holder = hud_list?[DNR_HUD] + if(isnull(dnr_holder)) + return + + var/icon/temporary_icon = icon(icon, icon_state, dir) + dnr_holder.pixel_y = temporary_icon.Height() - world.icon_size + + if(HAS_TRAIT(src, TRAIT_DNR)) + set_hud_image_active(DNR_HUD) + dnr_holder.icon_state = "hud_dnr" + else + set_hud_image_inactive(DNR_HUD) + +/mob/living/carbon/human/examine(mob/user) + . = ..() + + if(stat != DEAD && HAS_TRAIT(src, TRAIT_DNR) && (HAS_TRAIT(user, TRAIT_SECURITY_HUD) || HAS_TRAIT(user, TRAIT_MEDICAL_HUD))) + . += "\n[span_boldwarning("This individual is unable to be revived, and may be permanently dead if allowed to die!")]" + +/datum/atom_hud/data/human/dnr + hud_icons = list(DNR_HUD) + // uncontrollable laughter /datum/quirk/item_quirk/joker name = "Pseudobulbar Affect" diff --git a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm index 64f40cb5f86ba2..9b43fccfc3ab28 100644 --- a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm +++ b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm @@ -3,30 +3,13 @@ name = "generic silver identification card" icon = 'modular_skyrat/master_files/icons/obj/card.dmi' icon_state = "card_silvergen" - assigned_icon_state = "assigned_silver" + assigned_icon_state = null /obj/item/card/id/advanced/gold/generic name = "generic gold identification card" icon = 'modular_skyrat/master_files/icons/obj/card.dmi' icon_state = "card_goldgen" - assigned_icon_state = "assigned_gold" - -// COLOURABLE -/obj/item/card/id/advanced/colourable - name = "colourable identification card" - desc = "A failed prototype for customizable ID cards, it looks.. strange." // Read: I'm too lazy to implement this properly - icon_state = "id_card" - assigned_icon_state = null // Built into the sprite itself. - greyscale_config = /datum/greyscale_config/id_card - greyscale_colors = "#FF0000#00FF00#0000FF" - -/obj/item/card/id/advanced/colourable/Initialize(mapload) - . = ..() - AddElement(/datum/element/gags_recolorable) - -/obj/item/card/id/advanced/colourable/examine(mob/user) - . = ..() - . += span_info("You could change its colours with a spray can!") + assigned_icon_state = null // DS2 /obj/item/card/id/advanced/prisoner/ds2 diff --git a/modular_skyrat/master_files/code/game/objects/structures/mirror.dm b/modular_skyrat/master_files/code/game/objects/structures/mirror.dm new file mode 100644 index 00000000000000..ac17e8afd414b7 --- /dev/null +++ b/modular_skyrat/master_files/code/game/objects/structures/mirror.dm @@ -0,0 +1,9 @@ +// Magic Mirror Character Application +/obj/structure/mirror/magic/attack_hand(mob/living/carbon/human/user) + var/user_input = tgui_alert(user, "Would you like to apply your loaded character?","Confirm", list("Yes!", "No")) + + if(user_input == "Yes!") + user?.client?.prefs?.safe_transfer_prefs_to(user) + return TRUE + + return ..() diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm index 68865d44b21956..b3486f40ba72e3 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -9,9 +9,9 @@ JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime, JOB_CHIEF_ENGINEER = /mob/living/simple_animal/parrot/poly, JOB_QUARTERMASTER = list( - /mob/living/simple_animal/sloth/citrus, - /mob/living/simple_animal/sloth/paperwork, - /mob/living/simple_animal/hostile/gorilla/cargo_domestic, + /mob/living/basic/sloth/citrus, + /mob/living/basic/sloth/paperwork, + /mob/living/basic/gorilla/cargorilla, ), // Non-heads like the warden, these are automatically medium-risk at minimum // They are also the only two modular additions so far diff --git a/modular_skyrat/master_files/code/modules/bitrunning/orders/tech.dm b/modular_skyrat/master_files/code/modules/bitrunning/orders/tech.dm new file mode 100644 index 00000000000000..6c9a0626517b47 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/bitrunning/orders/tech.dm @@ -0,0 +1,3 @@ +/datum/orderable_item/bepis/flashdark + item_path = /obj/item/flashlight/flashdark + cost_per_order = 750 diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm index 09a174b1ff319c..1099d7a3e79cd9 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm @@ -41,8 +41,8 @@ "r_arm" = TRUE, "l_leg" = TRUE, "r_leg" = TRUE, - "chest" = FALSE, // TODO: figure out why head/chest augs dont render, needed for IPC head on non IPC body - "head" = FALSE, + "chest" = TRUE, + "head" = TRUE, "l_hand" = FALSE, "r_hand" = FALSE, ) @@ -73,9 +73,7 @@ if(!visuals_only) return - // If you ever add chest and head augments, please add the body zones to this list. - // Removing them for now for optimization purposes. - for(var/body_zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + for(var/body_zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_CHEST, BODY_ZONE_HEAD)) if(body_zone in visited_body_zones) continue @@ -164,7 +162,7 @@ usr, "Select new color", null, - preferences.body_markings[limb_slot][marking_entry_name], + preferences.body_markings[limb_slot][marking_entry_name][1], ) as color | null if(!new_color) return TRUE diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm index f7ffc6fddd6280..be228d89f102d5 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm @@ -213,7 +213,6 @@ var/static/list/undershirt_to_bra = list( "Bra, Sports" = "Bra, Sports", "Sports Bra (Alt)" = "Sports Bra (Alt)", - "LIZARED Top" = "LIZARED Top", "Bra" = "Bra", "Bra - Alt" = "Bra - Alt", "Bra - Thin" = "Bra - Thin", diff --git a/modular_skyrat/master_files/code/modules/clothing/under/color.dm b/modular_skyrat/master_files/code/modules/clothing/under/color.dm index 07327d062b82cb..094dddaabd3585 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/color.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/color.dm @@ -1,6 +1,9 @@ /obj/item/clothing/under/color greyscale_config_worn_monkey = /datum/greyscale_config/jumpsuit/worn/monkey +/obj/item/clothing/under/color/rainbow + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi' + /** * Random jumpsuit is the preferred style of the wearer if loaded as an outfit. * This is cleaner than creating a ../skirt variant as skirts are precached into SSwardrobe diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/centcom.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/centcom.dm index 9c48b5a2736dc8..05aa24276d8a5c 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/centcom.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/centcom.dm @@ -13,12 +13,6 @@ */ //Check modular_skyrat\modules\nanotrasen_naval_command\code\clothing.dm for more of these! (Or, currently, ALL of these.) -/* -* ARMADYNE -*/ -//Check modular_skyrat\modules\sec_haul\code\peacekeeper\armadyne_clothing.dm for these (ORION TODO: debate moving them all into this one file - uniforms, at least) -//(TODO applies to NT as well) - /* * LOPLAND */ diff --git a/modular_skyrat/master_files/code/modules/jobs/job_types/_job_attire.dm b/modular_skyrat/master_files/code/modules/jobs/job_types/_job_attire.dm index a5de93b45dc3b5..05bc14211e3a42 100644 --- a/modular_skyrat/master_files/code/modules/jobs/job_types/_job_attire.dm +++ b/modular_skyrat/master_files/code/modules/jobs/job_types/_job_attire.dm @@ -8,6 +8,9 @@ /datum/job/bartender akula_outfit = /datum/outfit/akula +/datum/job/bitrunner + akula_outfit = /datum/outfit/akula/cargo_technician + /datum/job/botanist akula_outfit = /datum/outfit/akula @@ -84,7 +87,7 @@ akula_outfit = /datum/outfit/akula/security_officer /datum/job/shaft_miner - akula_outfit = /datum/outfit/akula + akula_outfit = /datum/outfit/akula/cargo_technician /datum/job/station_engineer akula_outfit = /datum/outfit/akula/station_engineer @@ -139,6 +142,9 @@ /datum/job/barber akula_outfit = /datum/outfit/akula +/datum/job/coroner + akula_outfit = /datum/outfit/akula/doctor + /datum/job/corrections_officer akula_outfit = /datum/outfit/akula/security_officer diff --git a/modular_skyrat/master_files/code/modules/jobs/job_types/roboticist.dm b/modular_skyrat/master_files/code/modules/jobs/job_types/roboticist.dm index d90c994c6ad40d..35e4f206de12cd 100644 --- a/modular_skyrat/master_files/code/modules/jobs/job_types/roboticist.dm +++ b/modular_skyrat/master_files/code/modules/jobs/job_types/roboticist.dm @@ -3,3 +3,24 @@ satchel = /obj/item/storage/backpack/satchel/science/robo duffelbag = /obj/item/storage/backpack/duffelbag/science/robo messenger = /obj/item/storage/backpack/messenger/science/robo + +/datum/job/roboticist + description = "Build cyborgs, mechs, AIs, and maintain them all. Create MODsuits for those that wish. Try to remind medical that you're \ + actually a lot better at treating synthetic crew members than them." + +/datum/job/roboticist/New() + . = ..() + + mail_goodies += list( + /obj/item/healthanalyzer/advanced = 15, + /obj/item/screwdriver/power/science = 6, + /obj/item/crowbar/power/science = 6, + /obj/item/weldingtool/experimental = 2, // a lot rarer since its relatively powerful + /obj/item/scalpel/advanced = 6, + /obj/item/retractor/advanced = 6, + /obj/item/cautery/advanced = 6, + /obj/item/storage/pill_bottle/liquid_solder = 6, + /obj/item/storage/pill_bottle/system_cleaner = 6, + /obj/item/storage/pill_bottle/nanite_slurry = 6, + /obj/item/reagent_containers/spray/hercuri/chilled = 8, + ) diff --git a/modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm b/modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm new file mode 100644 index 00000000000000..0c8f44b3118159 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm @@ -0,0 +1,3 @@ +// crusher loot /obj/item/crusher_trophy/ice_demon_cube -> /obj/item/crusher_trophy/demon_core +/mob/living/basic/mining/ice_demon + crusher_loot = /obj/item/crusher_trophy/demon_core diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm index b2d6c97565213a..e7c3348e585964 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm @@ -1,18 +1,11 @@ // By temporarily removing the unspillable organs before calling the parent proc we can avoid Skyrat edits and make this less likely to break in the future -/mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts, gibbed = FALSE) +/mob/living/carbon/spill_organs(drop_bitflags) var/list/held_organs = list() for(var/obj/item/organ/organ as anything in organs) if(!organ.drop_when_organ_spilling) held_organs.Add(organ) organs.Remove(organ) - // Organs always get spilled when the mob is gibbed - if(gibbed) - for(var/deleting_organ in held_organs) - qdel(deleting_organ) - - return ..() - . = ..() // put the unspillable organs back diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/death.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/death.dm index b40e30ca8f86a5..7889b4f391ceca 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/death.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/death.dm @@ -1,8 +1,8 @@ // Pocket contents fly out when gibbed -/mob/living/carbon/human/gib(no_brain, no_organs, no_bodyparts, safe_gib = FALSE) - if(safe_gib) // we are just going to drop everything regardless +/mob/living/carbon/human/gib(drop_bitflags=NONE) + if(drop_bitflags & DROP_ITEMS) // we are just going to drop everything regardless return ..() - if(no_bodyparts) // don't drop any items when the mob is being reduced to a paste + if(!(drop_bitflags & DROP_BODYPARTS)) // don't drop any items when the mob is being reduced to a paste return ..() var/obj/item/left_pocket = l_store diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/podpeople.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/podpeople.dm new file mode 100644 index 00000000000000..012665829fd23d --- /dev/null +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/podpeople.dm @@ -0,0 +1,6 @@ +// Character creation podpeople +/datum/species/pod/get_species_description() + return "Plant lore!" + +/datum/species/pod/get_species_lore() + return list("You're a plant!") diff --git a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm index b2b9eaeecba58c..30df82a7f1158e 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm @@ -32,3 +32,14 @@ /datum/species/proc/apply_supplementary_body_changes(mob/living/carbon/human/target, datum/preferences/preferences, visuals_only = FALSE) return + +/datum/species/create_pref_traits_perks() + . = ..() + + if (TRAIT_WATER_BREATHING in inherent_traits) + . += list(list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = FA_ICON_FISH, + SPECIES_PERK_NAME = "Waterbreathing", + SPECIES_PERK_DESC = "[plural_form] can breathe in water, making pools a lot safer to be in!", + )) diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm index e263c4062c7815..b09de049865002 100644 --- a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm +++ b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm @@ -206,12 +206,14 @@ . = ..() design_ids += list( "borg_upgrade_snacks", + "mini_soulcatcher", ) /datum/techweb_node/neural_programming/New() . = ..() design_ids += list( "soulcatcher_device", + "rsd_interface", ) /datum/techweb_node/cyborg_upg_util/New() diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi index 44e58131a33a19..93cadcbdbdbaf8 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi and b/modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi differ diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi index 9c82af8e8b3fa1..62bfc6d5433351 100644 Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi b/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi index 0e3d125038e8e7..eac81c9cca9f41 100644 Binary files a/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi and b/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/ears.dmi b/modular_skyrat/master_files/icons/mob/clothing/ears.dmi index eb135d3fdc3b14..0626710027cb3b 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/ears.dmi and b/modular_skyrat/master_files/icons/mob/clothing/ears.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi index db9c50ab844015..07bef00e9c4a28 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi and b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi b/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi index 199a17cdbb20a0..24004a9b2604bb 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi index 9a8042cf0a0f6e..8d18e50d6233e3 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi index c4ecb9e4f81203..faceea6def3269 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi index 1d7d6c0e9330c9..1366a6ba1ad53e 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi b/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi index 3d9209905cb3c3..ff6f4218c27e25 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi and b/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/huds/hud.dmi b/modular_skyrat/master_files/icons/mob/huds/hud.dmi index 276bdf638ffe15..235a45ecd4918e 100644 Binary files a/modular_skyrat/master_files/icons/mob/huds/hud.dmi and b/modular_skyrat/master_files/icons/mob/huds/hud.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi index fdfc3fee1c8bdd..681457fe596f1c 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/tails_big.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/tails_big.dmi index f0c56e67183968..e77a1d1d77d126 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/tails_big.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/tails_big.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/card.dmi b/modular_skyrat/master_files/icons/obj/card.dmi index cc5b4eb3a0a571..9130183d19d8f4 100644 Binary files a/modular_skyrat/master_files/icons/obj/card.dmi and b/modular_skyrat/master_files/icons/obj/card.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi index c9e746f0506286..7deb40b8d859a7 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi and b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi index a3274e254b1943..e0a71694d5b716 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi differ diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 36870626d5dc36..9ee547d060eba9 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -1056,18 +1056,41 @@ digi // WRAPS -/datum/greyscale_config/wraps +/datum/greyscale_config/clothwraps name = "Cloth Wraps" icon_file = 'modular_skyrat/modules/GAGS/icons/shoes.dmi' json_config = 'modular_skyrat/modules/GAGS/json_configs/wraps/wraps.json' -/datum/greyscale_config/wraps/worn +/datum/greyscale_config/clothwraps/worn name = "Cloth Wraps (Worn)" json_config = 'modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn.json' -/datum/greyscale_config/wraps/worn/digi +/datum/greyscale_config/clothwraps/worn/digi name = "Cloth Wraps (Worn, Digi)" +/datum/greyscale_config/legwraps + name = "Leg Wraps" + icon_file = 'modular_skyrat/modules/GAGS/icons/shoes.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/wraps/legwraps.json' + +/datum/greyscale_config/legwraps/worn + name = "Leg Wraps (Worn)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn.json' + +/datum/greyscale_config/legwraps/worn/digi + name = "Leg Wraps (Worn, Digi)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn_digi.json' + +/datum/greyscale_config/armwraps + name = "Cloth Arm Wraps" + icon_file = 'modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps.json' + +/datum/greyscale_config/armwraps/worn + name = "Cloth Arm Wraps (Worn)" + icon_file = 'modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps_worn.json' + // MISC SHOES /datum/greyscale_config/heels diff --git a/modular_skyrat/modules/GAGS/icons/shoes.dmi b/modular_skyrat/modules/GAGS/icons/shoes.dmi index 154b6f312ba683..243f4ff5ec444d 100644 Binary files a/modular_skyrat/modules/GAGS/icons/shoes.dmi and b/modular_skyrat/modules/GAGS/icons/shoes.dmi differ diff --git a/modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps.json b/modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps.json new file mode 100644 index 00000000000000..cfe620714a3787 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps.json @@ -0,0 +1,10 @@ +{ + "arm_wraps": [ + { + "type": "icon_state", + "icon_state": "arm_wraps", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps_worn.json b/modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps_worn.json new file mode 100644 index 00000000000000..cfe620714a3787 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/arm_wraps/arm_wraps_worn.json @@ -0,0 +1,10 @@ +{ + "arm_wraps": [ + { + "type": "icon_state", + "icon_state": "arm_wraps", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps.json b/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps.json new file mode 100644 index 00000000000000..0e605054f908dc --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps.json @@ -0,0 +1,10 @@ +{ + "legwrap": [ + { + "type": "icon_state", + "icon_state": "legwrap_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn.json b/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn.json new file mode 100644 index 00000000000000..8ddd9e1dc3b1d5 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn.json @@ -0,0 +1,10 @@ +{ + "legwrap": [ + { + "type": "icon_state", + "icon_state": "legwrap_mob", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn_digi.json b/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn_digi.json new file mode 100644 index 00000000000000..833a458c85397a --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/wraps/legwraps_worn_digi.json @@ -0,0 +1,10 @@ +{ + "legwrap": [ + { + "type": "icon_state", + "icon_state": "legwrap_mob_digi", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm b/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm index f3675f8e226900..6792118bbaab8c 100644 --- a/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm +++ b/modular_skyrat/modules/aesthetics/airalarm/code/airalarm.dm @@ -1,6 +1,5 @@ /obj/machinery/airalarm - icon = 'modular_skyrat/modules/aesthetics/airalarm/icons/airalarm.dmi' - var/light_mask = "alarm-light-mask" + icon = 'icons/obj/machines/wallmounts.dmi' /obj/machinery/airalarm/update_appearance(updates) . = ..() diff --git a/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi b/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi index 20adc064d3254f..ce8c37b6004928 100644 Binary files a/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi and b/modular_skyrat/modules/aesthetics/firealarm/icons/firealarm.dmi differ diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm index ccc43793c335f1..ac20f9f5db997b 100644 --- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -49,7 +49,7 @@ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.2, \ ) -// for .35 Sol Ripper. one day, anon. one day +// for .35 Sol Ripper #define AMMO_MATS_RIPPER list( \ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4, \ @@ -75,33 +75,6 @@ lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' -/obj/item/gun/ballistic/shotgun/riot - name = "\improper Peacekeeper shotgun" - desc = "A Nanotrasen-made riot control shotgun fitted with an extended tube and a fixed tactical stock." - icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' - worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi' - lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi' - righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi' - inhand_icon_state = "riot_shotgun" - inhand_x_dimension = 32 - inhand_y_dimension = 32 - can_suppress = TRUE - suppressed_sound = 'modular_skyrat/modules/aesthetics/guns/sound/suppressed_shotgun.ogg' - suppressed_volume = 100 - vary_fire_sound = TRUE - fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg' - -/obj/item/gun/ballistic/shotgun/riot/syndicate - name = "\improper Peacebreaker shotgun" - desc = "A Scarborough riot control shotgun fitted with a crimson furnishing and a wooden tactical stock. You swear you've seen this model elsewhere before..." - icon_state = "riotshotgun_syndie" - inhand_icon_state = "riot_shotgun_syndie" - can_be_sawn_off = FALSE - can_suppress = FALSE - -/obj/item/gun/ballistic/shotgun/riot/syndicate/give_manufacturer_examine() - AddElement(/datum/element/manufacturer_examine, COMPANY_SCARBOROUGH) - /obj/item/gun/ballistic/shotgun/automatic/combat name = "\improper Peacekeeper combat shotgun" desc = "A semi-automatic Nanotrasen Peacekeeper shotgun with tactical furnishing and heavier internals meant for sustained fire. Lacks a threaded barrel." @@ -327,31 +300,11 @@ desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing." icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' -/obj/item/gun/ballistic/automatic/ar/modular/model75 - name = "\improper NT ARG-75" - desc = "A contemporary rifle manufactured by NT chambered for .310 Strilka. It's equipped with a heavy duty integrally suppressed barrel, CQB scope and a topmounted laser sight." - icon_state = "arg75" - icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' - fire_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg' - fire_delay = 5 - fire_sound_volume = 90 - accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75 - -/obj/item/gun/ballistic/automatic/ar/modular/model75/give_manufacturer_examine() - AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) - -/obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75 - name = "\improper ARG-75 magazine" - desc = "A twenty round double-stack magazine for the NT ARG-75 rifle. Chambered in .310 Strilka." - icon = 'modular_skyrat/modules/sec_haul/icons/guns/mags.dmi' - icon_state = "pcr" - ammo_type = /obj/item/ammo_casing/strilka310 - caliber = CALIBER_STRILKA310 - max_ammo = 20 - // GUBMAN3 - FULL BULLET RENAME // i loathe the above +// overrides for 10mm ammo in modular_skyrat\modules\sec_haul\code\guns\bullets.dm + // overrides for .310 Strilka-derived ammo, e.g. lionhunter ammo, because you don't want to give security the ability to print infinite wallhack ammo, right? /obj/item/ammo_casing/strilka310/lionhunter name = "hunter's rifle round" @@ -378,23 +331,47 @@ // overrides for tgcode .50cal, used in their sniper/anti-materiel rifles /obj/item/ammo_casing/p50 - name = ".416 Stabilis polymer casing" + name = ".416 Stabilis casing" desc = "A .416 bullet casing." advanced_print_req = TRUE // you are NOT printing more ammo for this without effort. // then again the offstations with ammo printers and sniper rifles come with an ammo disk anyway, so -/obj/item/ammo_casing/p50/soporific - name = ".416 Stabilis tranquilizer casing" - desc = "A .416 bullet casing that specialises in sending the target to sleep rather than hell.\ +/obj/item/ammo_casing/p50/surplus + name = ".416 Stabilis surplus casing" + desc = "A .416 bullet casing. Intentionally underloaded, but still quite painful to be shot with.\ +