cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

-Committed lpeters's patch which Fixes Issue 1189. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11549

Browse Source 
-Made the shower not require power.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5391 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-12-24 01:38:36 +00:00
parent efe92432e7
commit e9fd2037d2
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+7 -7
View File
@@ -213,7 +213,7 @@
user << "\red Disconnect wires first."
return
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "You trying to remove the power control board..."
user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues
if(do_after(user, 50))
has_electronics = 0
if ((stat & BROKEN) || malfhack)
@@ -243,7 +243,7 @@
return
else
if (stat & MAINT)
user << "\red There is no any connector for your power cell."
user << "\red There is no connector for your power cell."
return
user.drop_item()
W.loc = src
@@ -341,7 +341,7 @@
if (src.loc:intact)
user << "\red You must remove the floor plating in front of the APC first."
return
user << "You begin to cut cables..."
user << "You begin to cut the cables..."
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50))
if (prob(50) && electrocute_mob(usr, terminal.powernet, terminal))
@@ -351,8 +351,8 @@
return
new /obj/item/weapon/cable_coil(loc,10)
user.visible_message(\
"\red [user.name] cut cables and dismantled the power terminal.",\
"You cut cables and dismantle the power terminal.")
"\red [user.name] cut the cables and dismantled the power terminal.",\
"You cut the cables and dismantle the power terminal.")
del(terminal)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
user << "You trying to insert the power control board into the frame..."
@@ -369,7 +369,7 @@
if (WT.get_fuel() < 3)
user << "\blue You need more welding fuel to complete this task."
return
user << "You start welding APC frame..."
user << "You start welding the APC frame..."
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 50))
if(!src || !WT.remove_fuel(3, user)) return
@@ -383,7 +383,7 @@
new /obj/item/apc_frame(loc)
user.visible_message(\
"\red [src] has been cut from the wall by [user.name] with the weldingtool.",\
"You cut APC frame from the wall.",\
"You cut the APC frame from the wall.",\
"\red You hear welding.")
del(src)
return