cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4960 from Nerezza/Shutter-tape

Browse Source 
Makes tape appliable to hazard shutters just like airlocks
This commit is contained in:
Atermonera
2018-02-27 17:45:11 -08:00
committed by GitHub
parent a578eeeb85 413e832825
commit d345a60ad7
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/doors/firedoor.dm
View File

@@ -218,6 +218,8 @@
/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob)
add_fingerprint(user)
if(istype(C, /obj/item/taperoll))
return //Don't open the door if we're putting tape on it to tell people 'don't open the door'.
if(operating)
return//Already doing something.
if(istype(C, /obj/item/weapon/weldingtool) && !repairing)

8
code/game/objects/items/weapons/policetape.dm
View File

@@ -17,9 +17,9 @@
var/turf/T = get_turf(src)
if(!T)
return
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in T
if(airlock)
afterattack(airlock, null, TRUE)
var/obj/machinery/door/door = locate(/obj/machinery/door) in T
if((door == /obj/machinery/door/airlock) || (door == /obj/machinery/door/firedoor))
afterattack(door, null, TRUE)
return INITIALIZE_HINT_QDEL
@@ -250,7 +250,7 @@ var/list/tape_roll_applications = list()
if(!proximity)
return
if (istype(A, /obj/machinery/door/airlock))
if (istype(A, /obj/machinery/door))
var/turf/T = get_turf(A)
if(locate(/obj/item/tape, A.loc))
user << "There's already tape over that door!"