- Fixed nettle soup recipe says abstract nettle.

- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
This commit is contained in:
phil235
2015-05-02 01:34:38 +02:00
parent 64b5f8540c
commit be1708483e
11 changed files with 40 additions and 21 deletions
@@ -215,6 +215,8 @@ LINEN BINS
/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
if(user.lying)
return
if(amount >= 1)
amount--
@@ -285,6 +285,8 @@
/obj/structure/closet/attack_hand(mob/user as mob)
src.add_fingerprint(user)
if(user.lying && get_dist(src, user) > 0)
return
if(!src.toggle())
return src.attackby(null, user)
@@ -396,4 +398,4 @@
O.show_message("<span class='warning'>The locker has been broken by [user] with an electromagnetic card!</span>", 1, "You hear a faint electrical spark.", 2)
overlays += "sparking"
spawn(4) //overlays don't support flick so we have to cheat
update_icon()
update_icon()