Skip to content

Commit

Permalink
fix for the worlds shittiest exploit (#25130)
Browse files Browse the repository at this point in the history
  • Loading branch information
GDNgit authored Apr 14, 2024
1 parent cb03f17 commit 95efc8f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
2 changes: 2 additions & 0 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1552,10 +1552,12 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
ae.selected_accesses = req_one_access
ae.one_access = 1
ae.unres_access_from = unres_sides
ae.is_installed = FALSE
else
ae = electronics
electronics = null
ae.forceMove(loc)
ae.is_installed = FALSE
QDEL_LIST_CONTENTS(fillers)
qdel(src)

Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/doors/airlock_electronics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
var/const/max_brain_damage = 60
/// Which direction has unrestricted access to the airlock (e.g. medbay doors from the inside)
var/unres_access_from = null
/// Is this electronic installed in a door?
var/is_installed = FALSE

/obj/item/airlock_electronics/Initialize(mapload)
. = ..()
Expand All @@ -38,7 +40,6 @@
return
ui_interact(user)


// tgui\packages\tgui\interfaces\AirlockElectronics.js
/obj/item/airlock_electronics/ui_state(mob/user)
return GLOB.inventory_state
Expand Down
9 changes: 6 additions & 3 deletions code/game/objects/structures/displaycase.dm
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,12 @@
to_chat(user, "<span class='notice'>You start installing the electronics into [src]...</span>")
playsound(loc, I.usesound, 50, 1)
if(do_after(user, 30, target = src))
if(user.drop_item())
I.forceMove(src)
electronics = I
var/obj/item/airlock_electronics/new_electronics = I
if(user.drop_item() && !new_electronics.is_installed)
new_electronics.forceMove(src)
electronics = new_electronics
to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
electronics.is_installed = TRUE

else if(istype(I, /obj/item/stack/sheet/glass))
var/obj/item/stack/sheet/glass/G = I
Expand Down Expand Up @@ -241,6 +243,7 @@
if(I.use_tool(src, user, 0, volume = I.tool_volume))
to_chat(user, "<span class='notice'>You remove the airlock electronics.</span>")
new /obj/item/airlock_electronics(drop_location(), 1)
electronics.is_installed = FALSE
electronics = null

/obj/structure/displaycase_chassis/wrench_act(mob/user, obj/item/I)
Expand Down
9 changes: 6 additions & 3 deletions code/game/objects/structures/door_assembly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,16 @@
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...")

if(do_after(user, 40 * W.toolspeed, target = src))
if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS)
var/obj/item/airlock_electronics/new_electronics = W
if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS || new_electronics.is_installed)
return
user.drop_item()
W.forceMove(src)
new_electronics.forceMove(src)
to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
state = AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER
name = "near finished airlock assembly"
electronics = W
electronics = new_electronics
electronics.is_installed = TRUE

else if(istype(W, /obj/item/stack/sheet) && (!glass || !mineral))
var/obj/item/stack/sheet/S = W
Expand Down Expand Up @@ -137,6 +139,7 @@
ae = electronics
electronics = null
ae.forceMove(loc)
ae.is_installed = FALSE
update_appearance(UPDATE_NAME | UPDATE_OVERLAYS)

/obj/structure/door_assembly/screwdriver_act(mob/user, obj/item/I)
Expand Down
11 changes: 7 additions & 4 deletions code/game/objects/structures/windoor_assembly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,18 @@
user.visible_message("[user] installs the electronics into the windoor assembly.", "You start to install electronics into the windoor assembly...")
user.drop_item()
W.forceMove(src)
var/obj/item/airlock_electronics/new_electronics = W

if(do_after(user, 40 * W.toolspeed, target = src))
if(do_after(user, 40 * new_electronics.toolspeed, target = src) && !new_electronics.is_installed)
if(!src || electronics)
W.forceMove(loc)
new_electronics.forceMove(loc)
return
to_chat(user, "<span class='notice'>You install the windoor electronics.</span>")
name = "near finished windoor assembly"
electronics = W
electronics = new_electronics
electronics.is_installed = TRUE
else
W.forceMove(loc)
new_electronics.forceMove(loc)

else if(is_pen(W))
var/t = rename_interactive(user, W)
Expand Down Expand Up @@ -247,6 +249,7 @@
ae = electronics
electronics = null
ae.forceMove(loc)
ae.is_installed = FALSE

/obj/structure/windoor_assembly/wirecutter_act(mob/user, obj/item/I)
if(state != WIRED_ASSEMBLY)
Expand Down

0 comments on commit 95efc8f

Please sign in to comment.