cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-06-08 09:57:33 +02:00
parent 8d92b6cbe6 5d058be2e6
commit 81ee9178bd
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+3 -3
View File
@@ -596,14 +596,14 @@
"<span class='notice'>You disassembled the broken APC frame.</span>",\
"You hear welding.")
else
new /obj/item/apc_frame(loc)
new /obj/item/frame/apc(loc)
user.visible_message(\
"<span class='warning'>[src] has been cut from the wall by [user.name] with the weldingtool.</span>",\
"<span class='notice'>You cut the APC frame from the wall.</span>",\
"You hear welding.")
qdel(src)
return
else if (istype(W, /obj/item/apc_frame) && opened && emagged)
else if (istype(W, /obj/item/frame/apc) && opened && emagged)
emagged = 0
if (opened==2)
opened = 1
@@ -612,7 +612,7 @@
"<span class='notice'>You replace the damaged APC frontal panel with a new one.</span>")
qdel(W)
update_icon()
else if (istype(W, /obj/item/apc_frame) && opened && ((stat & BROKEN) || hacker))
else if (istype(W, /obj/item/frame/apc) && opened && ((stat & BROKEN) || hacker))
if (has_electronics)
user << "<span class='warning'>You cannot repair this APC until you remove the electronics still inside.</span>"
return