cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various weather and firework related cleanup and adjustments

Browse Source
This commit is contained in:
Heroman
2023-03-16 17:07:56 +10:00
parent 7b85dc1c11
commit fbf6bf41c2
9 changed files with 208 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/fireworks/firework_launcher.dm
+7 -7
View File
@@ -51,7 +51,7 @@
return
if(user.unEquip(O, 0, src))
loaded_star = O
to_chat(user, "<span class='notice'>You insert the firework star into the launcher.</span>")
to_chat(user, "<span class='notice'>You insert the firework star into \the [src].</span>")
add_fingerprint(user)
update_icon()
return
@@ -67,7 +67,7 @@
if(!user || user.stat != 0)
return
if(!loaded_star)
to_chat(user, "<span class='notice'>There is no firework star loaded in the launcher.</span>")
to_chat(user, "<span class='notice'>There is no firework star loaded in \the [src].</span>")
return
else
loaded_star.forceMove(get_turf(src))
@@ -81,25 +81,25 @@
return
if(!loaded_star)
to_chat(user, "<span class='notice'>There is no firework star loaded in the launcher.</span>")
to_chat(user, "<span class='notice'>There is no firework star loaded in \the [src].</span>")
return
if((world.time - last_launch) <= launch_cooldown)
to_chat(user, "<span class='notice'>The launcher is still re-priming for launch.</span>")
to_chat(user, "<span class='notice'>\The [src] is still re-priming for launch.</span>")
return
if(!anchored)
to_chat(user, "<span class='warning'>Launcher must be firmly secured to the ground before firework can be launched!</span>")
to_chat(user, "<span class='warning'>\The [src] must be firmly secured to the ground before firework can be launched!</span>")
return
var/datum/planet/P = get_planet()
if(!P || !(P.weather_holder)) // There are potential cases of being outside but not on planet. And checking whether planet has weather at all is more sanity thing than anything.
to_chat(user, "<span class='warning'>Launcher beeps as its safeties seem to prevent launch in the current location.</span>")
to_chat(user, "<span class='warning'>\The [src] beeps as its safeties seem to prevent launch in the current location.</span>")
return
var/datum/weather_holder/WH = P.weather_holder
if(WH.firework_override && istype(loaded_star, /obj/item/weapon/firework_star/weather)) // Enable weather-based events to not be ruined
to_chat(user, "<span class='warning'>Launcher beeps as it seems some interference is preventing launch of this type of firework.</span>")
to_chat(user, "<span class='warning'>\The [src] beeps as it seems some interference is preventing launch of this type of firework.</span>")
return
to_chat(user, "<span class='notice'>You launch the firework!</span>")
code/modules/fireworks/firework_stars.dm
+9 -3
View File
@@ -24,9 +24,10 @@
if(w_holder.firework_override) // Make sure weather-based events can't be interfered with
return
if(weather_type && (weather_type in w_holder.allowed_weather_types))
w_holder.message_all_outdoor_players("Something seems to flash in the sky, as weather suddenly shifts!")
w_holder.change_weather(weather_type)
w_holder.rebuild_forecast()
w_holder.message_all_outdoor_players("Something seems to flash in the sky, as weather starts to rapidly shift!")
w_holder.queue_imminent_weather(weather_type)
var/datum/weather/our_weather = w_holder.allowed_weather_types[weather_type]
w_holder.message_all_outdoor_players(our_weather.imminent_transition_message)
/obj/item/weapon/firework_star/weather/clear
name = T_FIREWORK_WEATHER_STAR("CLEAR SKY")
@@ -38,6 +39,11 @@
weather_type = WEATHER_OVERCAST
icon_state = "cloudy"
/obj/item/weapon/firework_star/weather/fog
name = T_FIREWORK_WEATHER_STAR("FOG")
weather_type = WEATHER_FOG
icon_state = "cloudy"
/obj/item/weapon/firework_star/weather/rain
name = T_FIREWORK_WEATHER_STAR("RAIN")
weather_type = WEATHER_RAIN