cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
-59
View File
@@ -214,33 +214,25 @@
if(..(user, 1))
if(stat & BROKEN)
to_chat(user, "Looks broken.")
return
if(opened)
if(has_electronics && terminal)
to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
else if (!has_electronics && terminal)
to_chat(user, "There are some wires but no any electronics.")
else if (has_electronics && !terminal)
to_chat(user, "Electronics installed but not wired.")
else /* if (!has_electronics && !terminal) */
to_chat(user, "There is no electronics nor connected wires.")
else
if (stat & MAINT)
to_chat(user, "The cover is closed. Something wrong with it: it doesn't work.")
else if (malfhack)
to_chat(user, "The cover is broken. It may be hard to force it open.")
else
to_chat(user, "The cover is closed.")
// update the APC icon to show the three base states
// also add overlays for indicator lights
/obj/machinery/power/apc/update_icon()
@@ -425,12 +417,10 @@
if (has_electronics==1)
if (terminal)
to_chat(user, "<span class='warning'>Disconnect wires first.</span>")
return
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
to_chat(user, "You are trying to remove the power control board...")//lpeters - fixed grammar issues
if(do_after(user, 50, target = src))
if (has_electronics==1)
has_electronics = 0
@@ -451,7 +441,6 @@
else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) )
if(coverlocked && !(stat & MAINT))
to_chat(user, "<span class='warning'>The cover is locked and cannot be opened.</span>")
return
else
opened = 1
@@ -459,12 +448,10 @@
else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside
if(cell)
to_chat(user, "There is a power cell already installed.")
return
else
if (stat & MAINT)
to_chat(user, "<span class='warning'>There is no connector for your power cell.</span>")
return
user.drop_item()
W.loc = src
@@ -479,7 +466,6 @@
if (cell)
to_chat(user, "<span class='warning'>Close the APC first.</span>")//Less hints more mystery!
return
else
if (has_electronics==1 && terminal)
@@ -487,61 +473,47 @@
stat &= ~MAINT
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
to_chat(user, "You screw the circuit electronics into place.")
else if (has_electronics==2)
has_electronics = 1
stat |= MAINT
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
to_chat(user, "You unfasten the electronics.")
else /* has_electronics==0 */
to_chat(user, "<span class='warning'>There is nothing to secure.</span>")
return
update_icon()
else if(emagged)
to_chat(user, "The interface is broken.")
else
wiresexposed = !wiresexposed
to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]")
update_icon()
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
if(emagged)
to_chat(user, "The interface is broken.")
else if(opened)
to_chat(user, "You must close the cover to swipe an ID card.")
else if(wiresexposed)
to_chat(user, "You must close the panel")
else if(stat & (BROKEN|MAINT))
to_chat(user, "Nothing happens.")
else
if(src.allowed(usr) && !isWireCut(APC_WIRE_IDSCAN))
locked = !locked
to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.")
update_icon()
else
to_chat(user, "<span class='warning'>Access denied.</span>")
else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
if (src.loc:intact)
to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first.</span>")
return
var/obj/item/stack/cable_coil/C = W
if(C.amount < 10)
to_chat(user, "<span class='warning'>You need more wires.</span>")
return
to_chat(user, "You start adding cables to the APC frame...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20, target = src))
if (C.amount >= 10 && !terminal && opened && has_electronics != 2)
@@ -561,10 +533,8 @@
else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2)
if (src.loc:intact)
to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first.</span>")
return
to_chat(user, "You begin to cut the cables...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50, target = src))
if(terminal && opened && has_electronics!=2)
@@ -575,27 +545,22 @@
return
new /obj/item/stack/cable_coil(loc,10)
to_chat(user, "<span class='notice'>You cut the cables and dismantle the power terminal.</span>")
qdel(terminal) // qdel
else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
to_chat(user, "You trying to insert the power control board into the frame...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10, target = src))
if(has_electronics==0)
has_electronics = 1
to_chat(user, "<span class='notice'>You place the power control board inside the frame.</span>")
qdel(W) // qdel
else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
to_chat(user, "<span class='warning'>You cannot put the board inside, the frame is damaged.</span>")
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal)
var/obj/item/weapon/weldingtool/WT = W
if (WT.get_fuel() < 3)
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
return
user.visible_message("<span class='warning'>[user.name] welds [src].</span>", \
"You start welding the APC frame...", \
@@ -629,10 +594,8 @@
else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
if (has_electronics)
to_chat(user, "You cannot repair this APC until you remove the electronics still inside.")
return
to_chat(user, "You begin to replace the damaged APC frame...")
if(do_after(user, 50, target = src))
user.visible_message(\
"<span class='notice'>[user.name] has replaced the damaged APC frame with new one.</span>",\
@@ -673,19 +636,15 @@
if (!(emagged || malfhack)) // trying to unlock with an emag card
if(opened)
to_chat(user, "You must close the cover to swipe an ID card.")
else if(wiresexposed)
to_chat(user, "You must close the panel first")
else if(stat & (BROKEN|MAINT))
to_chat(user, "Nothing happens.")
else
flick("apc-spark", src)
emagged = 1
locked = 0
to_chat(user, "You emag the APC interface.")
update_icon()
// attack with hand - remove cell (if cover open) or interact with the APC
@@ -704,7 +663,6 @@
s.set_up(3, 1, src)
s.start()
to_chat(H, "<span class='warning'>The APC power currents surge erratically, damaging your chassis!</span>")
H.adjustFireLoss(10,0)
else if(src.cell && src.cell.charge > 0)
if(H.nutrition < 450)
@@ -716,7 +674,6 @@
src.cell.charge = 0
to_chat(user, "<span class='notice'>You slot your fingers into the APC interface and siphon off some of the stored charge for your own use.</span>")
if(src.cell.charge < 0)
src.cell.charge = 0
if(H.nutrition > 500)
@@ -724,10 +681,8 @@
src.charging = 1
else
to_chat(user, "<span class='notice'>You are already fully charged.</span>")
else
to_chat(user, "<span class='warning'>There is no charge to draw from that APC.</span>")
return
if(usr == user && opened && (!issilicon(user)))
@@ -742,7 +697,6 @@
src.cell = null
user.visible_message("<span class='warning'>[user.name] removes the power cell from [src.name]!", "You remove the power cell.</span>")
// to_chat(user, "You remove the power cell.")
charging = 0
src.update_icon()
return
@@ -883,14 +837,12 @@
// if (area.name == "AI Chamber")
// spawn(10)
// to_chat(world, " [area.name] [area.power_equip]")
else
area.power_light = 0
area.power_equip = 0
area.power_environ = 0
// if (area.name == "AI Chamber")
// to_chat(world, "[area.power_equip]")
area.power_change()
/obj/machinery/power/apc/proc/isWireCut(var/wireIndex)
@@ -915,7 +867,6 @@
)
if(!loud)
to_chat(user, "<span class='danger'>\The [src] has AI control disabled!</span>")
user << browse(null, "window=apc")
user.unset_machine()
return 0
@@ -928,11 +879,9 @@
if(H.getBrainLoss() >= 60)
for(var/mob/M in viewers(src, null))
to_chat(M, "<span class='danger'>[H] stares cluelessly at [src] and drools.</span>")
return 0
else if(prob(H.getBrainLoss()))
to_chat(user, "<span class='danger'>You momentarily forget how to use [src].</span>")
return 0
return 1
@@ -1024,10 +973,8 @@
if(get_malf_status(malfai)==1)
if (malfai.malfhacking)
to_chat(malfai, "You are already hacking an APC.")
return 0
to_chat(malfai, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
malfai.malfhack = src
malfai.malfhacking = 1
sleep(600)
@@ -1044,7 +991,6 @@
else
src.malfai = usr
to_chat(malfai, "Hack complete. The APC is now under your exclusive control.")
update_icon()
else if (href_list["occupyapc"])
@@ -1059,7 +1005,6 @@
if(istype(usr, /mob/living/silicon))
if(emagged || aidisabled || (stat & (BROKEN|MAINT)))
to_chat(usr, "The APC does not respond to the command.")
else
locked = !locked
update_icon()
@@ -1082,11 +1027,9 @@
return
if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC
to_chat(malf, "<span class='warning'>You must evacuate your current apc first.</span>")
return
if(!malf.can_shunt)
to_chat(malf, "<span class='warning'>You cannot shunt.</span>")
return
if(!(src.z in config.station_levels))
return
@@ -1127,7 +1070,6 @@
else
to_chat(src.occupier, "<span class='danger'>Primary core damaged, unable to return core processes.</span>")
if(forced)
src.occupier.loc = src.loc
src.occupier.death()
@@ -1143,7 +1085,6 @@
src.locked = 1
if (src.cell.charge > 0)
// to_chat(world, "<span class='warning'>blew APC in [src.loc.loc]</span>")
src.cell.charge = 0
cell.corrupt()
src.malfhack = 1
code/modules/power/cable.dm
-25
View File
@@ -121,12 +121,10 @@ By design, d1 is the smallest direction and d2 is the highest
///// Z-Level Stuff
/* if(src.d1 == 12 || src.d2 == 12)
to_chat(user, "<span class='warning'>You must cut this cable from above.</span>")
return */
///// Z-Level Stuff
/* if(breaker_box)
to_chat(user, "\red This cable is connected to nearby breaker box. Use breaker box to interact with it.")
return */
if (shock(user, 50))
@@ -160,7 +158,6 @@ By design, d1 is the smallest direction and d2 is the highest
var/obj/item/stack/cable_coil/coil = W
if (coil.get_amount() < 1)
to_chat(user, "Not enough cable")
return
coil.cable_join(src, user)
@@ -169,11 +166,9 @@ By design, d1 is the smallest direction and d2 is the highest
if(powernet && (powernet.avail > 0)) // is it powered?
to_chat(user, "<span class='warning'>[powernet.avail]W in power network.</span>")
else
to_chat(user, "<span class='warning'>The cable is not powered.</span>")
shock(user, 5, 0.2)
else
@@ -520,11 +515,9 @@ obj/structure/cable/proc/cableColor(var/colorC)
user.visible_message("<span class='alert'>\The [user] repairs some burn damage on \the [M]'s [S.name] with \the [src].</span>")
else if(S.open != 2)
to_chat(user, "<span class='danger'>The damage is far too severe to patch over externally.</span>")
return 1
else if(S.open != 2)
to_chat(user, "<span class='notice'>Nothing to fix!</span>")
else
return ..()
@@ -554,15 +547,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(get_amount() == 1)
to_chat(user, "A short piece of power cable.")
else if(get_amount() == 2)
to_chat(user, "A piece of power cable.")
else
to_chat(user, "A coil of power cable. There are [get_amount()] lengths of cable in the coil.")
/obj/item/stack/cable_coil/verb/make_restraint()
set name = "Make Cable Restraints"
set category = "Object"
@@ -572,16 +562,13 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(!istype(usr.loc,/turf)) return
if(src.amount <= 14)
to_chat(usr, "<span class='warning'>You need at least 15 lengths to make restraints!</span>")
return
var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc)
B.color = color
to_chat(usr, "<span class='notice'>You wind some cable together to make some restraints.</span>")
src.use(15)
else
to_chat(usr, "<span class='warning'>You cannot do that.</span>")
..()
// Items usable on a cable coil :
@@ -593,19 +580,16 @@ obj/structure/cable/proc/cableColor(var/colorC)
src.amount--
new/obj/item/stack/cable_coil(user.loc, 1,color)
to_chat(user, "You cut a piece off the cable coil.")
src.update_icon()
return
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(C.amount >= MAXCOIL)
to_chat(user, "The coil is too long, you cannot add any more cable to it.")
return
if( (C.amount + src.amount <= MAXCOIL) )
to_chat(user, "You join the cable coils together.")
C.give(src.amount) // give it cable
src.use(src.amount) // make sure this one cleans up right
return
@@ -613,7 +597,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
else
var/amt = MAXCOIL - C.amount
to_chat(user, "You transfer [amt] length\s of cable from one coil to the other.")
C.give(amt)
src.use(amt)
return
@@ -664,17 +647,14 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(!T.can_have_cabling())
to_chat(user, "<span class='warning'>You can only lay cables on catwalks and plating!</span>")
return
if(get_amount() < 1) // Out of cable
to_chat(user, "<span class='warning'>There is no cable left!</span>")
return
if(get_dist(T,user) > 1) // Too far
to_chat(user, "<span class='warning'>You can't lay cable at a place that far away!</span>")
return
else
@@ -688,7 +668,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
for(var/obj/structure/cable/LC in T)
if(LC.d2 == dirn && LC.d1 == 0)
to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
return
var/obj/structure/cable/C = get_new_cable(T)
@@ -731,7 +710,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(get_dist(C, user) > 1) // make sure it's close enough
to_chat(user, "You can't lay cable at a place that far away.")
return
@@ -745,7 +723,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(C.d1 == dirn || C.d2 == dirn)
if(U.intact) // can't place a cable if the floor is complete
to_chat(user, "You can't lay cable there unless the floor tiles are removed.")
return
else
// cable is pointing at us, we're standing on an open tile
@@ -756,7 +733,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already
if(LC.d1 == fdirn || LC.d2 == fdirn)
to_chat(user, "There's already a cable at that position.")
return
var/obj/structure/cable/NC = new(U)
@@ -803,7 +779,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
continue
if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction
to_chat(user, "There's already a cable at that position.")
return
code/modules/power/cable_heavyduty.dm
-2
View File
@@ -17,11 +17,9 @@
if(istype(W, /obj/item/weapon/wirecutters))
to_chat(usr, "\blue These cables are too tough to be cut with those [W.name].")
return
else if(istype(W, /obj/item/stack/cable_coil))
to_chat(usr, "\blue You will need heavier cables to connect to these.")
return
else
..()
code/modules/power/cell.dm
-4
View File
@@ -59,14 +59,11 @@
if(..(user, 1))
if(maxcharge <= 2500)
to_chat(user, "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%.")
else
to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.")
if(crit_fail)
to_chat(user, "\red This power cell seems to be faulty.")
/obj/item/weapon/stock_parts/cell/attack_self(mob/user as mob)
src.add_fingerprint(user)
return
@@ -78,7 +75,6 @@
to_chat(user, "You inject the solution into the power cell.")
if(S.reagents.has_reagent("plasma", 5))
rigged = 1
code/modules/power/generator.dm
-1
View File
@@ -122,7 +122,6 @@
if(istype(W, /obj/item/weapon/wrench))
anchored = !anchored
to_chat(user, "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.")
use_power = anchored
reconnect()
else
code/modules/power/generator_type2.dm
-1
View File
@@ -74,7 +74,6 @@
// to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
input1.parent.update = 1
input2.parent.update = 1
code/modules/power/gravitygenerator.dm
-5
View File
@@ -183,7 +183,6 @@ var/const/GRAV_NEEDS_WRENCH = 3
if(GRAV_NEEDS_SCREWDRIVER)
if(istype(I, /obj/item/weapon/screwdriver))
to_chat(user, "<span class='notice'>You secure the screws of the framework.</span>")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
broken_state++
if(GRAV_NEEDS_WELDING)
@@ -191,7 +190,6 @@ var/const/GRAV_NEEDS_WRENCH = 3
var/obj/item/weapon/weldingtool/WT = I
if(WT.remove_fuel(1, user))
to_chat(user, "<span class='notice'>You mend the damaged framework.</span>")
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
broken_state++
if(GRAV_NEEDS_PLASTEEL)
@@ -200,16 +198,13 @@ var/const/GRAV_NEEDS_WRENCH = 3
if(PS.amount >= 10)
PS.use(10)
to_chat(user, "<span class='notice'>You add the plating to the framework.</span>")
playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
broken_state++
else
to_chat(user, "<span class='notice'>You need 10 sheets of plasteel.</span>")
if(GRAV_NEEDS_WRENCH)
if(istype(I, /obj/item/weapon/wrench))
to_chat(user, "<span class='notice'>You secure the plating to the framework.</span>")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
set_fix()
else
code/modules/power/lighting.dm
-25
View File
@@ -31,21 +31,17 @@
switch(src.stage)
if(1)
to_chat(usr, "It's an empty frame.")
if(2)
to_chat(usr, "It's wired.")
if(3)
to_chat(usr, "The casing is closed.")
/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
src.add_fingerprint(user)
if (istype(W, /obj/item/weapon/wrench))
if (src.stage == 1)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
to_chat(usr, "You begin deconstructing [src].")
if (!do_after(usr, 30, target = src))
return
new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
@@ -55,12 +51,10 @@
qdel(src)
if (src.stage == 2)
to_chat(usr, "You have to remove the wires first.")
return
if (src.stage == 3)
to_chat(usr, "You have to unscrew the case first.")
return
if(istype(W, /obj/item/weapon/wirecutters))
@@ -276,19 +270,15 @@
switch(status)
if(LIGHT_OK)
to_chat(user, "[desc] It is turned [on? "on" : "off"].")
if(LIGHT_EMPTY)
to_chat(user, "[desc] The [fitting] has been removed.")
if(LIGHT_BURNED)
to_chat(user, "[desc] The [fitting] is burnt out.")
if(LIGHT_BROKEN)
to_chat(user, "[desc] The [fitting] has been smashed.")
// attack with item - insert light (if right type), otherwise try to break the light
/obj/machinery/light/attackby(obj/item/W, mob/living/user, params)
@@ -305,7 +295,6 @@
if(istype(W, /obj/item/weapon/light))
if(status != LIGHT_EMPTY)
to_chat(user, "There is a [fitting] already inserted.")
return
else
src.add_fingerprint(user)
@@ -313,7 +302,6 @@
if(istype(L, light_type))
status = L.status
to_chat(user, "You insert the [L.name].")
switchcount = L.switchcount
rigged = L.rigged
brightness_range = L.brightness_range
@@ -333,7 +321,6 @@
explode()
else
to_chat(user, "This type of light requires a [fitting].")
return
// attempt to break the light
@@ -345,7 +332,6 @@
if(prob(1+W.force * 5))
to_chat(user, "You hit the light, and it smashes!")
for(var/mob/M in viewers(src))
if(M == user)
continue
@@ -384,7 +370,6 @@
return
to_chat(user, "You stick \the [W] into the light socket!")
if(has_power() && (W.flags & CONDUCT))
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
@@ -423,7 +408,6 @@
/obj/machinery/light/attack_alien(mob/living/carbon/alien/humanoid/user)//So larva don't go breaking light bulbs.
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
to_chat(user, "\green That object is useless to you.")
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
user.do_attack_animation(src)
@@ -435,7 +419,6 @@
if(M.melee_damage_upper == 0) return
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
to_chat(M, "\red That object is useless to you.")
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
M.do_attack_animation(src)
@@ -451,7 +434,6 @@
if(status == LIGHT_EMPTY)
to_chat(user, "There is no [fitting] in this light.")
return
// make it burn hands if not wearing fire-insulated gloves
@@ -470,14 +452,11 @@
if(prot > 0 || (RESIST_HEAT in user.mutations))
to_chat(user, "You remove the light [fitting]")
else if(TK in user.mutations)
to_chat(user, "You telekinetically remove the light [fitting].")
else
to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!")
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
if(affecting.take_damage( 0, 5 )) // 5 burn damage
H.UpdateDamageIcon()
@@ -487,7 +466,6 @@
to_chat(user, "You remove the light [fitting].")
// create a light tube/bulb item and put it in the user's hand
var/obj/item/weapon/light/L = new light_type()
L.status = status
@@ -513,11 +491,9 @@
/obj/machinery/light/attack_tk(mob/user)
if(status == LIGHT_EMPTY)
to_chat(user, "There is no [fitting] in this light.")
return
to_chat(user, "You telekinetically remove the light [fitting].")
// create a light tube/bulb item and put it in the user's hand
var/obj/item/weapon/light/L = new light_type()
L.status = status
@@ -697,7 +673,6 @@
to_chat(user, "You inject the solution into the [src].")
if(S.reagents.has_reagent("plasma", 5))
log_admin("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.")
code/modules/power/port_gen.dm
-12
View File
@@ -52,11 +52,9 @@
return
if(active)
to_chat(usr, "<span class='notice'>The generator is on.</span>")
else
to_chat(usr, "<span class='notice'>The generator is off.</span>")
/obj/machinery/power/port_gen/emp_act(severity)
var/duration = 6000 //ten minutes
switch(severity)
@@ -154,16 +152,12 @@
/obj/machinery/power/port_gen/pacman/examine(mob/user)
..(user)
to_chat(user, "\The [src] appears to be producing [power_gen*power_output] W.")
to_chat(user, "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper.")
if(IsBroken())
to_chat(user, "<span class='warning'>\The [src] seems to have broken down.</span>")
if(overheating)
to_chat(user, "<span class='danger'>\The [src] is overheating!</span>")
/obj/machinery/power/port_gen/pacman/HasFuel()
var/needed_sheets = power_output / time_per_sheet
if(sheets >= needed_sheets - sheet_left)
@@ -278,10 +272,8 @@
var/amount = min((max_sheets - sheets), addstack.amount)
if(amount < 1)
to_chat(user, "<span class='notice'>The [src.name] is full!</span>")
return
to_chat(user, "<span class='notice'>You add [amount] sheet\s to the [src.name].</span>")
sheets += amount
addstack.use(amount)
nanomanager.update_uis(src)
@@ -292,12 +284,10 @@
if(!anchored)
connect_to_network()
to_chat(user, "<span class='notice'>You secure the generator to the floor.</span>")
else
disconnect_from_network()
to_chat(user, "<span class='notice'>You unsecure the generator from the floor.</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
anchored = !anchored
@@ -306,10 +296,8 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(panel_open)
to_chat(user, "<span class='notice'>You open the access panel.</span>")
else
to_chat(user, "<span class='notice'>You close the access panel.</span>")
else if(istype(O, /obj/item/weapon/storage/part_replacer) && panel_open)
exchange_parts(user, O)
return
code/modules/power/singularity/collector.dm
-8
View File
@@ -45,7 +45,6 @@ var/global/list/rad_collectors = list()
return
else
to_chat(user, "\red The controls are locked!")
return
..()
@@ -53,18 +52,15 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
to_chat(user, "<span class='notice'>The [W.name] detects that [last_power]W were recently produced.</span>")
return 1
else if(istype(W, /obj/item/device/analyzer) && P)
atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/plasma))
if(!src.anchored)
to_chat(user, "\red The [src] needs to be secured to the floor first.")
return 1
if(src.P)
to_chat(user, "\red There's already a plasma tank loaded.")
return 1
user.drop_item()
src.P = W
@@ -77,7 +73,6 @@ var/global/list/rad_collectors = list()
else if(istype(W, /obj/item/weapon/wrench))
if(P)
to_chat(user, "\blue Remove the plasma tank first.")
return 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
src.anchored = !src.anchored
@@ -93,14 +88,11 @@ var/global/list/rad_collectors = list()
if(active)
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
to_chat(user, "\red The controls can only be locked when the [src] is active")
else
to_chat(user, "\red Access denied!")
return 1
else
..()
code/modules/power/singularity/emitter.dm
-18
View File
@@ -66,7 +66,6 @@
if (src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -129,20 +128,17 @@
if(state == 2)
if(!powernet)
to_chat(user, "The emitter isn't connected to a wire.")
return 1
if(!src.locked)
if(src.active==1)
src.active = 0
to_chat(user, "You turn off the [src].")
message_admins("Emitter turned off by [key_name_admin(user)] in ([x], [y], [z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("Emitter turned off by [key_name(user)] in [x], [y], [z]")
investigate_log("turned <font color='red'>off</font> by [key_name(usr)]","singulo")
else
src.active = 1
to_chat(user, "You turn on the [src].")
src.shot_number = 0
src.fire_delay = maximum_fire_delay
message_admins("Emitter turned on by [key_name_admin(user)] in ([x], [y], [z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
@@ -151,10 +147,8 @@
update_icon()
else
to_chat(user, "\red The controls are locked!")
else
to_chat(user, "\red The [src] needs to be firmly secured to the floor first.")
return 1
@@ -230,7 +224,6 @@
if(istype(W, /obj/item/weapon/wrench))
if(active)
to_chat(user, "Turn off the [src] first.")
return
switch(state)
if(0)
@@ -249,19 +242,16 @@
src.anchored = 0
if(2)
to_chat(user, "\red The [src.name] needs to be unwelded from the floor.")
return
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(active)
to_chat(user, "Turn off the [src] first.")
return
switch(state)
if(0)
to_chat(user, "\red The [src.name] needs to be wrenched to the floor.")
if(1)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -272,11 +262,9 @@
if(!src || !WT.isOn()) return
state = 2
to_chat(user, "You weld the [src] to the floor.")
connect_to_network()
else
to_chat(user, "\red You need more welding fuel to complete this task.")
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -287,30 +275,24 @@
if(!src || !WT.isOn()) return
state = 1
to_chat(user, "You cut the [src] free from the floor.")
disconnect_from_network()
else
to_chat(user, "\red You need more welding fuel to complete this task.")
return
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
to_chat(user, "\red The lock seems to be broken")
return
if(src.allowed(user))
if(active)
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
to_chat(user, "\red The controls can only be locked when the [src] is online")
else
to_chat(user, "\red Access denied.")
return
if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
code/modules/power/singularity/field_generator.dm
-7
View File
@@ -80,7 +80,6 @@ field_generator power level display
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(src.active >= 1)
to_chat(user, "<span class='warning'>You are unable to turn off the [src.name] once it is online!</span>")
return 1
else
user.visible_message("[user.name] turns on the [src.name].", \
@@ -92,14 +91,12 @@ field_generator power level display
src.add_fingerprint(user)
else
to_chat(user, "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>")
return
/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
if(active)
to_chat(user, "<span class='warning'>The [src] needs to be off!</span>")
return
else if(istype(W, /obj/item/weapon/wrench))
switch(state)
@@ -120,14 +117,12 @@ field_generator power level display
src.anchored = 0
if(2)
to_chat(user, "<span class='warning'>The [src.name] needs to be unwelded from the floor!</span>")
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)
to_chat(user, "<span class='warning'>The [src.name] needs to be wrenched to the floor!</span>")
return
if(1)
if (WT.remove_fuel(0,user))
@@ -139,7 +134,6 @@ field_generator power level display
if(!src || !WT.isOn()) return
state = 2
to_chat(user, "<span class='notice'>You weld the field generator to the floor.</span>")
else
return
if(2)
@@ -152,7 +146,6 @@ field_generator power level display
if(!src || !WT.isOn()) return
state = 1
to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
else
return
else
code/modules/power/singularity/narsie.dm
-7
View File
@@ -25,10 +25,8 @@
/obj/singularity/narsie/large/New()
..()
to_chat(world, "<font size='15' color='red'><b>NAR-SIE HAS RISEN</b></font>")
to_chat(world, pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg')))
var/area/A = get_area(src)
if(A)
notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.")
@@ -41,7 +39,6 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
if(!(src in view()))
to_chat(user, "Your soul is too far away.")
return
makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1)
new /obj/effect/effect/sleep_smoke(user.loc)
@@ -80,7 +77,6 @@
if(M.stat == CONSCIOUS)
if(!iscultist(M))
to_chat(M, "<span class='warning'>You feel your sanity crumble away in an instant as you gaze upon [src.name]...</span>")
M.apply_effect(3, STUN)
@@ -128,15 +124,12 @@
/obj/singularity/narsie/proc/acquire(var/mob/food)
to_chat(target, "<span class='notice'>NAR-SIE HAS LOST INTEREST IN YOU</span>")
target = food
if(ishuman(target))
to_chat(target, "<span class ='userdanger'>NAR-SIE HUNGERS FOR YOUR SOUL</span>")
else
to_chat(target, "<span class ='userdanger'>NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL</span>")
//Wizard narsie
/obj/singularity/narsie/wizard
grav_pull = 0
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
-5
View File
@@ -97,7 +97,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
return 1
@@ -111,7 +110,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -238,7 +236,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
temp_state++
else
to_chat(user, "<span class='warning'>You need one length of cable to wire the [src.name]!</span>")
return
if(2)
if(iswirecutter(O))//TODO:Shock user if its on?
@@ -293,7 +290,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
return 1
@@ -307,7 +303,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
code/modules/power/singularity/particle_accelerator/particle_control.dm
-1
View File
@@ -87,7 +87,6 @@
if(!interface_control)
to_chat(usr, "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>")
return
if( href_list["close"] )
code/modules/power/singularity/singularity.dm
-1
View File
@@ -391,7 +391,6 @@
var/obj/item/clothing/glasses/meson/MS = H.glasses
if(MS.vision_flags == SEE_TURFS)
to_chat(H, "<span class='notice'>You look directly into the [src.name], good thing you had your protective eyewear on!</span>")
return
M.apply_effect(3, STUN)
code/modules/power/smes.dm
-12
View File
@@ -131,11 +131,9 @@
terminal = term
terminal.master = src
to_chat(user, "<span class='notice'>Terminal found.</span>")
break
if(!terminal)
to_chat(user, "<span class='alert'>No power source found.</span>")
return
stat &= ~BROKEN
update_icon()
@@ -153,24 +151,20 @@
if(terminal) //is there already a terminal ?
to_chat(user, "<span class='alert'>This SMES already has a power terminal!</span>")
return
if(!panel_open) //is the panel open ?
to_chat(user, "<span class='alert'>You must open the maintenance panel first!</span>")
return
var/turf/T = get_turf(user)
if (T.intact) //is the floor plating removed ?
to_chat(user, "<span class='alert'>You must first remove the floor plating!</span>")
return
var/obj/item/stack/cable_coil/C = I
if(C.amount < 10)
to_chat(user, "<span class='alert'>You need more wires.</span>")
return
//build the terminal and link it to the network
@@ -183,11 +177,9 @@
var/turf/T = get_turf(terminal)
if (T.intact) //is the floor plating removed ?
to_chat(user, "<span class='alert'>You must first expose the power terminal!</span>")
return
to_chat(user, "<span class='notice'>You begin to dismantle the power terminal...</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50, target = src))
@@ -311,7 +303,6 @@
/obj/machinery/power/smes/proc/make_terminal(const/mob/user)
if (user.loc == loc)
to_chat(user, "<span class='warning'>You must not be on the same tile as the [src].</span>")
return 1
//Direction the terminal will face to
@@ -324,15 +315,12 @@
var/turf/tempLoc = get_step(src, reverse_direction(tempDir))
if (istype(tempLoc, /turf/space))
to_chat(user, "<span class='warning'>You can't build a terminal on space.</span>")
return 1
else if (istype(tempLoc))
if(tempLoc.intact)
to_chat(user, "<span class='warning'>You must remove the floor plating first.</span>")
return 1
to_chat(user, "<span class='notice'>You start adding cable to the [src].</span>")
if(do_after(user, 50, target = src))
var/turf/T = get_turf(user)
var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one
code/modules/power/solar.dm
-3
View File
@@ -248,7 +248,6 @@
new /obj/machinery/power/solar(get_turf(src), src)
else
to_chat(user, "<span class='warning'>You need two sheets of glass to put them into a solar panel.</span>")
return
return 1
@@ -420,7 +419,6 @@
if(do_after(user, 20, target = src))
if (src.stat & BROKEN)
to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
@@ -433,7 +431,6 @@
qdel(src)
else
to_chat(user, "<span class='notice'>You disconnect the monitor.</span>")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
for (var/obj/C in src)
code/modules/power/supermatter/sm_shard.dm
-2
View File
@@ -45,7 +45,6 @@
if(ismob(AM))
var/mob/M = AM
to_chat(M, "\red <B>You step on \the [src]!</B>")
playsound(src.loc, 'sound/effects/glass_step_sm.ogg', 70, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -68,7 +67,6 @@
/obj/item/weapon/shard/supermatter/attack_hand(var/mob/user)
if(!istype(user,/mob/living/carbon/human/nucleation))
to_chat(user, pick( "\red You think twice before touching that without protection.",)
"\red You don't want to touch that without some protection.",
"\red You probably should get something else to pick that up.",
"\red You aren't sure that's a good idea.",
code/modules/power/supermatter/supermatter.dm
-2
View File
@@ -226,9 +226,7 @@
for(var/mob/M in mob_list)
to_chat(M, 'sound/effects/supermatter.ogg')//everyone goan know bout this
to_chat(M, "<span class='boldannounce'>A horrible screeching fills your ears, and a wave of dread washes over you...</span>")
qdel(src)
return(gain)
code/modules/power/switch.dm
-4
View File
@@ -25,21 +25,17 @@
..(user)
if(on)
to_chat(user, "The switch is in the on position")
else
to_chat(user, "The switch is in the off position")
/obj/structure/powerswitch/attack_ai(mob/user)
to_chat(user, "\red You're an AI. This is a manual switch. It's not going to work.")
return
/obj/structure/powerswitch/attack_hand(mob/user)
if(busy)
to_chat(user, "\red This switch is already being toggled.")
return
..()
code/modules/power/tesla/energy_ball.dm
-1
View File
@@ -59,7 +59,6 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
to_chat(user, "The amount of orbiting mini-balls is [orbiting_balls.len].")
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
for(var/i = 0, i < move_amount, i++)
var/move_dir = pick(alldirs)
code/modules/power/treadmill.dm
-1
View File
@@ -170,7 +170,6 @@
..()
to_chat(user, "The display reads:<div style='text-align: center'>[line1]<br>[line2]</div>")
/obj/machinery/treadmill_monitor/update_icon()
overlays.Cut()
if(stat & NOPOWER || !total_joules || !on)
code/modules/power/turbine.dm
-4
View File
@@ -121,11 +121,9 @@
locate_machinery()
if(turbine)
to_chat(user, "<span class='notice'>Turbine connected.</span>")
stat &= ~BROKEN
else
to_chat(user, "<span class='alert'>Turbine not connected.</span>")
stat |= BROKEN
return
@@ -282,11 +280,9 @@
locate_machinery()
if(compressor)
to_chat(user, "<span class='notice'>Compressor connected.</span>")
stat &= ~BROKEN
else
to_chat(user, "<span class='alert'>Compressor not connected.</span>")
stat |= BROKEN
return