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

Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494

Browse Source 
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
This commit is contained in:
LetterJay
2018-04-30 11:03:33 -05:00
committed by GitHub
parent 34ce5380d6 6eeca8466a
commit 94bebc33a0
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
+2 -2
View File
@@ -113,7 +113,7 @@
if(loaded_tank)
to_chat(user, "<span class='warning'>There's already a plasma tank loaded!</span>")
return TRUE
if(panel_open)
if(panel_open)
to_chat(user, "<span class='warning'>Close the maintenance panel first!</span>")
return TRUE
if(!user.transferItemToLoc(W, src))
@@ -134,7 +134,7 @@
return ..()
/obj/machinery/power/rad_collector/wrench_act(mob/living/user, obj/item/I)
default_unfasten_wrench(user, I, 0)
default_unfasten_wrench(user, I)
return TRUE
/obj/machinery/power/rad_collector/screwdriver_act(mob/living/user, obj/item/I)
code/modules/power/singularity/emitter.dm
+1 -1
View File
@@ -229,7 +229,7 @@
state = EM_UNSECURED
/obj/machinery/power/emitter/wrench_act(mob/living/user, obj/item/I)
default_unfasten_wrench(user, I, 0)
default_unfasten_wrench(user, I)
return TRUE
/obj/machinery/power/emitter/welder_act(mob/living/user, obj/item/I)
code/modules/power/singularity/field_generator.dm
+1 -1
View File
@@ -106,7 +106,7 @@ field_generator power level display
state = FG_UNSECURED
/obj/machinery/field/generator/wrench_act(mob/living/user, obj/item/I)
default_unfasten_wrench(user, I, 0)
default_unfasten_wrench(user, I)
return TRUE
/obj/machinery/field/generator/welder_act(mob/living/user, obj/item/I)