mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Using wirecutters on grille remains will now remove them (So use wirecutters twice to completely remove a grille). Also fixed some bugs related to grille destruction.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1192 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
O << text("\red [] kicks the grille.", usr)
|
||||
playsound(src.loc, 'grillehit.ogg', 80, 1)
|
||||
src.health -= 3
|
||||
healthcheck()
|
||||
|
||||
/obj/grille/attack_paw(var/obj/M)
|
||||
if ((usr.mutations & 8))
|
||||
@@ -85,9 +86,14 @@
|
||||
|
||||
/obj/grille/attackby(obj/item/weapon/W, mob/user)
|
||||
if (istype(W, /obj/item/weapon/wirecutters))
|
||||
if(!shock(user, 100))
|
||||
if(!(destroyed))
|
||||
if(!shock(user, 100))
|
||||
playsound(src.loc, 'Wirecutter.ogg', 100, 1)
|
||||
src.health = 0
|
||||
else
|
||||
playsound(src.loc, 'Wirecutter.ogg', 100, 1)
|
||||
src.health = 0
|
||||
src.health = -100
|
||||
|
||||
else if ((istype(W, /obj/item/weapon/screwdriver) && (istype(src.loc, /turf/simulated) || src.anchored)))
|
||||
if(!shock(user, 90))
|
||||
playsound(src.loc, 'Screwdriver.ogg', 100, 1)
|
||||
|
||||
Reference in New Issue
Block a user