Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks * Includes a blob_allowed check
This commit is contained in:
committed by
CitadelStationBot
parent
06061f0870
commit
f9436e53c4
@@ -450,7 +450,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
|
|||||||
if(!L.client.played)
|
if(!L.client.played)
|
||||||
SEND_SOUND(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = CHANNEL_AMBIENCE))
|
SEND_SOUND(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = CHANNEL_AMBIENCE))
|
||||||
L.client.played = TRUE
|
L.client.played = TRUE
|
||||||
addtimer(CALLBACK(L.client, /client/proc/ResetAmbiencePlayed), 600)
|
addtimer(CALLBACK(L.client, /client/proc/ResetAmbiencePlayed), 600)
|
||||||
|
|
||||||
/client/proc/ResetAmbiencePlayed()
|
/client/proc/ResetAmbiencePlayed()
|
||||||
played = FALSE
|
played = FALSE
|
||||||
|
|||||||
@@ -31,8 +31,5 @@
|
|||||||
if(cell && (cell.charge / cell.maxcharge > COG_MAX_SIPHON_THRESHOLD))
|
if(cell && (cell.charge / cell.maxcharge > COG_MAX_SIPHON_THRESHOLD))
|
||||||
cell.use(1)
|
cell.use(1)
|
||||||
adjust_clockwork_power(1) //Power is shared, so only do it once; this runs very quickly so it's about 1W/second
|
adjust_clockwork_power(1) //Power is shared, so only do it once; this runs very quickly so it's about 1W/second
|
||||||
if(prob(1))
|
|
||||||
playsound(apc, 'sound/machines/clockcult/steam_whoosh.ogg', 10, TRUE)
|
|
||||||
new/obj/effect/temp_visual/steam(get_turf(apc), pick(GLOB.cardinals))
|
|
||||||
|
|
||||||
#undef COG_MAX_SIPHON_THRESHOLD
|
#undef COG_MAX_SIPHON_THRESHOLD
|
||||||
|
|||||||
@@ -231,6 +231,13 @@
|
|||||||
quickbind = TRUE
|
quickbind = TRUE
|
||||||
quickbind_desc = "Creates a stargazer, which generates power when near starlight."
|
quickbind_desc = "Creates a stargazer, which generates power when near starlight."
|
||||||
|
|
||||||
|
/datum/clockwork_scripture/create_object/stargazer/check_special_requirements()
|
||||||
|
var/area/A = get_area(invoker)
|
||||||
|
if(A.outdoors || A.map_name == "Space" || !A.blob_allowed)
|
||||||
|
to_chat(invoker, "<span class='danger'>Stargazers can't be built off-station.</span>")
|
||||||
|
return
|
||||||
|
return TRUE
|
||||||
|
|
||||||
|
|
||||||
//Integration Cog: Creates an integration cog that can be inserted into APCs to passively siphon power.
|
//Integration Cog: Creates an integration cog that can be inserted into APCs to passively siphon power.
|
||||||
/datum/clockwork_scripture/create_object/integration_cog
|
/datum/clockwork_scripture/create_object/integration_cog
|
||||||
|
|||||||
@@ -50,6 +50,10 @@
|
|||||||
if(isspaceturf(T))
|
if(isspaceturf(T))
|
||||||
has_starlight = TRUE
|
has_starlight = TRUE
|
||||||
break
|
break
|
||||||
|
if(has_starlight && anchored)
|
||||||
|
var/area/A = get_area(src)
|
||||||
|
if(A.outdoors || A.map_name == "Space" || !A.blob_allowed)
|
||||||
|
has_starlight = FALSE
|
||||||
if(old_status != has_starlight)
|
if(old_status != has_starlight)
|
||||||
if(has_starlight)
|
if(has_starlight)
|
||||||
visible_message("<span class='nzcrentr_small'>[src] hums and shines brilliantly!</span>")
|
visible_message("<span class='nzcrentr_small'>[src] hums and shines brilliantly!</span>")
|
||||||
|
|||||||
Reference in New Issue
Block a user