cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10019 from Aurorablade/DammitTiger

Browse Source 
Fixes where tiger wasn't actually checking for the /airlock subtype in RCD code
This commit is contained in:
tigercat2000
2018-10-27 10:49:49 -07:00
committed by GitHub
parent 897257d6af d9e3693caf
commit daef5eec4c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/RCD.dm
+3 -3
View File
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
/obj/machinery/door/airlock/medical = "Medical", /obj/machinery/door/airlock/medical/glass = "Medical (Glass)",
/obj/machinery/door/airlock/maintenance = "Maintenance", /obj/machinery/door/airlock/maintenance/glass = "Maintenance (Glass)",
/obj/machinery/door/airlock/external = "External", /obj/machinery/door/airlock/external/glass = "External (Glass)",
/obj/machinery/door/airlock/maintenance/external = "External Maintenance",
/obj/machinery/door/airlock/maintenance/external = "External Maintenance",
/obj/machinery/door/airlock/maintenance/external/glass = "External Maintenance (Glass)",
/obj/machinery/door/airlock/freezer = "Freezer",
/obj/machinery/door/airlock/mining = "Mining", /obj/machinery/door/airlock/mining/glass = "Mining (Glass)",
@@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
/obj/item/rcd/attack_self(mob/user)
//Change the mode // Oh I thought the UI was just for fucking staring at
//Change the mode // Oh I thought the UI was just for fucking staring at
radial_menu(user)
/obj/item/rcd/attack_self_tk(mob/user)
@@ -276,7 +276,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
to_chat(user, "Building Airlock...")
playsound(loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50 * toolspeed, target = A))
if(locate(/obj/machinery/door) in A.contents)
if(locate(/obj/machinery/door/airlock) in A.contents)
return FALSE
if(!useResource(10, user))
return FALSE