Adding fingerprints to actions:

-breaking windoors
-wrenching/unwrenching pipe dispensers
-locking/unlocking crates
-breaking grilles
-smashing windows
-deconning walls
This commit is contained in:
ikarrus
2014-06-04 22:30:46 -06:00
parent 40800b79e0
commit b1f050e63a
7 changed files with 42 additions and 20 deletions
@@ -43,6 +43,7 @@
/obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
if(src.allowed(user))
src.locked = !src.locked
add_fingerprint(user)
for(var/mob/O in viewers(user, 3))
if((O.client && !( O.blinded )))
O << "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>"
@@ -290,6 +290,7 @@
src.locked = 0
overlays.Cut()
overlays += greenlight
add_fingerprint(user)
return
else
user << "<span class='notice'>[src] is locked.</span>"
@@ -303,6 +304,7 @@
src.locked = 1
overlays.Cut()
overlays += redlight
add_fingerprint(user)
return
else if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && locked &&!broken)
overlays.Cut()
@@ -313,6 +315,7 @@
src.locked = 0
src.broken = 1
user << "<span class='notice'>You unlock \the [src].</span>"
add_fingerprint(user)
return
return ..()
+8 -7
View File
@@ -101,14 +101,14 @@
/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.changeNext_move(8)
add_fingerprint(user)
if(istype(W, /obj/item/weapon/wirecutters))
if(!shock(user, 100))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
if(destroyed)
new /obj/item/stack/rods(loc)
else
new /obj/item/stack/rods(loc)
new /obj/item/stack/rods(loc)
var/obj/item/stack/rods/newrods = new(loc)
transfer_fingerprints_to(newrods)
if(!destroyed)
newrods.amount = 2
qdel(src)
else if((istype(W, /obj/item/weapon/screwdriver)) && (istype(loc, /turf/simulated) || anchored))
if(!shock(user, 90))
@@ -181,15 +181,16 @@
/obj/structure/grille/proc/healthcheck()
if(health <= 0)
var/obj/item/stack/rods/newrods = new(loc)
transfer_fingerprints_to(newrods)
if(!destroyed)
icon_state = "brokengrille"
density = 0
destroyed = 1
new /obj/item/stack/rods(loc)
else
if(health <= -6)
new /obj/item/stack/rods(loc)
qdel(src)
return
return
+8 -4
View File
@@ -220,15 +220,19 @@
var/index = null
index = 0
while(index < 2)
new /obj/item/weapon/shard(loc)
if(reinf) new /obj/item/stack/rods(loc)
spawnfragments()
index++
else
new /obj/item/weapon/shard(loc)
if(reinf) new /obj/item/stack/rods(loc)
spawnfragments()
qdel(src)
return
/obj/structure/window/proc/spawnfragments()
var/newshard = new /obj/item/weapon/shard(loc)
transfer_fingerprints_to(newshard)
if(reinf)
var/newrods = new /obj/item/stack/rods(loc)
transfer_fingerprints_to(newrods)
/obj/structure/window/verb/rotate()
set name = "Rotate Window Counter-Clockwise"