mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 22:42:26 +01:00
Updates subsystem definitions to new standards. (#17470)
* My heart is dragging me down into... ...oblivion! * drifting closer to the edge but she won't have me * ever round me we are dead before we meet her * for the last time * wake up in sweat * n * fff * uff --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -1127,7 +1127,7 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
SPAN_WARNING("[M] ties \the [src] over their neck!"),\
|
||||
SPAN_WARNING("You tie \the [src] over your neck!"))
|
||||
playsound(user.loc, 'sound/effects/noosed.ogg', 50, 1, -1)
|
||||
SSfeedback.IncrementSimpleStat("hangings")
|
||||
SSstatistics.IncrementSimpleStat("hangings")
|
||||
return TRUE
|
||||
else
|
||||
M.visible_message(\
|
||||
@@ -1140,7 +1140,7 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
SPAN_DANGER("[user] ties \the [src] over [M]'s neck!"),\
|
||||
SPAN_DANGER("[user] ties \the [src] over your neck!"))
|
||||
playsound(user.loc, 'sound/effects/noosed.ogg', 50, 1, -1)
|
||||
SSfeedback.IncrementSimpleStat("hangings")
|
||||
SSstatistics.IncrementSimpleStat("hangings")
|
||||
return TRUE
|
||||
else
|
||||
user.visible_message(\
|
||||
|
||||
+12
-12
@@ -101,14 +101,14 @@
|
||||
|
||||
//calculates the fraction of the sunlight that the panel receives
|
||||
/obj/machinery/power/solar/proc/update_solar_exposure()
|
||||
if(!sun)
|
||||
if(!SSsun)
|
||||
return
|
||||
if(obscured)
|
||||
sunfrac = 0
|
||||
return
|
||||
|
||||
//find the smaller angle between the direction the panel is facing and the direction of the sun (the sign is not important here)
|
||||
var/p_angle = min(abs(adir - sun.angle), 360 - abs(adir - sun.angle))
|
||||
var/p_angle = min(abs(adir - SSsun.angle), 360 - abs(adir - SSsun.angle))
|
||||
|
||||
if(p_angle > 90) // if facing more than 90deg from sun, zero output
|
||||
sunfrac = 0
|
||||
@@ -118,7 +118,7 @@
|
||||
//isn't the power received from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ?
|
||||
|
||||
/obj/machinery/power/solar/process()
|
||||
if(stat & BROKEN || !control || !sun)
|
||||
if(stat & BROKEN || !control || !SSsun)
|
||||
return PROCESS_KILL
|
||||
|
||||
if(powernet && powernet == control.powernet)
|
||||
@@ -174,8 +174,8 @@
|
||||
var/turf/T = null
|
||||
|
||||
for(var/i = 1 to 20) // 20 steps is enough
|
||||
ax += sun.dx // do step
|
||||
ay += sun.dy
|
||||
ax += SSsun.dx // do step
|
||||
ay += SSsun.dy
|
||||
|
||||
T = locate( round(ax,0.5),round(ay,0.5),z)
|
||||
|
||||
@@ -299,12 +299,12 @@
|
||||
|
||||
/obj/machinery/power/solar_control/disconnect_from_network()
|
||||
..()
|
||||
sun.solars -= src
|
||||
SSsun.solars -= src
|
||||
|
||||
/obj/machinery/power/solar_control/connect_to_network()
|
||||
var/to_return = ..()
|
||||
if(powernet) //if connected and not already in solar_list...
|
||||
sun.solars |= src //... add it
|
||||
SSsun.solars |= src //... add it
|
||||
return to_return
|
||||
|
||||
//search for unconnected panels and trackers in the computer powernet and connect them
|
||||
@@ -334,7 +334,7 @@
|
||||
cdir = targetdir //...the current direction is the targetted one (and rotates panels to it)
|
||||
if(2) // auto-tracking
|
||||
if(connected_tracker)
|
||||
connected_tracker.modify_angle(sun.angle)
|
||||
connected_tracker.modify_angle(SSsun.angle)
|
||||
|
||||
set_panels(cdir)
|
||||
updateDialog()
|
||||
@@ -352,7 +352,7 @@
|
||||
/obj/machinery/power/solar_control/interact(mob/user)
|
||||
|
||||
var/t = "<B><span class='highlight'>Generated power</span></B> : [round(lastgen)] W<BR>"
|
||||
t += "<B><span class='highlight'>Star Orientation</span></B>: [sun.angle]° ([angle2text(sun.angle)])<BR>"
|
||||
t += "<B><span class='highlight'>Star Orientation</span></B>: [SSsun.angle]° ([angle2text(SSsun.angle)])<BR>"
|
||||
t += "<B><span class='highlight'>Array Orientation</span></B>: [rate_control(src,"cdir","[cdir]°",1,15)] ([angle2text(cdir)])<BR>"
|
||||
t += "<B><span class='highlight'>Tracking:</span></B><div class='statusDisplay'>"
|
||||
switch(track)
|
||||
@@ -454,7 +454,7 @@
|
||||
track = text2num(href_list["track"])
|
||||
if(track == 2)
|
||||
if(connected_tracker)
|
||||
connected_tracker.modify_angle(sun.angle)
|
||||
connected_tracker.modify_angle(SSsun.angle)
|
||||
set_panels(cdir)
|
||||
else if (track == 1) //begin manual tracking
|
||||
src.targetdir = src.cdir
|
||||
@@ -464,7 +464,7 @@
|
||||
if(href_list["search_connected"])
|
||||
src.search_for_connected()
|
||||
if(connected_tracker && track == 2)
|
||||
connected_tracker.modify_angle(sun.angle)
|
||||
connected_tracker.modify_angle(SSsun.angle)
|
||||
src.set_panels(cdir)
|
||||
|
||||
interact(usr)
|
||||
@@ -522,7 +522,7 @@
|
||||
/obj/machinery/power/solar_control/autostart/proc/do_solars()
|
||||
search_for_connected()
|
||||
if(connected_tracker && track == 2)
|
||||
connected_tracker.modify_angle(sun.angle)
|
||||
connected_tracker.modify_angle(SSsun.angle)
|
||||
set_panels(cdir)
|
||||
|
||||
/obj/machinery/power/solar_control/update_icon()
|
||||
|
||||
Reference in New Issue
Block a user