cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alleviate issues with policetape (#36517)

Browse Source
This commit is contained in:
DeityLink
2024-05-18 23:21:28 +02:00
committed by GitHub
parent b223436c84
commit ddb15828ab
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/doors/door.dm
View File

@@ -271,7 +271,7 @@ var/list/all_doors = list()
if(!ticker)
return 0
for (var/obj/O in src.loc)
if (O.blocks_doors())
if (O.blocks_doors(src))
return 0
if(arcanetampered && arcane_linked_door && arcane_linked_door.density)
spawn(1)
@@ -316,7 +316,7 @@ var/list/all_doors = list()
return
for (var/obj/O in src.loc)
if (O.blocks_doors())
if (O.blocks_doors(src))
return 0
if(arcanetampered && arcane_linked_door && !arcane_linked_door.density)

6
code/game/objects/items/policetape.dm
View File

@@ -168,7 +168,7 @@
if(proximity_flag == 0)//Check adjacency.
return 0
if(istype(target, /obj/machinery/door/airlock) || istype(target, /obj/machinery/door/firedoor)) //Make sure we can tape the target.
if(istype(target, /obj/machinery/door/airlock)) //Make sure we can tape the target.
var/turf = get_turf(target)
//Check to see if the object already has any tape of any kind on it.
@@ -185,7 +185,9 @@
to_chat(user, "<span class='notice'>You placed \the [src].</span>")
return 1
/obj/item/tape/blocks_doors()
/obj/item/tape/blocks_doors(var/obj/machinery/door/D)
if (istype(D, /obj/machinery/door/firedoor/border_only))
return FALSE
return TRUE
/obj/item/tape/Bumped(var/atom/movable/AM)

2
code/game/objects/objs.dm
View File

@@ -150,7 +150,7 @@ var/global/list/reagents_to_log = list(FUEL, PLASMA, PACID, SACID, AMUTATIONTOXI
/obj/item/proc/is_used_on(obj/O, mob/user)
/obj/proc/blocks_doors()
/obj/proc/blocks_doors(var/obj/machinery/door/D)
return 0
/obj/proc/install_pai(obj/item/device/paicard/P)

4
code/game/objects/structures/barricade.dm
View File

@@ -143,7 +143,9 @@
/obj/structure/window/barricade/full/setup_border_dummy()
return
/obj/structure/window/barricade/full/blocks_doors()
/obj/structure/window/barricade/full/blocks_doors(var/obj/machinery/door/D)
if (istype(D, /obj/machinery/door/firedoor/border_only))
return FALSE
return TRUE
/obj/structure/window/barricade/full/Cross(atom/movable/mover, turf/target, height = 1.5, air_group = 0)