From a1a3a336b9e1f8f8e9b6c1d2ad9c7649f4cc2ab3 Mon Sep 17 00:00:00 2001 From: FluffMedic <109300046+FluffMedic@users.noreply.github.com> Date: Tue, 7 Nov 2023 07:36:08 -0500 Subject: [PATCH] Sif Weather and Temp Part 1 (#7179) --- maps/southern_cross/southern_cross-10.dmm | 8 ++++++-- maps/southern_cross/southern_cross-12.dmm | 6 +++++- maps/southern_cross/southern_cross-13.dmm | 6 +++++- modular_chomp/code/modules/planet/sif.dm | 17 +++++++++++++++++ vorestation.dme | 1 + 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 modular_chomp/code/modules/planet/sif.dm diff --git a/maps/southern_cross/southern_cross-10.dmm b/maps/southern_cross/southern_cross-10.dmm index 59255a5234..4e8755a461 100644 --- a/maps/southern_cross/southern_cross-10.dmm +++ b/maps/southern_cross/southern_cross-10.dmm @@ -557,6 +557,10 @@ }, /turf/simulated/floor/plating, /area/surface/outpost/shelter/utilityroom) +"hX" = ( +/obj/effect/overmap/visitable/planet/Sif, +/turf/simulated/mineral/sif, +/area/surface/outside/wilderness/mountains) "kh" = ( /turf/simulated/wall/solidrock, /area/surface/outside/wilderness/normal) @@ -864,7 +868,7 @@ /obj/machinery/vending/engivend{ desc = "Spare tool vending for the Wilderness Shelter. What? Did you expect some witty description?"; name = "Wild Shelter-Vend"; - products = list(/obj/item/device/geiger = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm,/obj/item/weapon/circuitboard/guestpass,/obj/item/weapon/circuitboard/keycard_auth,/obj/item/weapon/circuitboard/geiger,/obj/item/weapon/circuitboard/photocopier,/obj/item/weapon/circuitboard/fax,/obj/item/weapon/circuitboard/request,/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/washing,/obj/item/weapon/circuitboard/scanner_console,/obj/item/weapon/circuitboard/sleeper_console,/obj/item/weapon/circuitboard/body_scanner,/obj/item/weapon/circuitboard/medical_kiosk,/obj/item/weapon/circuitboard/sleeper,/obj/item/weapon/circuitboard/dna_analyzer); + products = list(/obj/item/device/geiger=4,/obj/item/weapon/cell/high=10,/obj/item/weapon/airlock_electronics=10,/obj/item/weapon/module/power_control=10,/obj/item/weapon/circuitboard/airalarm=10,/obj/item/weapon/circuitboard/firealarm=10,/obj/item/weapon/circuitboard/status_display=2,/obj/item/weapon/circuitboard/ai_status_display=2,/obj/item/weapon/circuitboard/newscaster=2,/obj/item/weapon/circuitboard/holopad=2,/obj/item/weapon/circuitboard/intercom=4,/obj/item/weapon/circuitboard/security/telescreen/entertainment=4,/obj/item/weapon/stock_parts/motor=2,/obj/item/weapon/stock_parts/spring=2,/obj/item/weapon/stock_parts/gear=2,/obj/item/weapon/circuitboard/atm,/obj/item/weapon/circuitboard/guestpass,/obj/item/weapon/circuitboard/keycard_auth,/obj/item/weapon/circuitboard/geiger,/obj/item/weapon/circuitboard/photocopier,/obj/item/weapon/circuitboard/fax,/obj/item/weapon/circuitboard/request,/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/washing,/obj/item/weapon/circuitboard/scanner_console,/obj/item/weapon/circuitboard/sleeper_console,/obj/item/weapon/circuitboard/body_scanner,/obj/item/weapon/circuitboard/medical_kiosk,/obj/item/weapon/circuitboard/sleeper,/obj/item/weapon/circuitboard/dna_analyzer); req_access = null }, /turf/simulated/floor/plating, @@ -1654,7 +1658,7 @@ ac ac ac ac -ac +hX ab "} (3,1,1) = {" diff --git a/maps/southern_cross/southern_cross-12.dmm b/maps/southern_cross/southern_cross-12.dmm index cadc9a1f13..104634c937 100644 --- a/maps/southern_cross/southern_cross-12.dmm +++ b/maps/southern_cross/southern_cross-12.dmm @@ -935,6 +935,10 @@ /obj/structure/flora/smallbould, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"vo" = ( +/obj/effect/overmap/visitable/planet/Sif, +/turf/simulated/mineral/sif, +/area/surface/outside/wilderness/skylands) "vp" = ( /obj/structure/outcrop, /turf/simulated/floor/outdoors/dirt, @@ -2799,7 +2803,7 @@ bj bj bj bj -bj +vo aE "} (3,1,1) = {" diff --git a/maps/southern_cross/southern_cross-13.dmm b/maps/southern_cross/southern_cross-13.dmm index 274b2eb150..b7f02a937a 100644 --- a/maps/southern_cross/southern_cross-13.dmm +++ b/maps/southern_cross/southern_cross-13.dmm @@ -4,6 +4,10 @@ /obj/effect/zone_divider, /turf/simulated/mineral/sif, /area/surface/outside/valley/walls) +"aL" = ( +/obj/effect/overmap/visitable/planet/Sif, +/turf/simulated/mineral/sif, +/area/surface/outside/valley/edge) "bH" = ( /obj/structure/railing, /turf/simulated/floor/water/deep, @@ -772,7 +776,7 @@ FG FG FG FG -FG +aL RW "} (3,1,1) = {" diff --git a/modular_chomp/code/modules/planet/sif.dm b/modular_chomp/code/modules/planet/sif.dm new file mode 100644 index 0000000000..4292ae2886 --- /dev/null +++ b/modular_chomp/code/modules/planet/sif.dm @@ -0,0 +1,17 @@ +/datum/weather/sif/fog + name = "fog" + icon_state = "fog" + wind_high = 1 + wind_low = 0 + light_modifier = 0.7 + + temp_high = T0C // 0c + temp_low = 263.15 // -10c + + transition_chances = list( + WEATHER_FOG = 35, + WEATHER_CLEAR = 35, + WEATHER_OVERCAST = 15, + WEATHER_LIGHT_SNOW = 10, + WEATHER_RAIN = 5 + ) \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 55883cfd73..5326248334 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4799,6 +4799,7 @@ #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_wing.dm" #include "modular_chomp\code\modules\organs\organ_icon.dm" #include "modular_chomp\code\modules\overmap\dynamic_sector.dm" +#include "modular_chomp\code\modules\planet\sif.dm" #include "modular_chomp\code\modules\player_tips\player_tips_list.dm" #include "modular_chomp\code\modules\power\cells\device_cells.dm" #include "modular_chomp\code\modules\power\cells\esoteric_cells.dm"