-
30 August 2020
-
raspy-on-osu updated:
+
02 October 2020
+
ArcaneMusic, with minor tweaks by TheObserver-sys updated:
+
+ - Adds and modifies fertilizers, as well as a new stat, Instability.
+ - Removes the rather disused functionality of irrigation hoses, temporarily disables circuit use on hydroponics trays.
+ - Plant Analyzer have been upgraded. Using one in hand will now switch between a stat view of your plant, and a chemical view of your plant. tweak:Trays now accept and store reagents, as well as coming with an autogrow mode. However, these upgrades came at the cost of old self sufficiency, meaning you must attend to your plants a bit more often.
+ - Earthsblood, while not being able to gild trays anymore, has been found to still be quite powerful as a fertilizer.
+
+
CoreFlare updated:
+
+ - Altcloaks! Available in loadout.
+
+
Detective-Google updated:
+
+ - a smattering of clothes from the RP server
+ - detective wardrobe
+
+
EmeraldSundisk updated:
+
+ - Adds the "Skelter" space ruin
+ - Creates a few new area designations for the Skelter
+ - Cargo techs now have access to a "long pants" variant of their standard work uniform
+ - Adds said uniform to CargoDrobes and the loadout menu
+
+
ItzGabby updated:
+
+ - Three new turf tiles.
+ - Turf icons with multiple damage icons, with in-hand icons for each tile.
+ - Edited the name and description to wooden.
+
+
LetterN updated:
+
+ - craftable railings
+ - ports robust savefiles
+
+
MrJWhit updated:
+
+ - tweaked heavy suit dmi
+ - Fixes drones not being able to quickslot items
+
+
Putnam3145 updated:
+
+ - New policy config for pyroclastic slimes.
+ - SDGF clones now naked.
+ - SDGF is now way more likely to make a clone that will align with the creator's goals, with purity, making it a better antagging tool.
+ - SDGF clones now have the same traits as the original.
+ - transfer_ckey now resets view, preventing things like SDGF clones with much larger view range.
+ - Policy configs have been added for SDGF, currently unused: SDGF, SDGF_ALIGNED, SDGF_UNALIGNED.
+ - Shivering now has thresholds and fever's thresholds now work.
+ - Made allturfs setup actually set up all turfs.
+ - Dynamic is now more aggressive with adding antags.
+ - Fixes vore pref saving.
+
+
SandPoot updated:
+
+ - Fixes headslugs being unable to recover their human form.
+
+
Tupinambis updated:
+
+ - Adds methane and methyl bromide gases.
+ - Minor gas name/desc changes to improve consistency
+ - Ports the methyl bromide tank from bay. Adds two new canister sprites for the new gases and CH4 screen alerts.
+ - fixed a mispelling in the wound armor value for the bounty hunter suit
+
+
dapnee updated:
+
+ - atrium, clinic, an extra office, a pseudo public mining area, two more deluxe dorms, micro beach, aux bathroom, two construction areas, mass driver, more intercoms
+ - moved all of service, chapel, dorms, garden, holodeck to a different z-level, RnD is more open, maintenance is a bit more random, more firelocks, added more mine-able rock
+ - fixed the buttons in xenobio, gave shutters to cargo's storage area, fixed holodeck so it works now, fixed some techfabs being lathes, added sensors to atmos tanks, more decals, couple more signs, little floral areas and sitting areas added to break up hallway monotony, mech chargers are no longer missing their consoles, whiteship won't crash into arrivals anymore while the area it takes up is more telegraphed, APC placement on AI sat entrance, missing wire node for the outer portion of the AI sat, civilian level now has a telecom relay
+
+
lolman360 updated:
+
+ - smonk machine runtimes
+ - automatic hydro tray has a unique sprite now (fancy robot arm)
+
+
timothyteakettle updated:
+
+ - added luminescent and stargazer sprites as selectable body sprites for slimes
+ - wound exponent lowered slightly from 1.225 to 1.2
+ - wound exponent and limb damage multiplier are now config values
+ - ipcs and synthlizards are now treated as actual robots, with robotic limbs, an extra organ, and better emp acts
+ - surgeries for healing robotic limbs, and brain surgery for robotic heads
+ - androids limbs now show up as intended
+ - emps now work from 1-100 severity instead of 1/2 and the severity reduces as you move from the epicentre
+
+
zeroisthebiggay updated:
+
+ - ratvar gf is complete
+
+
01 October 2020
BlueWildrose updated:
28 August 2020
+
EmeraldSundisk updated:
+
+ - Adds more paper to the library
+ - The law office now has a desk window
+ - Expands most of CogStation's exterior airlocks. Slightly adjusts surrounding areas to accommodate this.
+ - Updates some of CogStation's paperwork
+ - The rat in the morgue turned themselves into a possum. Funniest shit I've ever seen.
+ - Adjusts some area designations so cameras should receive power properly
+ - Cleans up an errant decal
+
+
Hatterhat updated:
+
+ - Traitor holoparasites can now only be bought once, because apparently you can only have one active holopara.
+ - PDA bombs can now only be bought once per uplink.
+
+
lolman360 updated:
+
+ - atmos = radiation = chemistry.
+
+
shellspeed1 updated:
+
+ - Adds slow mode for iv drips
+
timothyteakettle updated:
- an ancient game over a thousand years old has re-emerged among crewmembers - rock paper scissors
+ - customization features appear in alphabetical order where necessary
+ - bokken do two more stamina damage now
- you can now choose a body sprite as an anthromorph or anthromorphic insect, and can choose from aquatic/avian and apid respectively (and obviously back to the defaults too)
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index afb405e756..08494cb87b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -27101,9 +27101,29 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: changing your character's gender won't randomize its hairstyle and facial
hairstyle now
2020-08-28:
+ EmeraldSundisk:
+ - rscadd: Adds more paper to the library
+ - rscadd: The law office now has a desk window
+ - tweak: Expands most of CogStation's exterior airlocks. Slightly adjusts surrounding
+ areas to accommodate this.
+ - tweak: Updates some of CogStation's paperwork
+ - tweak: The rat in the morgue turned themselves into a possum. Funniest shit I've
+ ever seen.
+ - bugfix: Adjusts some area designations so cameras should receive power properly
+ - bugfix: Cleans up an errant decal
+ Hatterhat:
+ - tweak: Traitor holoparasites can now only be bought once, because apparently you
+ can only have one active holopara.
+ - balance: PDA bombs can now only be bought once per uplink.
+ lolman360:
+ - rscadd: atmos = radiation = chemistry.
+ shellspeed1:
+ - rscadd: Adds slow mode for iv drips
timothyteakettle:
- rscadd: an ancient game over a thousand years old has re-emerged among crewmembers
- rock paper scissors
+ - tweak: customization features appear in alphabetical order where necessary
+ - tweak: bokken do two more stamina damage now
- rscadd: you can now choose a body sprite as an anthromorph or anthromorphic insect,
and can choose from aquatic/avian and apid respectively (and obviously back
to the defaults too)
@@ -27112,8 +27132,373 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: new explosion echoes
- tweak: explosion echo range
- soundadd: 5 new explosion related sounds
+2020-08-31:
+ Arturlang:
+ - tweak: Slimes can now damage structures, don't leave them unfed!
+ Chiirno:
+ - bugfix: Moves pill_bottles/dice to box/dice on CogStation.
+ Couls, ported by NecromancerAnne:
+ - code_imp: cleans up mech backstabbing code
+ DeltaFire15:
+ - rscdel: teleport-to-ark ability of the eminence, commented out
+ - rscadd: teleport-to-obelisk ability for the eminence
+ Detective-Google:
+ - tweak: plasmamen have no more slowdown
+ - rscadd: object reskins now use very nice and cool radials
+ EmeraldSundisk:
+ - rscadd: Adds a pool to MetaStation
+ - tweak: Slight readjustments to the surrounding area
+ - bugfix: Fixes a handful of external airlocks
+ ForrestWick:
+ - balance: removes wall walking boots from nukie uplink
+ - tweak: removes wall walking boots from nukie uplink
+ Ghommie:
+ - bugfix: e-gun overlays and some floor decals should have been fixed.
+ LetterN:
+ - rscadd: tgchat
+ Lynxless:
+ - tweak: Changed anatomic panacea into a direct buff, instead of a chem injection
+ - balance: Changed the values of anatomic panacea
+ - imageadd: Added a new icon for panacea's buff alert
+ Putnam3145:
+ - tweak: Pref for genital/vore examine text
+ - bugfix: Fixed a couple events having ghost roles eligible.
+ - balance: 'Buffed slaughter demon: gets stronger as it eats people'
+ - balance: 'Nerfed slaughter demon: no longer permanently round-removes all who
+ are eaten by it, instead releasing their now-heartless bodies'
+ - bugfix: Dynamic storytellers now calculate property weights properly.
+ Sonic121x:
+ - bugfix: Fix the four type of new tea that will stuck inside your vein.
+ - rscadd: drinking glass sprite for those tea.
+ kappa-sama:
+ - balance: miners can no longer acquire funny antag item
+ lolman360:
+ - bugfix: shuttle engine/heater sprites now face the right way
+ raspy-on-osu:
+ - tweak: TEG power output
+ - tweak: tesla movement priorities
+ - rscadd: tesla counterplay
+ - rscadd: tesla containment check (containment variable now usable)
+ silicons:
+ - bugfix: brooms now sweep objects on MOVABLE_PRE_MOVE rather than MOVABLE_MOVED
+ - balance: firedoors no longer automatically open on touch when there's no pressure
+ differences.
+ timothyteakettle:
+ - tweak: buzz, buzz2 and ping are now all unrestricted emotes and can be used by
+ anyone
+ - imagedel: the drake credit and pickle credit sprites have been removed
+ - refactor: tongue speech handling is now done by accent datums
+ zeroisthebiggay:
+ - rscdel: waffleco
+2020-09-01:
+ BlueWildrose:
+ - bugfix: fixed slimes starting off hungry
+2020-09-02:
+ Putnam3145:
+ - code_imp: Added a unit test for character saving.
+ - balance: Plastitanium rapier no longer silently sleeps with no chance at counterplay
+ when used by pacifists.
+ - bugfix: Fusion scan is now actually useful.
+ Tupinambis:
+ - tweak: moved the dakis, genital growth pills, and genital autosurgeons out of
+ the maintenance loot table and into kinkmates.
+ raspy-on-osu:
+ - bugfix: pyroclastic anomaly client spam
+ timothyteakettle:
+ - rscadd: you can hide your ckey now from the roundend report
+2020-09-03:
+ Ghommie:
+ - bugfix: Jaunters should now work with magic mirror chasming.
+ - bugfix: The photocopier can now print more than one copy at a time.
+ - bugfix: Alkali perspiration infos don't crash the Pandemic UI anymore.
+ - bugfix: Windoors can be actually tinted now.
+2020-09-04:
+ timothyteakettle:
+ - bugfix: ipcs can speak
+2020-09-05:
+ Bhijn:
+ - rscadd: Readded the old method of temperature notifications in the form of a new
+ pair of shivering/sweating notifications.
+ Putnam3145:
+ - tweak: Hilbert hotel flavor text for one particular snowflake hotel changed.
+ - admin: admins can now actually reduce threat level in dynamic
+ - tweak: Made owo.ogg smaller.
+ - tweak: Character saving unit test is now more verbose on failure.
+ - refactor: Added an extools proc hook alternative to rust_g logging.
+ raspy-on-osu:
+ - tweak: supermatter shard examine text
+ - tweak: protolathe item categories
+2020-09-06:
+ Putnam3145:
+ - rscdel: Dynamic no longer pushes events.
+ - balance: Made spontaneous brain trauma a good deal less annoying.
+ lolman360, NecromancerAnne:
+ - rscadd: The ancient art of blacksmithing, now in pixels.
+ - imageadd: cool swords and shit (thanks anne)
+ raspy-on-osu:
+ - tweak: thermomachine examine text
+2020-09-07:
+ DeltaFire15:
+ - spellcheck: fixed a typo causing a span not to show.
+ Putnam for debugging ammo loading! Thx!!:
+ - rscdel: Removed spell blade, diamond picaxe, and fire wand from lava land loot
+ tables
+ - tweak: Each mini boss now has its own type of crate.
+ - tweak: Each spike has its own type of crate that it pulls its now smaller loot
+ table from
+ - balance: Moved god eye from spike loot table to hard spawn collosses fight
+ - balance: Moved holoparasight from spike loot table to bubble gum
+ - balance: Moved magic meat hook from spike loot table to drake
+ - rscadd: 2 more crates to Arena Shuttle as well as 4-4-4 of each new type of chest
+ - balance: Replaced the diamond pick loot with a better one
+ - tweak: Replaced the cursted katana with a non cursted verson that deals half the
+ damage and has less block!
+ - rscadd: Three new potions, blue heals the mind like a mama potion, Green heals
+ the soul aka the organs! Lastly Red heals the body, by 100 damage of each main
+ types. Best not to waste them!
+ - rscadd: Four more "wands" Spellbooks! These fun little guys shoot out its own
+ pages to do the affect, one will set the target on fire like a bullet, one will
+ harm them a bit, one will heal the target a small bit - How nice! Last one will
+ give them a few statis affects like a taser bolt but without as much power or
+ tasing affect
+2020-09-08:
+ Ghommie:
+ - spellcheck: fixed names of the Electrical Toolbox goodie pack and green croptop
+ christmas suit.
+ - bugfix: Fixed turf visuals for real. Original PR by AnturK on tgstation.
+ KeRSedChaplain:
+ - soundadd: added borg_deathsound.ogg and android_scream.ogg
+ silicons:
+ - balance: meteor waves now have a static 5 minute timer.
+2020-09-09:
+ Putnam3145:
+ - bugfix: Made superconductivity work for the first time literally ever.
+ timothyteakettle:
+ - bugfix: accents work better
+2020-09-11:
+ Putnam3145:
+ - balance: Superconducting turfs now can't go below 0 celsius.
+2020-09-12:
+ BlueWildrose:
+ - bugfix: The Polychromic winter coat's hoodie will now polychrome, alongside any
+ other new polychromic items with toggleable headwear.
+ - bugfix: Minesweeper will no longer blow up the player's ears when they select
+ "Play on the same board"
+ - rscadd: Slimepeople will find warm donk pockets among other toxin healing items
+ even more repulsive, as they are anti-toxic.
+ - tweak: Slimepeople are now neutral to gross foods.
+ DeltaFire15:
+ - balance: AIs can no longer qdel() the gravity generator
+ Putnam3145:
+ - code_imp: Added some unit tests for reactions.
+ - refactor: replaced handle_changeling and handle_bloodsucker with signal registration
+ Sonic121x:
+ - bugfix: Fixed pill button on chemical press
+ TheObserver-sys:
+ - rscadd: Brass now has a proper datum. Aspiring Forgetenders rejoice!
+ Trilbyspaceclone:
+ - bugfix: Race based drinks will no longer stay inside your blood for ever.
+ Tupinambis:
+ - tweak: Redid Cogstation atmos pipes to make it less cluttered.
+ - tweak: Removed a few doors from the main hallway to mitigate chokepoint issues
+ - bugfix: All belt hell conveyers are now on by default, so that belt hell actually
+ works.
+ - bugfix: IDs for poddoors and belts and the like. Everything is now properly hooked
+ and should work as expected (except for the pressure triggered mass drivers)
+ - bugfix: addresses most if not all roundstart active turfs.
+ - bugfix: Issue where wires were connected to the SMES improperly, and SMES were
+ not properly precharged, resulting in power failure earlier than intended.
+ - bugfix: various rogue turfs and wirings.
+ - bugfix: security office APC being hooked to maintenance for some reason.
+ - bugfix: TEG is now directly wired to the SMES.
+ - code_imp: 'adds a subtype of mass drivers that is triggered by things being on
+ it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully
+ functional.'
+ lolman360:
+ - bugfix: glaives now work again
+ zeroisthebiggay:
+ - balance: Revolver is now poplocked down to fifteen people.
+2020-09-16:
+ timothyteakettle:
+ - tweak: fixed an icon path
+2020-09-17:
+ DeltaFire15:
+ - rscadd: Failing the plushmium reaction can now create peculiar plushies, depending
+ on reaction volume.
+ - bugfix: The mood-buff from petting a plushie now works properly again.
+ - bugfix: Fixed wacky necropolis loot chest behavior
+ EmeraldSundisk:
+ - rscadd: Adds the Research Director's office to Omega Station
+ - rscadd: Adds 2 new solar arrays (and control rooms)
+ - rscadd: Adds some action figures that weren't there previously
+ - rscadd: The CMO's office now has a light switch
+ - tweak: Slight readjustments to impacted areas
+ - tweak: Readjusts the toxins air supply line to (ideally) be easier to service
+ - bugfix: Department camera consoles should now be able to actually check appropriate
+ cameras
+ - bugfix: Xenobiology can now be locked down (by the Research Director)
+ MrJWhit:
+ - rscadd: Adds a brain damage line
+ Putnam3145:
+ - bugfix: Your balls finally feel full, again.
+ timothyteakettle:
+ - rscadd: due to changes in policy, and several lawsuits, Nanotrasen has been forced
+ to allow disabled people to sign up
+2020-09-20:
+ DeltaFire15:
+ - bugfix: Sutures work on simplemobs again.
+ - bugfix: Attacking dismembered bodyparts now targets the chest instead, for weapons
+ aswell as unarmed attacks.
+ MrJWhit:
+ - rscadd: New sprites for chess pieces! You can craft them in-game with metal sheets.
+ silicons:
+ - balance: hulks can smash again (walls no longer break their hands)
+ - rscdel: acid no longer degrades armor
+2020-09-22:
+ Arturlang:
+ - rscadd: TGUI Statpanel
+ YakumoChen:
+ - imageadd: Mechsuits, robotics jumpsuits added to RoboDrobe
+ timothyteakettle:
+ - tweak: character previews should be more consistent now
+2020-09-24:
+ Putnam3145:
+ - refactor: Atmos is free.
+2020-09-25:
+ Putnam3145:
+ - bugfix: Removed a non-working proc that already had its functionality implemented
+ in another proc in the same file.
+2020-09-26:
+ CoreFlare:
+ - rscadd: IPC's can have hair. Why wasn't this added earlier. Use the bald hairstyle
+ for no hair.
+2020-09-27:
+ SiliconMain:
+ - tweak: Holograms made from projectors (atmos, engi, sec, medical, ect...) can
+ no longer be contaminated by radiation
+2020-09-28:
+ ArchieBeepBoop:
+ - rscadd: Craftable Micro Powered Fans
+ Degirin2120:
+ - rscadd: Added engineering hazard jumpsuits, can be found in the engidrobe, comes
+ in 3 varieties.
+ Putnam3145:
+ - tweak: Added a brute-force check-every-single-tile step to SSair when it has enough
+ time to run.
+ - balance: G fuid production is now much lower.
+ - rscdel: Supermatter sabotage objective's gone.
+ - balance: Subterfuge objectives are now all equally likely.
+ - spellcheck: Replaced a "(hopefully) 1" with a "2"
+ - tweak: Cryoing no longer unwins already-won objectives.
+ SiliconMain:
+ - tweak: Minor adjustment to material cost of long range atmos analyzer
+ Trilbyspaceclone:
+ - tweak: Most drinks now have some animation in them, from basic soda bubbles fizzing
+ around to ice cubes bobbing just a bit.
+ Tupinambis:
+ - bugfix: Ghost poly's color value is now a hex value instead of an oct value. This
+ has been a thing for OVER FIVE YEARS
+ - imageadd: Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris).
+ - imageadd: Replaced old chair sprites with new ones ported and modified from eris.
+ - tweak: Beds can now be placed both right and left.
+ - tweak: Subtle changes to stool legs to give them more of a shine.
+ raspy-on-osu:
+ - tweak: TEG power generation
+ thakyZ:
+ - rscadd: Added the ability to print the Light Replacer at the Engineering Protolathe
+ timothyteakettle:
+ - bugfix: turrets can once again be broken
+ - rscadd: you can now have heterochromia and select individual eye colours
+2020-09-29:
+ timothyteakettle:
+ - bugfix: fixed a typo causing your right eye colour to save as the left eye colour
2020-10-01:
BlueWildrose:
- soundadd: Slimepeople are given unique laughs and screams.
- tweak: Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs
for character.
+2020-10-02:
+ ArcaneMusic, with minor tweaks by TheObserver-sys:
+ - rscadd: Adds and modifies fertilizers, as well as a new stat, Instability.
+ - rscdel: Removes the rather disused functionality of irrigation hoses, temporarily
+ disables circuit use on hydroponics trays.
+ - tweak: Plant Analyzer have been upgraded. Using one in hand will now switch between
+ a stat view of your plant, and a chemical view of your plant. tweak:Trays now
+ accept and store reagents, as well as coming with an autogrow mode. However,
+ these upgrades came at the cost of old self sufficiency, meaning you must attend
+ to your plants a bit more often.
+ - tweak: Earthsblood, while not being able to gild trays anymore, has been found
+ to still be quite powerful as a fertilizer.
+ CoreFlare:
+ - rscadd: Altcloaks! Available in loadout.
+ Detective-Google:
+ - rscadd: a smattering of clothes from the RP server
+ - rscadd: detective wardrobe
+ EmeraldSundisk:
+ - rscadd: Adds the "Skelter" space ruin
+ - code_imp: Creates a few new area designations for the Skelter
+ - rscadd: Cargo techs now have access to a "long pants" variant of their standard
+ work uniform
+ - rscadd: Adds said uniform to CargoDrobes and the loadout menu
+ ItzGabby:
+ - rscadd: Three new turf tiles.
+ - imageadd: Turf icons with multiple damage icons, with in-hand icons for each tile.
+ - spellcheck: Edited the name and description to wooden.
+ LetterN:
+ - rscadd: craftable railings
+ - code_imp: ports robust savefiles
+ MrJWhit:
+ - tweak: tweaked heavy suit dmi
+ - bugfix: Fixes drones not being able to quickslot items
+ Putnam3145:
+ - rscadd: New policy config for pyroclastic slimes.
+ - tweak: SDGF clones now naked.
+ - balance: SDGF is now way more likely to make a clone that will align with the
+ creator's goals, with purity, making it a better antagging tool.
+ - bugfix: SDGF clones now have the same traits as the original.
+ - bugfix: transfer_ckey now resets view, preventing things like SDGF clones with
+ much larger view range.
+ - config: 'Policy configs have been added for SDGF, currently unused: SDGF, SDGF_ALIGNED,
+ SDGF_UNALIGNED.'
+ - bugfix: Shivering now has thresholds and fever's thresholds now work.
+ - bugfix: Made allturfs setup actually set up all turfs.
+ - balance: Dynamic is now more aggressive with adding antags.
+ - bugfix: Fixes vore pref saving.
+ SandPoot:
+ - bugfix: Fixes headslugs being unable to recover their human form.
+ Tupinambis:
+ - rscadd: Adds methane and methyl bromide gases.
+ - tweak: Minor gas name/desc changes to improve consistency
+ - imageadd: Ports the methyl bromide tank from bay. Adds two new canister sprites
+ for the new gases and CH4 screen alerts.
+ - bugfix: fixed a mispelling in the wound armor value for the bounty hunter suit
+ dapnee:
+ - rscadd: atrium, clinic, an extra office, a pseudo public mining area, two more
+ deluxe dorms, micro beach, aux bathroom, two construction areas, mass driver,
+ more intercoms
+ - tweak: moved all of service, chapel, dorms, garden, holodeck to a different z-level,
+ RnD is more open, maintenance is a bit more random, more firelocks, added more
+ mine-able rock
+ - bugfix: fixed the buttons in xenobio, gave shutters to cargo's storage area, fixed
+ holodeck so it works now, fixed some techfabs being lathes, added sensors to
+ atmos tanks, more decals, couple more signs, little floral areas and sitting
+ areas added to break up hallway monotony, mech chargers are no longer missing
+ their consoles, whiteship won't crash into arrivals anymore while the area it
+ takes up is more telegraphed, APC placement on AI sat entrance, missing wire
+ node for the outer portion of the AI sat, civilian level now has a telecom relay
+ lolman360:
+ - bugfix: smonk machine runtimes
+ - bugfix: automatic hydro tray has a unique sprite now (fancy robot arm)
+ timothyteakettle:
+ - rscadd: added luminescent and stargazer sprites as selectable body sprites for
+ slimes
+ - tweak: wound exponent lowered slightly from 1.225 to 1.2
+ - config: wound exponent and limb damage multiplier are now config values
+ - rscadd: ipcs and synthlizards are now treated as actual robots, with robotic limbs,
+ an extra organ, and better emp acts
+ - rscadd: surgeries for healing robotic limbs, and brain surgery for robotic heads
+ - bugfix: androids limbs now show up as intended
+ - refactor: emps now work from 1-100 severity instead of 1/2 and the severity reduces
+ as you move from the epicentre
+ zeroisthebiggay:
+ - rscadd: ratvar gf is complete
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index c13b6a50bc..743ed03f48 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 2b28d06976..67d1849ef6 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 7bfecb4158..276b5c9458 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 08d276a484..d4bb1224cc 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi
index dd00713770..8f3c48396a 100644
Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index 6d02f752c3..ffbb8b8b5b 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi
index e3e0b89a7c..43b73f03d0 100644
Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index e64c037cf8..75ee2b35e6 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi
index 644c32fe30..719ed72226 100644
Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 7d13e3f802..510adc97b4 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/cloaks.dmi b/icons/obj/clothing/cloaks.dmi
index 6f4de62cc0..cc5f4f3392 100644
Binary files a/icons/obj/clothing/cloaks.dmi and b/icons/obj/clothing/cloaks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index f23cdaee46..d3e4c0f7e9 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 3476b16258..c12720bc8b 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 0554326e5c..a566a05591 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
index 37adf54711..0f6510fe43 100644
Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 8db1156dea..454138a254 100755
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index 0c0d220373..aa24883656 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 38d153e261..5f0fbb4104 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index b11e43d665..d8f5c1d334 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index f2b84bbe03..65fba49309 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm
index 19311f703a..c7eff6ce78 100644
--- a/modular_citadel/code/modules/client/loadout/neck.dm
+++ b/modular_citadel/code/modules/client/loadout/neck.dm
@@ -86,3 +86,7 @@
/datum/gear/neck/polycloak
name = "Polychromatic Cloak"
path = /obj/item/clothing/neck/cloak/polychromic
+
+/datum/gear/neck/altpolycloak
+ name = "Alternate Cloak"
+ path = /obj/item/clothing/neck/cloak/alt/polychromic
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index 5ce73d1cfd..45d8fc1ef1 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -211,6 +211,14 @@
name = "Keyhole Sweater"
path = /obj/item/clothing/under/misc/keyholesweater
+/datum/gear/uniform/tealturtle
+ name = "Teal Turtleneck"
+ path = /obj/item/clothing/under/suit/turtle/teal
+
+/datum/gear/uniform/greyturtle
+ name = "Grey Turtleneck"
+ path = /obj/item/clothing/under/suit/turtle/grey
+
/datum/gear/uniform/polyjump
name = "Polychromic Jumpsuit"
path = /obj/item/clothing/under/misc/polyjumpsuit
@@ -246,6 +254,127 @@
path = /obj/item/clothing/under/shorts/polychromic
cost = 2
+/datum/gear/uniform/hopcasual
+ name = "Casual Head of Personnel's uniform"
+ path = /obj/item/clothing/under/rank/civilian/head_of_personnel/whimsy
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Head of Personnel"
+ restricted_roles = list("Head of Personnel")
+
+/datum/gear/uniform/robosleek
+ name = "Sleek roboticist's jumpsuit"
+ path = /obj/item/clothing/under/rank/rnd/roboticist/sleek
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Roboticist"
+ restricted_roles = list("Roboticist")
+
+/datum/gear/uniform/seccorp
+ name = "Corporate Security Uniform"
+ path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Security Officer"
+ restricted_roles = list("Security Officer")
+
+/datum/gear/uniform/wardencorp
+ name = "Corporate Warden's Uniform"
+ path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/wardencorp
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Warden"
+ restricted_roles = list("Warden")
+
+/datum/gear/uniform/hoscorp
+ name = "Corporate Head of Security's Uniform"
+ path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/hoscorp
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Head Of Security"
+ restricted_roles = list("Head Of Security")
+
+/datum/gear/uniform/detcorp
+ name = "Corporate Detective's Uniform"
+ path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/detcorp
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Detective"
+ restricted_roles = list("Detective")
+
+/datum/gear/uniform/detbrown
+ name = "Brown Worn Suit"
+ path = /obj/item/clothing/under/rank/security/detective/brown
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Detective"
+ restricted_roles = list("Detective")
+
+/datum/gear/uniform/detbrown/detbrown2
+ name = "Padded Worn Suit"
+ path = /obj/item/clothing/under/rank/security/detective/brown/brown2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Detective"
+ restricted_roles = list("Detective")
+
+
+// Grey utility
+
+/datum/gear/uniform/grey
+ name = "Grey Uniform"
+ path = /obj/item/clothing/under/rank/civilian/util/greyshirt
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
+
+/datum/gear/uniform/grey/util
+ name = "Grey Utility Uniform"
+ path = /obj/item/clothing/under/rank/civilian/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
+
+/datum/gear/uniform/grey/sec
+ name = "Security Utility Uniform"
+ path = /obj/item/clothing/under/rank/security/officer/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Security"
+ restricted_roles = list("Detective", "Security Officer", "Warden", "Head of Security")
+
+/datum/gear/uniform/grey/sci
+ name = "Science Utility Uniform"
+ path = /obj/item/clothing/under/rank/rnd/scientist/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Science"
+ restricted_roles = list("Scientist", "Roboticist", "Research Director", "Geneticist")
+
+/datum/gear/uniform/grey/med
+ name = "Medical Utility Uniform"
+ path = /obj/item/clothing/under/rank/medical/doctor/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Medical"
+ restricted_roles = list("Medical Doctor", "Virologist", "Chemist", "Geneticist", "Paramedic")
+
+/datum/gear/uniform/grey/eng
+ name = "Engineering Utility Uniform"
+ path = /obj/item/clothing/under/rank/engineering/engineer/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Engineering"
+ restricted_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")
+
+/datum/gear/uniform/grey/supply
+ name = "Supply Utility Uniform"
+ path = /obj/item/clothing/under/rank/cargo/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Supply"
+ restricted_roles = list("Shaft Miner", "Cargo Technician", "Quartermaster")
+
+/datum/gear/uniform/grey/com
+ name = "Command Utility Uniform"
+ path = /obj/item/clothing/under/rank/captain/util
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_desc = "Command"
+ restricted_roles = list("Quartermaster", "Research Director", "Chief Medical Officer", "Head Of Security", "Head Of Personnel", "Captain")
+
+/datum/gear/uniform/grey/eng/mech
+ name = "Mechanic's Uniform"
+ path = /obj/item/clothing/under/rank/engineering/engineer/mechanic
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+
+/datum/gear/unifrom/grey/med/red
+ name = "Red Paramedic's Uniform"
+ path = /obj/item/clothing/under/rank/medical/paramedic/red
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+
// Trekie things
//TOS
/datum/gear/uniform/trekcmdtos
@@ -540,3 +669,9 @@
/datum/gear/uniform/kimono/sakura
name = "Sakura kimono"
path = /obj/item/clothing/under/costume/kimono/sakura
+
+/datum/gear/uniform/ctlong
+ name = "cargo tech's jumpsuit (long pants)"
+ path = /obj/item/clothing/under/rank/cargo/tech/long
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+ restricted_roles = list("Cargo Technician")
diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
index e81c7c18d3..d7212f61d2 100644
--- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
@@ -11,7 +11,7 @@
var/recentpump = 0 // to prevent spammage
/obj/item/gun/energy/pumpaction/emp_act(severity) //makes it not rack itself when emp'd
- cell.use(round(cell.charge / severity))
+ cell.use(round(cell.charge * severity/100))
chambered = null //we empty the chamber
update_icon()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
index f3059a480a..a6d300631b 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
@@ -36,6 +36,11 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
6. Giving this to someone without concent is against space law and gets you sent to gulag.
*/
+#define POLICYCONFIG_SDGF "SDGF"
+#define POLICYCONFIG_SDGF_GOOD "SDGF_ALIGNED"
+#define POLICYCONFIG_SDGF_BAD "SDGF_UNALIGNED"
+
+
//Clone serum #chemClone
/datum/reagent/fermi/SDGF //vars, mostly only care about keeping track if there's a player in the clone or not.
name = "synthetic-derived growth factor"
@@ -45,7 +50,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
var/unitCheck = FALSE
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "a weird chemical fleshy flavour"
- var/list/candies = list()
+ var/list/ghosts = list()
var/pollStarted = FALSE
var/startHunger
impure_chem = /datum/reagent/impure/SDGFtox
@@ -63,10 +68,11 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
startHunger = M.nutrition
if(pollStarted == FALSE)
pollStarted = TRUE
- candies = pollGhostCandidates("Do you want to play as [M]'s defective clone? (Don't ERP without permission from the original)", ignore_category = POLL_IGNORE_CLONE)
+ ghosts = pollGhostCandidates("Do you want to play as [M]'s SDGF clone? (Don't ERP without permission from the original, and respect their character.)", ignore_category = POLL_IGNORE_CLONE)
log_reagent("FERMICHEM: [M] ckey: [M.key] has taken SDGF, and ghosts have been polled.")
+ to_chat(M,"
If a ghost takes your clone, they will be identical to you. You may wish to add note (IC tab) to help them play your character better, and keep them up on the situation.")
if(20 to INFINITY)
- if(LAZYLEN(candies) && playerClone == FALSE) //If there's candidates, clone the person and put them in there!
+ if(LAZYLEN(ghosts) && playerClone == FALSE) //If there's candidates, clone the person and put them in there!
to_chat(M, "
The cells reach a critical micelle concentration, nucleating rapidly within your body!")
var/typepath = M.type
var/mob/living/carbon/human/fermi_Gclone = new typepath(M.loc)
@@ -74,18 +80,22 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
if(istype(SM) && istype(M))
SM.real_name = M.real_name
M.dna.transfer_identity(SM)
+ SM.underwear = "nude"
+ SM.socks = "nude"
+ SM.undershirt = "nude"
+ M.transfer_trait_datums(SM)
SM.updateappearance(mutcolor_update=1)
//Process the willing ghosts, and make sure they're actually in the body when they're moved into it!
- candies = shuffle(candies)//Shake those ghosts up!
- for(var/mob/dead/observer/C2 in candies)
+ ghosts = shuffle(ghosts)//Shake those ghosts up!
+ for(var/mob/dead/observer/C2 in ghosts)
if(C2.key && C2)
C2.transfer_ckey(SM, FALSE)
message_admins("Ghost candidate found! [C2] key [C2.key] is becoming a clone of [M] key: [M.key] (They agreed to respect the character they're becoming, and agreed to not ERP without express permission from the original.)")
log_reagent("FERMICHEM: [M] ckey: [M.key] is creating a clone, controlled by [C2]")
break
else
- candies -= C2
+ ghosts -= C2
if(!SM.mind) //Something went wrong, use alt mechanics
return ..()
SM.mind.enslave_mind_to_creator(M)
@@ -99,16 +109,27 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
ZI.Insert(SM)
log_reagent("FERMICHEM: [M] ckey: [M.key]'s zombie_infection has been transferred to their clone")
- to_chat(SM, "
You feel a strange sensation building in your mind as you realise there's two of you, before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with your original, a perfect clone of your origin.")
-
- if(prob(50))
- to_chat(SM, "
While you find your newfound existence strange, you share the same memories as [M.real_name]. However, You find yourself indifferent to the goals you previously had, and take more interest in your newfound independence, but still have an indescribable care for the safety of your original.")
- log_reagent("FERMICHEM: [SM] ckey: [SM.key]'s is not bound by [M] ckey [M.key]'s will, and is free to determine their own goals, while respecting and acting as their origin.")
- else
- to_chat(SM, "
While you find your newfound existence strange, you share the same memories as [M.real_name]. Your mind has not deviated from the tasks you set out to do, and now that there's two of you the tasks should be much easier.")
+ var/list/policies = CONFIG_GET(keyed_list/policyconfig)
+ var/policy = policies[POLICYCONFIG_SDGF]
+ if(policy)
+ to_chat(SM,policy)
+ if(prob((purity**3) * 80)) // 80% chance at 100% purity, 0% chance at 0 purity
+ policy = policies[POLICYCONFIG_SDGF_GOOD]
+ if(policy)
+ to_chat(SM,policy)
+ else
+ to_chat(SM, "
While you find your newfound existence strange, you share the same memories as [M.real_name]. Your mind has not deviated from the tasks you set out to do, and now that there's two of you the tasks should be much easier.")
log_reagent("FERMICHEM: [SM] ckey: [SM.key]'s is bound by [M] ckey [M.key]'s objectives, and is encouraged to help them complete them.")
-
- to_chat(M, "
You feel a strange sensation building in your mind as you realise there's two of you, before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with yourself.")
+ else
+ policy = policies[POLICYCONFIG_SDGF_BAD]
+ if(policy)
+ to_chat(SM,policy)
+ else
+ to_chat(SM, "
While you find your newfound existence strange, you share the same memories as [M.real_name]. However, You find yourself indifferent to the goals you previously had, and take more interest in your newfound independence, but still have an indescribable care for the safety of your original.")
+ log_reagent("FERMICHEM: [SM] ckey: [SM.key]'s is not bound by [M] ckey [M.key]'s will, and is free to determine their own goals, while respecting and acting as their origin.")
+
+ to_chat(SM, "
You feel a strange sensation building in your mind as you realise there's two of you. Before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with your original, a perfect clone of your origin.")
+ to_chat(M, "
You feel a strange sensation building in your mind as you realise there's two of you. Before you get a chance to think about it, a mass splits from you, and find yourself face to face with yourself.")
M.visible_message("[M] suddenly shudders, and splits into two identical twins!")
SM.copy_languages(M, LANGUAGE_MIND)
playerClone = TRUE
@@ -170,18 +191,22 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
//clone
var/typepath = M.type
var/mob/living/fermi_Clone = new typepath(M.loc)
- var/mob/living/carbon/C = fermi_Clone
+ var/mob/living/carbon/human/SM = fermi_Clone
- if(istype(C) && istype(M))
- C.real_name = M.real_name
- M.dna.transfer_identity(C, transfer_SE=1)
- C.updateappearance(mutcolor_update=1)
- C.apply_status_effect(/datum/status_effect/chem/SGDF)
- var/datum/status_effect/chem/SGDF/S = C.has_status_effect(/datum/status_effect/chem/SGDF)
+ if(istype(SM) && istype(M))
+ SM.real_name = M.real_name
+ M.dna.transfer_identity(SM, transfer_SE=1)
+ SM.underwear = "nude"
+ SM.socks = "nude"
+ SM.undershirt = "nude"
+ SM.updateappearance(mutcolor_update=1)
+ M.transfer_trait_datums(SM)
+ SM.real_name = M.real_name
+ SM.apply_status_effect(/datum/status_effect/chem/SGDF)
+ var/datum/status_effect/chem/SGDF/S = SM.has_status_effect(/datum/status_effect/chem/SGDF)
S.original = M
S.originalmind = M.mind
S.status_set = TRUE
-
log_reagent("FERMICHEM: [M] ckey: [M.key] has created a mindless clone of themselves")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Braindead clones made")
if(87 to INFINITY)
@@ -236,6 +261,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
SM.real_name = M.real_name
M.dna.transfer_identity(SM)
SM.updateappearance(mutcolor_update=1)
+ M.transfer_trait_datums(SM)
M.mind.transfer_to(SM)
M.visible_message("
[M]'s body shudders, the growth factor rapidly splitting into a new clone of [M].")
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index 56ad24c599..3ad24ba399 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -221,7 +221,7 @@
C.electrocute_act(10, (get_turf(C)), 1, SHOCK_ILLUSION)
if(prob(10))
var/atom/T = C
- T.emp_act(EMP_HEAVY)
+ T.emp_act(80)
to_chat(C, "
You feel a strange tingling sensation come from your core.")
if(isnull(N))
return ..()
@@ -233,7 +233,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
if(O == active_obj)
return
react_objs += O
- O.emp_act(EMP_HEAVY)
+ O.emp_act(80)
/datum/reagent/fermi/nanite_b_goneTox
name = "Electromagnetic crystals"
@@ -248,7 +248,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
C.electrocute_act(10, (get_turf(C)), 1, SHOCK_ILLUSION)
if(prob(50))
var/atom/T = C
- T.emp_act(EMP_HEAVY)
+ T.emp_act(80)
to_chat(C, "
You feel your hair stand on end as you glow brightly for a moment!")
..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 0cee2fc5cd..da9fd34cd6 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -95,8 +95,7 @@
if(!ImpureTot == 0) //If impure, v.small emp (0.6 or less)
ImpureTot *= volume
- var/empVol = clamp(volume/10, 0, 15)
- empulse(T, empVol, ImpureTot/10, 1)
+ empulse(T, volume, 1)
my_atom.reagents.clear_reagents() //just in case
return
diff --git a/strings/tips.txt b/strings/tips.txt
index 5dc4e1b985..2039b30359 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -163,7 +163,7 @@ As a Botanist, you can mutate the plants growing in your hydroponics trays with
As a Botanist, you should look into increasing the potency of your plants. This is shown by the size of the plant's sprite, and can increase the amount of chemicals, points gained from grinding them in the biogenerator, and lets people know you are a proficient botanist.
As a Botanist, you can combine production trait chemicals and mix your own complex chemicals inside of the plants themselves using precursors. Chlorine (blumpkin) + radium and phosphorus (glowshrooms) equals unstable mutagen!
As a Botanist, earthsblood is an incredibly powerful chemical found in Ambrosia Gaia, it heals all types of damages very rapidly but causes lingering brain damage and has a nasty overdose. You can combine the chemicals from watermelons (water), grass (hydrogen), and cherries (sugar) to mix mannitol in with your earthsblood to completely counteract its main drawback!
-As a Botanist, Ambrosia Gaia is a plant mutated from Ambrosia Deus, which is a plant mutated from Ambrosia Vulgaris. The reagent contained within this plant known as earthsblood can make your trays and soil plots completely self sufficient when a plant containing such reagent is composted into them, meaning they won't need nutrients or water, and they'll automatically kill their own weeds and pests.
+As a Botanist, Ambrosia Gaia is a plant mutated from Ambrosia Deus, which is a plant mutated from Ambrosia Vulgaris. The reagent contained within this plant known as earthsblood makes for a vastly superior fertilizer than most, giving decent stat boosts to most stats, and automatically killing weeds and pests!
As a Cook, you can load your food into snack vending machines.
As a Cook, you can rename your custom made food with a pen.
As a Cook, any food you make will be much healthier than the junk food found in vendors. Having the crew routinely eating from you will provide minor buffs.
diff --git a/tgstation.dme b/tgstation.dme
index 9291d1c2b8..23f262d7a5 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -26,6 +26,7 @@
#include "code\__DEFINES\antagonists.dm"
#include "code\__DEFINES\atmospherics.dm"
#include "code\__DEFINES\atom_hud.dm"
+#include "code\__DEFINES\botany.dm"
#include "code\__DEFINES\bsql.config.dm"
#include "code\__DEFINES\bsql.dm"
#include "code\__DEFINES\callbacks.dm"
@@ -1253,6 +1254,7 @@
#include "code\game\objects\structures\noticeboard.dm"
#include "code\game\objects\structures\petrified_statue.dm"
#include "code\game\objects\structures\plasticflaps.dm"
+#include "code\game\objects\structures\railings.dm"
#include "code\game\objects\structures\reflector.dm"
#include "code\game\objects\structures\safe.dm"
#include "code\game\objects\structures\showcase.dm"
@@ -2134,6 +2136,7 @@
#include "code\modules\hydroponics\growninedible.dm"
#include "code\modules\hydroponics\hydroitemdefines.dm"
#include "code\modules\hydroponics\hydroponics.dm"
+#include "code\modules\hydroponics\hydroponics_chemreact.dm"
#include "code\modules\hydroponics\plant_genes.dm"
#include "code\modules\hydroponics\sample.dm"
#include "code\modules\hydroponics\seed_extractor.dm"
@@ -3397,6 +3400,8 @@
#include "code\modules\surgery\prosthetic_replacement.dm"
#include "code\modules\surgery\remove_embedded_object.dm"
#include "code\modules\surgery\repair_puncture.dm"
+#include "code\modules\surgery\robot_brain_surgery.dm"
+#include "code\modules\surgery\robot_healing.dm"
#include "code\modules\surgery\surgery.dm"
#include "code\modules\surgery\surgery_step.dm"
#include "code\modules\surgery\tools.dm"