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

hey ghom i fixed it i think

Browse Source
This commit is contained in:
Hatterhat
2020-01-18 23:35:52 -06:00
parent 9aedc62ddb
commit 590d71ddc1
34 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cell_charger.dm
+1 -1
View File
@@ -29,7 +29,7 @@
if(charging)
. += "Current charge: [round(charging.percent(), 1)]%."
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Charge rate at <b>[charge_rate]J</b> per cycle.<span>")
. += "<span class='notice'>The status display reads: Charge rate at <b>[charge_rate]J</b> per cycle.</span>"
/obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell) && !panel_open)
code/game/machinery/cloning.dm
+1 -1
View File
@@ -106,7 +106,7 @@
if(mess)
. += "It's filled with blood and viscera. You swear you can see it moving..."
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Speed <b>[speed_coeff*50]%</b>.<br>Predicted amount of cellular damage: <b>[100-heal_level]%</b>.<span>")
. += "<span class='notice'>The status display reads: Cloning speed at <b>[speed_coeff*50]%</b>.<br>Predicted amount of cellular damage: <b>[100-heal_level]%</b>.</span>"
if(efficiency > 5)
to_chat(user, "<span class='notice'>Pod has been upgraded to support autoprocessing.<span>")
if(is_operational() && mob_occupant)
code/game/machinery/dna_scanner.dm
+3 -3
View File
@@ -28,11 +28,11 @@
damage_coeff = P.rating
/obj/machinery/dna_scannernew/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Radiation pulse accuracy increased by factor <b>[precision_coeff**2]</b>.<br>Radiation pulse damage decreased by factor <b>[damage_coeff**2]</b>.<span>")
. += "<span class='notice'>The status display reads: Radiation pulse accuracy increased by factor <b>[precision_coeff**2]</b>.<br>Radiation pulse damage decreased by factor <b>[damage_coeff**2]</b>.</span>"
if(scan_level >= 3)
to_chat(user, "<span class='notice'>Scanner has been upgraded to support autoprocessing.<span>")
. += "<span class='notice'>Scanner has been upgraded to support autoprocessing.<span>"
/obj/machinery/dna_scannernew/update_icon()
code/game/machinery/doors/firedoor.dm
+1 -1
View File
@@ -32,7 +32,7 @@
CalculateAffectingAreas()
/obj/machinery/door/firedoor/examine(mob/user)
..()
. = ..()
if(!density)
. += "<span class='notice'>It is open, but could be <b>pried</b> closed.</span>"
else if(!welded)
code/game/machinery/harvester.dm
+1 -1
View File
@@ -193,4 +193,4 @@
else if(!harvesting)
. += "<span class='notice'>Alt-click [src] to start harvesting.</span>"
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Harvest speed at <b>[interval*0.1]</b> seconds per organ.<span>")
. += "<span class='notice'>The status display reads: Harvest speed at <b>[interval*0.1]</b> seconds per organ.<span>"
code/game/machinery/hologram.dm
+2 -2
View File
@@ -144,9 +144,9 @@ GLOBAL_LIST_EMPTY(network_holopads)
holo_range = holograph_range
/obj/machinery/holopad/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Current projection range: <b>[holo_range]</b> units.<span>")
. += "<span class='notice'>The status display reads: Current projection range: <b>[holo_range]</b> units.</span>"
/obj/machinery/holopad/attackby(obj/item/P, mob/user, params)
if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P))
code/game/machinery/launch_pad.dm
+2 -2
View File
@@ -24,9 +24,9 @@
range = E
/obj/machinery/launchpad/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Maximum range: <b>[range]</b> units.<span>")
. += "<span class='notice'>The status display reads: Maximum range: <b>[range]</b> units.</span>"
/obj/machinery/launchpad/attackby(obj/item/I, mob/user, params)
if(stationary)
code/game/machinery/limbgrower.dm
+2 -2
View File
@@ -159,9 +159,9 @@
prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4
/obj/machinery/limbgrower/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Storing up to <b>[reagents.maximum_volume]u</b> of synthflesh.<br>Synthflesh consumption at <b>[prod_coeff*100]%</b>.<span>")
. += "<span class='notice'>The status display reads: Storing up to <b>[reagents.maximum_volume]u</b> of synthflesh.<br>Synthflesh consumption at <b>[prod_coeff*100]%</b>.<span>"
/obj/machinery/limbgrower/proc/main_win(mob/user)
var/dat = "<div class='statusDisplay'><h3>Limb Grower Menu:</h3><br>"
code/game/machinery/recharger.dm
+15 -3
View File
@@ -24,9 +24,21 @@
recharge_coeff = C.rating
/obj/machinery/recharger/examine(mob/user)
..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Recharging <b>[recharge_coeff*10]%</b> cell charge per cycle.<span>")
. = ..()
if(!in_range(user, src) && !issilicon(user) && !isobserver(user))
. += "<span class='warning'>You're too far away to examine [src]'s contents and display!</span>"
return
if(charging)
. += {"<span class='notice'>\The [src] contains:</span>
<span class='notice'>- \A [charging].</span>"}
if(!(stat & (NOPOWER|BROKEN)))
. += "<span class='notice'>The status display reads:</span>"
. += "<span class='notice'>- Recharging <b>[recharge_coeff*10]%</b> cell charge per cycle.</span>"
if(charging)
var/obj/item/stock_parts/cell/C = charging.get_cell()
. += "<span class='notice'>- \The [charging]'s cell is at <b>[C.percent()]%</b>.</span>"
/obj/machinery/recharger/proc/setCharging(new_charging)
charging = new_charging
code/game/machinery/rechargestation.dm
+2 -2
View File
@@ -51,9 +51,9 @@
recharge_speed *= C.maxcharge / 10000
/obj/machinery/recharge_station/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Recharging <b>[recharge_speed]J</b> per cycle.<span>")
. += "<span class='notice'>The status display reads: Recharging <b>[recharge_speed]J</b> per cycle.</span>"
if(repairs)
to_chat(user, "<span class='notice'>[src] has been upgraded to support automatic repairs.<span>")
code/game/machinery/spaceheater.dm
+1 -1
View File
@@ -53,7 +53,7 @@
else
. += "There is no power cell installed."
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Temperature range at <b>[settableTemperatureRange]°C</b>.<br>Heating power at <b>[heatingPower*0.001]kJ</b>.<br>Power consumption at <b>[(efficiency*-0.0025)+150]%</b>.<span>") //100%, 75%, 50%, 25%
. += "<span class='notice'>The status display reads: Temperature range at <b>[settableTemperatureRange]°C</b>.<br>Heating power at <b>[heatingPower*0.001]kJ</b>.<br>Power consumption at <b>[(efficiency*-0.0025)+150]%</b>.<span>" //100%, 75%, 50%, 25%
/obj/machinery/space_heater/update_icon()
if(on)
code/game/machinery/teleporter.dm
+6 -6
View File
@@ -32,9 +32,9 @@
accuracy = A
/obj/machinery/teleport/hub/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Probability of malfunction decreased by <b>[(accuracy*25)-25]%</b>.<span>")
. += "<span class='notice'>The status display reads: Probability of malfunction decreased by <b>[(accuracy*25)-25]%</b>.</span>"
/obj/machinery/teleport/hub/proc/link_power_station()
if(power_station)
@@ -131,13 +131,13 @@
efficiency = E - 1
/obj/machinery/teleport/station/examine(mob/user)
..()
. = ..()
if(!panel_open)
to_chat(user, "<span class='notice'>The panel is <i>screwed</i> in, obstructing the linking device and wiring panel.</span>")
. += "<span class='notice'>The panel is <i>screwed</i> in, obstructing the linking device and wiring panel.</span>"
else
to_chat(user, "<span class='notice'>The <i>linking</i> device is now able to be <i>scanned</i> with a multitool.<br>The <i>wiring</i> can be <i>connected<i> to a nearby console and hub with a pair of wirecutters.</span>")
. += "<span class='notice'>The <i>linking</i> device is now able to be <i>scanned</i> with a multitool.<br>The <i>wiring</i> can be <i>connected<i> to a nearby console and hub with a pair of wirecutters.</span>"
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: This station can be linked to <b>[efficiency]</b> other station(s).<span>")
. += "<span class='notice'>The status display reads: This station can be linked to <b>[efficiency]</b> other station(s).</span>"
/obj/machinery/teleport/station/proc/link_console_and_hub()
for(var/direction in GLOB.cardinals)
code/game/mecha/mech_bay.dm
+2 -2
View File
@@ -37,9 +37,9 @@
max_charge = MC * 25
/obj/machinery/mech_bay_recharge_port/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Base recharge rate at <b>[max_charge]J</b> per cycle.<span>")
. += "<span class='notice'>The status display reads: Base recharge rate at <b>[max_charge]J</b> per cycle.</span>"
/obj/machinery/mech_bay_recharge_port/process()
if(stat & NOPOWER || !recharge_console)
code/game/mecha/mech_fabricator.dm
+2 -2
View File
@@ -63,10 +63,10 @@
time_coeff = round(initial(time_coeff) - (initial(time_coeff)*(T))/5,0.01)
/obj/machinery/mecha_part_fabricator/examine(mob/user)
..()
. = ..()
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
if(in_range(user, src) || isobserver(user))
to_chat(user, "<span class='notice'>The status display reads: Storing up to <b>[materials.max_amount]</b> material units.<br>Material consumption at <b>[component_coeff*100]%</b>.<br>Build time reduced by <b>[100-time_coeff*100]%</b>.<span>")
. += "<span class='notice'>The status display reads: Storing up to <b>[materials.max_amount]</b> material units.<br>Material consumption at <b>[component_coeff*100]%</b>.<br>Build time reduced by <b>[100-time_coeff*100]%</b>.</span>"
/obj/machinery/mecha_part_fabricator/emag_act()
. = ..()
code/game/objects/items/devices/laserpointer.dm
+3 -3
View File
@@ -57,12 +57,12 @@
return ..()
/obj/item/laser_pointer/examine(mob/user)
..()
. = ..()
if(in_range(user, src) || isobserver(user))
if(!diode)
to_chat(user, "<span class='notice'>The diode is missing.<span>")
. += "<span class='notice'>The diode is missing.<span>"
else
to_chat(user, "<span class='notice'>A class <b>[diode.rating]</b> laser diode is installed. It is <i>screwed</i> in place.<span>")
. += "<span class='notice'>A class <b>[diode.rating]</b> laser diode is installed. It is <i>screwed</i> in place.<span>"
/obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params)
. = ..()