The Reaper came that day;
An angel visited this damned sat,
And took the parapen away.
Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.
Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
Fixes#3880 : Mapped or Adminspawned Growns will take on the default variables of their seed type.
Fixes#3828 : Meteor Pen projectiles are now visible
Some more refactoring, clearing up the growninedible.dm. Deletes hydroitemcode.dm. Keep code with the definitions, ew ew.
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict. Opening it in tortoisemerge showed no conflicts and automatically cleared the status. I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.
Refactors grown.dm to use OO programming techniques.
merge commit
conflict in map
map fix
fixing the map. again. thanks obama.
map commit
wtf
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
map conflict fix. this should work.
updates metastation
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.
Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.
Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)
Reorganizes some item definition/procs.
All reagent containers have icon updated after plot-use, including droppers.
Droppers updated to use update_icon instead of that "filled" variable.
Typo in irrigation fixed, allowing liquid > 30 units to be spread amongst connected trays.
Changelog updated, including some things from previous PRs which I didn't add at the time.
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison. Went with my solution.)
MUTAGEN might be controversial I assume... The service borg has no spray bottle though.
Moves update_robot_modules_display() to fix a UI glitch where using the home to unequip a module wasn't making the module appear in the storage list until it was otherwise updated.
Robots no longer take fire damage from fire stacks, since they're otherwise immune to heat... also, fire stacks will gradually burn off and the borg will stop being on fire.
Service borg emag beer (beer2) was oldchloral instead of newchloral. Excellent argument against copy-paste. Fixed.
Removed the dumb "if this happened to be a borg's drink container, refill whatever it's currently holding the most of after a delay" which lead to an easy reagent duplication glitch, and was generally shit. Fixes issue #1673.
Uncapitalized some drink names which weren't proper nouns, and changed stuff like "Beer glass" to "glass of beer".
This still fixes#3401 too of course
This somewhat changes how items are placed on them, but for the better as it's more consistent with existing mechanics.
Hitting someone with the tray still scatters the contents around! Works on nonhumans.
Placing icons on the tray still makes them show up on the tray. Using the tray on a table now places the items onto the table, or places the tray itself if it's empty. Robots can't lose their tray this way, I checked.
Service borgs can actually use their tray to carry things! Trays can hold all sorts of stuff, as long as it's small...
A service borg can carry the nuke disk around. The pinpointer does follow it correctly.
If the service borg stashes its tray module, dies, explodes, gibselfs, or is forced to stash its modules by damage, it drops all the tray's contents on the ground.
Fixes#236 (service borgs can't use trays) and #2991 (Items on food trays can't be picked up). Didn't address #1919, the layer issue.
Fixes the "bajillion lines changed" with the maps.
Much less nutrition consumed, but they actually use it to grow
Made mutation chance random between 25 and 35
Slime core reactions use 1 unit of reagent
Code cleanups
-The more thermite is applied to a wall, the faster it will burn
-Scales between approx 10-25 seconds
-Rwalls have a higher minimum threshold and burn time
-Applying thermite to a wall now leaves a visible stain on the wall
Alex
paprka
Miauw
quiltyquilty
Cheridan
Rolan7
CollenN
phil235
Hornygranny
Kelenius
ikarrus