From 88d83b3dedf22295ade58fbcb5fa69bf545a8365 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 30 Oct 2019 21:27:21 -0700 Subject: [PATCH 1/5] Fixes 12677 - depot self-destruct leaves loot behind --- code/game/objects/structures/depot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 5ea249b5ed2..9f3999ded7d 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -113,6 +113,8 @@ depotarea.updateicon() for(var/obj/structure/closet/L in range(30, T)) + for(var/obj/O in L) + qdel(O) L.open() for(var/mob/living/M in range(30, T)) M.gib() From c978174646fc9d789e72b32c39e0b60b81964b93 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 15 Nov 2019 20:41:58 -0800 Subject: [PATCH 2/5] Fixes a bug with depot comms computer not recognizing some agents --- code/game/machinery/computer/depot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index 02be740b7d3..963ac95bb5a 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -308,7 +308,7 @@ if(check_rights(R_ADMIN, 0, user)) depotarea.peaceful_mode(FALSE, TRUE) else if (subcommand == DEPOT_VISITOR_ADD) - if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) + if(user.mind && (user.mind.special_role == SPECIAL_ROLE_TRAITOR || user.mind.special_role == ROLE_TRAITOR)) if(depotarea.list_includes(user, depotarea.peaceful_list)) to_chat(user, "[user] is already signed in as a visiting agent.") else @@ -320,7 +320,7 @@ to_chat(user, "Visitor sign-in is not possible after supplies have been taken from a locker in the depot.") else if("syndicate" in user.faction) to_chat(user, "You are already recognized as a member of the Syndicate, and do not need to sign in.") - else if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) + else if(user.mind && (user.mind.special_role == SPECIAL_ROLE_TRAITOR || user.mind.special_role == ROLE_TRAITOR)) grant_syndie_faction(user) depotarea.peaceful_mode(TRUE, TRUE) else From 513367350aa68464012543c3407a8234651ef482 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 27 Nov 2019 06:32:40 -0800 Subject: [PATCH 3/5] Revert "Fixes a bug with depot comms computer not recognizing some agents" This reverts commit c978174646fc9d789e72b32c39e0b60b81964b93. --- code/game/machinery/computer/depot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index 963ac95bb5a..02be740b7d3 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -308,7 +308,7 @@ if(check_rights(R_ADMIN, 0, user)) depotarea.peaceful_mode(FALSE, TRUE) else if (subcommand == DEPOT_VISITOR_ADD) - if(user.mind && (user.mind.special_role == SPECIAL_ROLE_TRAITOR || user.mind.special_role == ROLE_TRAITOR)) + if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) if(depotarea.list_includes(user, depotarea.peaceful_list)) to_chat(user, "[user] is already signed in as a visiting agent.") else @@ -320,7 +320,7 @@ to_chat(user, "Visitor sign-in is not possible after supplies have been taken from a locker in the depot.") else if("syndicate" in user.faction) to_chat(user, "You are already recognized as a member of the Syndicate, and do not need to sign in.") - else if(user.mind && (user.mind.special_role == SPECIAL_ROLE_TRAITOR || user.mind.special_role == ROLE_TRAITOR)) + else if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) grant_syndie_faction(user) depotarea.peaceful_mode(TRUE, TRUE) else From 13147538e7c29bec996f10a6fb4a2eb4808b7aaf Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 28 Dec 2019 14:52:29 -0800 Subject: [PATCH 4/5] Makes fusion overload immune to explosions --- code/game/objects/structures/depot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 9f3999ded7d..0cb8788d50c 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -124,3 +124,5 @@ STOP_PROCESSING(SSobj, src) qdel(src) +/obj/effect/overload/ex_act(severity) + return \ No newline at end of file From 394aff3a7388ee15a72b5375f26c44f98b66ab5d Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 7 Mar 2020 23:25:06 -0800 Subject: [PATCH 5/5] removes E.Destroy() --- code/game/objects/structures/depot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 0cb8788d50c..79365ade192 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -119,7 +119,7 @@ for(var/mob/living/M in range(30, T)) M.gib() for(var/obj/mecha/E in range(30, T)) - E.Destroy() + E.take_damage(E.max_integrity) explosion(get_turf(src), 25, 35, 45, 55, 1, 1, 60, 0, 0) STOP_PROCESSING(SSobj, src) qdel(src)