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

Part 2

Browse Source
This commit is contained in:
Ghommie
2019-11-19 18:00:56 +01:00
parent a52e292cc8
commit dd101ef221
113 changed files with 519 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/power/apc.dm
View File

@@ -243,33 +243,33 @@
addtimer(CALLBACK(src, .proc/update), 5)
/obj/machinery/power/apc/examine(mob/user)
..()
. = ..()
if(stat & BROKEN)
return
if(opened)
if(has_electronics && terminal)
to_chat(user, "The cover is [opened==APC_COVER_REMOVED?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
. += "The cover is [opened==APC_COVER_REMOVED?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"]."
else
to_chat(user, "It's [ !terminal ? "not" : "" ] wired up.")
to_chat(user, "The electronics are[!has_electronics?"n't":""] installed.")
. += "It's [ !terminal ? "not" : "" ] wired up."
. += "The electronics are[!has_electronics?"n't":""] installed."
if(user.Adjacent(src) && integration_cog)
to_chat(user, "<span class='warning'>[src]'s innards have been replaced by strange brass machinery!</span>")
. += "<span class='warning'>[src]'s innards have been replaced by strange brass machinery!</span>"
else
if (stat & MAINT)
to_chat(user, "The cover is closed. Something is wrong with it. It doesn't work.")
. += "The cover is closed. Something is 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.")
. += "The cover is broken. It may be hard to force it open."
else
to_chat(user, "The cover is closed.")
. += "The cover is closed."
if(integration_cog && is_servant_of_ratvar(user))
to_chat(user, "<span class='brass'>There is an integration cog installed!</span>")
. += "<span class='brass'>There is an integration cog installed!</span>"
to_chat(user, "<span class='notice'>Alt-Click the APC to [ locked ? "unlock" : "lock"] the interface.</span>")
. += "<span class='notice'>Alt-Click the APC to [ locked ? "unlock" : "lock"] the interface.</span>"
if(issilicon(user))
to_chat(user, "<span class='notice'>Ctrl-Click the APC to switch the breaker [ operating ? "off" : "on"].</span>")
. += "<span class='notice'>Ctrl-Click the APC to switch the breaker [ operating ? "off" : "on"].</span>"
// update the APC icon to show the three base states
// also add overlays for indicator lights

6
code/modules/power/cell.dm
View File

@@ -94,11 +94,11 @@
return power_used
/obj/item/stock_parts/cell/examine(mob/user)
..()
. = ..()
if(rigged)
to_chat(user, "<span class='danger'>This power cell seems to be faulty!</span>")
. += "<span class='danger'>This power cell seems to be faulty!</span>"
else
to_chat(user, "The charge meter reads [round(src.percent() )]%.")
. += "The charge meter reads [round(src.percent() )]%."
/obj/item/stock_parts/cell/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")

27
code/modules/power/lighting.dm
View File

@@ -66,22 +66,21 @@
return cell
/obj/structure/light_construct/examine(mob/user)
..()
. = ..()
switch(src.stage)
if(1)
to_chat(user, "It's an empty frame.")
. += "It's an empty frame."
if(2)
to_chat(user, "It's wired.")
. += "It's wired."
if(3)
to_chat(user, "The casing is closed.")
. += "The casing is closed."
if(cell_connectors)
if(cell)
to_chat(user, "You see [cell] inside the casing.")
. += "You see [cell] inside the casing."
else
to_chat(user, "The casing has no power cell for backup power.")
. += "The casing has no power cell for backup power."
else
to_chat(user, "<span class='danger'>This casing doesn't support power cells for backup power.</span>")
return
. += "<span class='danger'>This casing doesn't support power cells for backup power.</span>"
/obj/structure/light_construct/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
@@ -393,18 +392,18 @@
// examine verb
/obj/machinery/light/examine(mob/user)
..()
. = ..()
switch(status)
if(LIGHT_OK)
to_chat(user, "It is turned [on? "on" : "off"].")
. += "It is turned [on? "on" : "off"]."
if(LIGHT_EMPTY)
to_chat(user, "The [fitting] has been removed.")
. += "The [fitting] has been removed."
if(LIGHT_BURNED)
to_chat(user, "The [fitting] is burnt out.")
. += "The [fitting] is burnt out."
if(LIGHT_BROKEN)
to_chat(user, "The [fitting] has been smashed.")
. += "The [fitting] has been smashed."
if(cell)
to_chat(user, "Its backup power charge meter reads [round((cell.charge / cell.maxcharge) * 100, 0.1)]%.")
. += "Its backup power charge meter reads [round((cell.charge / cell.maxcharge) * 100, 0.1)]%."

4
code/modules/power/monitor.dm
View File

@@ -27,8 +27,8 @@
is_secret_monitor = TRUE
/obj/machinery/computer/monitor/secret/examine(mob/user)
..()
to_chat(user, "<span class='notice'>It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.</span>")
. = ..()
. += "<span class='notice'>It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.</span>"
/obj/machinery/computer/monitor/Initialize()
. = ..()

10
code/modules/power/port_gen.dm
View File

@@ -56,8 +56,8 @@
soundloop.stop()
/obj/machinery/power/port_gen/examine(mob/user)
..()
to_chat(user, "It is[!active?"n't":""] running.")
. = ..()
. += "It is[!active?"n't":""] running."
/obj/machinery/power/port_gen/pacman
name = "\improper P.A.C.M.A.N.-type portable generator"
@@ -99,10 +99,10 @@
consumption = consumption_coeff
/obj/machinery/power/port_gen/pacman/examine(mob/user)
..()
to_chat(user, "<span class='notice'>The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle.</span>")
. = ..()
. += "<span class='notice'>The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle.</span>"
if(crit_fail)
to_chat(user, "<span class='danger'>The generator seems to have broken down.</span>")
. += "<span class='danger'>The generator seems to have broken down.</span>"
/obj/machinery/power/port_gen/pacman/HasFuel()
if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left)

8
code/modules/power/singularity/collector.dm
View File

@@ -171,14 +171,14 @@
. = ..()
if(active)
if(!bitcoinmining)
to_chat(user, "<span class='notice'>[src]'s display states that it has stored <b>[DisplayPower(stored_power)]</b>, and is processing <b>[DisplayPower((RAD_COLLECTOR_OUTPUT)*((60 SECONDS)/SSmachines.wait))]</b> per minute. <br>The <b>plasma</b> within it's tank is being irradiated into <b>tritium</b>.</span>")
. += "<span class='notice'>[src]'s display states that it has stored <b>[DisplayPower(stored_power)]</b>, and is processing <b>[DisplayPower((RAD_COLLECTOR_OUTPUT)*((60 SECONDS)/SSmachines.wait))]</b> per minute. <br>The <b>plasma</b> within it's tank is being irradiated into <b>tritium</b>.</span>"
else
to_chat(user, "<span class='notice'>[src]'s display states that it's producing a total of <b>[(last_push*RAD_COLLECTOR_MINING_CONVERSION_RATE)*((60 SECONDS)/SSmachines.wait)]</b> research points per minute. <br>The <b>tritium</b> and <b>oxygen</b> within it's tank is being combusted into <b>carbon dioxide</b>.</span>")
. += "<span class='notice'>[src]'s display states that it's producing a total of <b>[(last_push*RAD_COLLECTOR_MINING_CONVERSION_RATE)*((60 SECONDS)/SSmachines.wait)]</b> research points per minute. <br>The <b>tritium</b> and <b>oxygen</b> within it's tank is being combusted into <b>carbon dioxide</b>.</span>"
else
if(!bitcoinmining)
to_chat(user,"<span class='notice'><b>[src]'s display displays the words:</b> \"Power production mode. Please insert <b>Plasma</b>. Use a multitool to change production modes.\"</span>")
. += "<span class='notice'><b>[src]'s display displays the words:</b> \"Power production mode. Please insert <b>Plasma</b>. Use a multitool to change production modes.\"</span>"
else
to_chat(user,"<span class='notice'><b>[src]'s display displays the words:</b> \"Research point production mode. Please insert <b>Tritium</b> and <b>Oxygen</b>. Use a multitool to change production modes.\"</span>")
. += "<span class='notice'><b>[src]'s display displays the words:</b> \"Research point production mode. Please insert <b>Tritium</b> and <b>Oxygen</b>. Use a multitool to change production modes.\"</span>"
/obj/machinery/power/rad_collector/obj_break(damage_flag)
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))

9
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
View File

@@ -36,15 +36,14 @@
var/strength = null
/obj/structure/particle_accelerator/examine(mob/user)
..()
. = ..()
switch(construction_state)
if(PA_CONSTRUCTION_UNSECURED)
to_chat(user, "Looks like it's not attached to the flooring.")
. += "Looks like it's not attached to the flooring."
if(PA_CONSTRUCTION_UNWIRED)
to_chat(user, "It is missing some cables.")
. += "It is missing some cables."
if(PA_CONSTRUCTION_PANEL_OPEN)
to_chat(user, "The panel is open.")
. += "The panel is open."
/obj/structure/particle_accelerator/Destroy()
construction_state = PA_CONSTRUCTION_UNSECURED

8
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -257,14 +257,14 @@
popup.open()
/obj/machinery/particle_accelerator/control_box/examine(mob/user)
..()
. = ..()
switch(construction_state)
if(PA_CONSTRUCTION_UNSECURED)
to_chat(user, "Looks like it's not attached to the flooring.")
. += "Looks like it's not attached to the flooring."
if(PA_CONSTRUCTION_UNWIRED)
to_chat(user, "It is missing some cables.")
. += "It is missing some cables."
if(PA_CONSTRUCTION_PANEL_OPEN)
to_chat(user, "The panel is open.")
. += "The panel is open."
/obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user, params)

4
code/modules/power/smes.dm
View File

@@ -39,9 +39,9 @@
var/obj/machinery/power/terminal/terminal = null
/obj/machinery/power/smes/examine(user)
..()
. = ..()
if(!terminal)
to_chat(user, "<span class='warning'>This SMES has no power terminal!</span>")
. += "<span class='warning'>This SMES has no power terminal!</span>"
/obj/machinery/power/smes/Initialize()
. = ..()

16
code/modules/power/supermatter/supermatter.dm
View File

@@ -187,17 +187,11 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
return ..()
/obj/machinery/power/supermatter_crystal/examine(mob/user)
..()
if(!ishuman(user))
return
var/range = HALLUCINATION_RANGE(power)
for(var/mob/living/carbon/human/H in viewers(range, src))
if(H != user)
continue
if(!istype(H.glasses, /obj/item/clothing/glasses/meson))
to_chat(H, "<span class='danger'>You get headaches just from looking at it.</span>")
return
. = ..()
if (iscarbon(user))
var/mob/living/carbon/C = user
if (!istype(C.glasses, /obj/item/clothing/glasses/meson) && (get_dist(user, src) < HALLUCINATION_RANGE(power)))
. += "<span class='danger'>You get headaches just from looking at it.</span>"
/obj/machinery/power/supermatter_crystal/proc/get_status()
var/turf/T = get_turf(src)

4
code/modules/power/tesla/energy_ball.dm
View File

@@ -71,9 +71,9 @@
energy = 0 // ensure we dont have miniballs of miniballs
/obj/singularity/energy_ball/examine(mob/user)
..()
. = ..()
if(orbiting_balls.len)
to_chat(user, "The amount of orbiting mini-balls is [orbiting_balls.len].")
. += "The amount of orbiting mini-balls is [orbiting_balls.len]."
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)