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.)
Monkeys can still be revs, so they should be able to be loyalty implanted. This would also fall in line with the other implants, which have no race restriction.
Fixes#637
Fixed grenade casing not being renamed to grenade when complete and made
all assembly messages refer to the assembly as "grenade assembly".
- The grenade assembly is called "grenade casing" before anything is
done (like it always was)
- The grenade assembly is called "unsecured grenade" when a activation
mechanism is added (like before
https://github.com/tgstation/-tg-station/commit/f645037dd5ffe491c94f73a39b3aac312e51d579)
- The grenade assembly is called "grenade" when finished (like before
https://github.com/tgstation/-tg-station/commit/f645037dd5ffe491c94f73a39b3aac312e51d579)
- Renamed large chem grenade to "large grenade casing"
- Made using a wrench on a unsecured grenade remove the payload on the
first use, and the activation mechanism on the second use (because we
don't want to always remove both at the same time)
- Made cable_coil drop on the floor if it was used as activation
mechanism
Fixes https://github.com/tgstation/-tg-station/issues/2378
Adds a file called robot_items.dmi. Did some minor tweaks to the borg
goggle/hudglasses sprites to make them look slightly mechanical, and
added a sprite for the electric arm, which is animated, replacing the
old warning triangle sign.
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.
-Added them around the station, replacing the ones that were just on racks (e.g. Engineering hardsuits, Captain's, etc)
-Removed their object verb. You can now just click drag yourself to climb in
-They now use the new fancy window colors
-Updated Minisat Maint a little bit to give the wall a bit more width around the SMES units. Shouldn't be so much of a vulnerability any more
ikarrus
Miauw62
phil235
Cheridan
Rolan7
Alex
Kelenius
Hornygranny
Deantwo
fleure
CollenN
Jordie0608
AnturK