shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380

Browse Source 
[MIRROR] Refactors and fixes RPEDs
This commit is contained in:
deathride58
2018-04-29 22:45:28 +00:00
committed by GitHub
parent e66e348d5c ab8355968c
commit 6f13d2c2e9
41 changed files with 50 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+1 -1
View File
@@ -298,7 +298,7 @@
var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list)
log_game("[key_name(user)] added an [I] to cyro containing [reagentlist]")
return
if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I) || exchange_parts(user, I)) \
if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I)) \
|| default_change_direction_wrench(user, I) \
|| default_pry_open(I) \
|| default_deconstruction_crowbar(I))
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
-2
View File
@@ -80,8 +80,6 @@
return
if(default_deconstruction_crowbar(I))
return
if(exchange_parts(user, I))
return
return ..()
/obj/machinery/atmospherics/components/unary/thermomachine/default_change_direction_wrench(mob/user, obj/item/I)