Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/particle_weathers/datum_types/rain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
maxSeverityChange = 2
severitySteps = 5
immunity_type = TRAIT_RAINSTORM_IMMUNE
probability = 1
probability = 0 // Temporary
target_trait = PARTICLEWEATHER_RAIN

//Makes you a little chilly
Expand All @@ -52,7 +52,7 @@
maxSeverityChange = 50
severitySteps = 50
immunity_type = TRAIT_RAINSTORM_IMMUNE
probability = 1
probability = 0 // Temporary
target_trait = PARTICLEWEATHER_RAIN

//Makes you a bit chilly
Expand Down
10 changes: 8 additions & 2 deletions code/datums/particle_weathers/datum_types/snow_storm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@
maxSeverityChange = 5
severitySteps = 5
immunity_type = TRAIT_SNOWSTORM_IMMUNE
probability = 1
probability = 2
target_trait = PARTICLEWEATHER_SNOW

//Makes you a little chilly
/datum/particle_weather/snow_gentle/weather_act(mob/living/L)
L.adjust_bodytemperature(-rand(1,3))
L.adjust_fire_stacks(-100)
L.SoakMob(FULL_BODY)
wash_atom(L,CLEAN_STRONG)


/datum/particle_weather/snow_storm
Expand All @@ -47,12 +50,15 @@
maxSeverityChange = 50
severitySteps = 50
immunity_type = TRAIT_SNOWSTORM_IMMUNE
probability = 1
probability = 2
target_trait = PARTICLEWEATHER_SNOW

//Makes you a lot little chilly
/datum/particle_weather/snow_storm/weather_act(mob/living/L)
L.adjust_bodytemperature(-rand(5,15))
L.adjust_fire_stacks(-100)
L.SoakMob(FULL_BODY)
wash_atom(L,CLEAN_STRONG)

/turf
var/turf_flags = TURF_EFFECT_AFFECTABLE
Expand Down
21 changes: 17 additions & 4 deletions code/game/objects/structures/roguetown/newtree.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@
var/turf/target = get_step_multiz(src, UP)
if(istype(target, /turf/open/transparent/openspace))
var/obj/structure/flora/newtree/T = new(target)
T.base_state = "center-leaf[rand(1,2)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
T.base_state = "center-leaf-cold1"
else
T.base_state = "center-leaf[rand(1,2)]"
T.update_icon()

/obj/structure/flora/newtree/proc/build_branches()
Expand Down Expand Up @@ -224,7 +227,10 @@
. = ..()
if(base_state)
AddComponent(/datum/component/squeak, list('sound/foley/plantcross1.ogg','sound/foley/plantcross2.ogg','sound/foley/plantcross3.ogg','sound/foley/plantcross4.ogg'), 100)
base_state = "center-leaf[rand(1,2)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
base_state = "center-leaf-cold1"
else
base_state = "center-leaf[rand(1,2)]"
update_icon()

/obj/structure/flora/newbranch/connector
Expand Down Expand Up @@ -262,7 +268,10 @@

/obj/structure/flora/newleaf/corner/Initialize()
. = ..()
icon_state = "corner-leaf[rand(1,2)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "corner-leaf-cold1"
else
icon_state = "corner-leaf[rand(1,2)]"
update_icon()

/obj/structure/flora/newleaf
Expand All @@ -274,5 +283,9 @@

/obj/structure/flora/newleaf/Initialize()
. = ..()
icon_state = "center-leaf[rand(1,2)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "center-leaf-cold1"
else
icon_state = "center-leaf[rand(1,2)]"

update_icon()
25 changes: 22 additions & 3 deletions code/game/objects/structures/roguetown/rogueflora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@
var/bushtype

/obj/structure/flora/roguegrass/bush/Initialize()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "bush2winter"
else
icon_state = "bush2"
if(prob(88) && isnull(bushtype))
bushtype = pickweight(list(/obj/item/reagent_containers/food/snacks/grown/berries/rogue=5,
/obj/item/reagent_containers/food/snacks/grown/berries/rogue/poison=3,
Expand Down Expand Up @@ -371,7 +375,10 @@
if(!looty.len)
to_chat(user, span_warning("Picked clean... I should try later."))
/obj/structure/flora/roguegrass/bush/update_icon()
icon_state = "bush[rand(2, 4)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "bush[rand(2, 4)]winter"
else
icon_state = "bush[rand(2, 4)]"

/obj/structure/flora/roguegrass/bush/CanAStarPass(ID, travel_dir, caller)
if(ismovableatom(caller))
Expand Down Expand Up @@ -403,6 +410,10 @@
looty += /obj/item/reagent_containers/food/snacks/grown/rogue/pipeweed

/obj/structure/flora/roguegrass/bush/westleach/Initialize()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "bush1winter"
else
icon_state = "bush1"
bushtype = /obj/item/reagent_containers/food/snacks/grown/rogue/pipeweed
return ..()

Expand All @@ -419,7 +430,10 @@

/obj/structure/flora/roguegrass/bush/wall/Initialize()
. = ..()
icon_state = "bushwall[pick(1,2)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "bush[pick(5,6)]winter"
else
icon_state = "bushwall[pick(1,2)]"

/obj/structure/flora/roguegrass/bush/wall/update_icon()
return
Expand All @@ -434,7 +448,12 @@

/obj/structure/flora/roguegrass/bush/wall/tall/Initialize()
. = ..()
icon_state = "tallbush[pick(1,2)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "bush[pick(5,6)]winter"
icon = 'icons/roguetown/misc/foliage.dmi'
else
icon = 'icons/roguetown/misc/foliagetall.dmi'
icon_state = "tallbush[pick(1,2)]"


/obj/structure/flora/rogueshroom
Expand Down
110 changes: 106 additions & 4 deletions code/game/turfs/open/floor/roguefloor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,20 @@

/turf/open/floor/rogue/rooftop/Initialize()
. = ..()
icon_state = "roof"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snoof"
else
icon_state = "roof"

/turf/open/floor/rogue/rooftop/green
icon_state = "roofg-arw"

/turf/open/floor/rogue/rooftop/green/Initialize()
. = ..()
icon_state = "roofg"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snoofg"
else
icon_state = "roofg"

/turf/open/floor/rogue/rooftop/green/north
dir = 1
Expand Down Expand Up @@ -293,6 +299,15 @@
/turf/open/floor/rogue/snowpatchy/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)

/turf/open/floor/rogue/snowpatchy/Initialize()
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snass"
neighborlay = "snass_edge"
else
icon_state = "snowpatchy_grass"
neighborlay = "snowpatchy_grassedge"

/turf/open/floor/rogue/grasscold
name = "tundra grass"
desc = "Grass, frigid and touched by winter."
Expand All @@ -313,6 +328,12 @@
/turf/open/floor/rogue/grasscold/Initialize()
dir = pick(GLOB.cardinals)
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snass"
neighborlay = "snass_edge"
else
icon_state = "grass_red"
neighborlay = "grass_rededge"

/turf/open/floor/rogue/grasscold/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)
Expand Down Expand Up @@ -340,6 +361,12 @@
/turf/open/floor/rogue/grassred/Initialize()
dir = pick(GLOB.cardinals)
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snass"
neighborlay = "snass_edge"
else
icon_state = "grass_red"
neighborlay = "grass_rededge"

/turf/open/floor/rogue/grassred/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)
Expand All @@ -365,6 +392,12 @@
/turf/open/floor/rogue/grassyel/Initialize()
dir = pick(GLOB.cardinals)
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snass"
neighborlay = "snass_edge"
else
icon_state = "grass_yel"
neighborlay = "grass_yeledge"

/turf/open/floor/rogue/grassyel/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)
Expand Down Expand Up @@ -396,6 +429,12 @@
dir = pick(GLOB.cardinals)
// GLOB.dirt_list += src
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snass"
neighborlay = "snass_edge"
else
icon_state = "grass"
neighborlay = "grassedge"

/turf/open/floor/rogue/grass/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)
Expand Down Expand Up @@ -515,6 +554,12 @@
/turf/open/floor/rogue/dirt/Initialize()
dir = pick(GLOB.cardinals)
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snirt"
neighborlay = "snirtedge"
else
icon_state = "dirt"
neighborlay = "dirtedge"
update_water()

/turf/open/floor/rogue/dirt/update_water()
Expand Down Expand Up @@ -595,6 +640,15 @@
/turf/open/floor/rogue/dirt/road/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)

/turf/open/floor/rogue/dirt/road/Initialize()
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snoad"
neighborlay = "snoadedge"
else
icon_state = "road"
neighborlay = "roadedge"

/turf/open/floor/rogue/sand
name = "sand"
desc = "Fine grains shift and hiss softly beneath your step."
Expand Down Expand Up @@ -1129,7 +1183,12 @@

/turf/open/floor/rogue/cobble/Initialize()
. = ..()
icon_state = "cobblestone[rand(1,3)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snobblestone[rand(1,3)]"
desc = "Stone bricks carefully inlaid upon the ground for a more refined and resilient path. These are covered in a layer of rime."
neighborlay = "snobbleedge"
else
icon_state = "cobblestone[rand(1,3)]"

/turf/open/floor/rogue/cobble/mossy
name = "mossy cobblestone"
Expand All @@ -1156,7 +1215,12 @@

/turf/open/floor/rogue/cobble/mossy/Initialize()
. = ..()
icon_state = "mossystone[rand(1,3)]"
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snobblestone[rand(1,3)]"
desc = "Stone bricks carefully inlaid upon the ground for a more refined and resilient path. These are covered in a layer of rime."
neighborlay = "snobbleedge"
else
icon_state = "mossystone[rand(1,3)]"

/obj/effect/decal/mossy
name = "mossy brick floor"
Expand All @@ -1165,13 +1229,27 @@
icon_state = "mossyedge"
mouse_opacity = 0

/obj/effect/decal/mossy/Initialize()
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snossyedge"
else
icon_state = "mossyedge"

/obj/effect/decal/cobble/mossy
name = "mossy brick floor"
desc = "Dirt and moss have crept between the gaps of this stone-brick flooring. Rather fitting for an outdoor garden; not so much for a home."
icon = 'icons/turf/roguefloor.dmi'
icon_state = "mossystone_edges"
mouse_opacity = 0

/obj/effect/decal/cobble/mossy/Initialize()
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snobblestone_edges"
else
icon_state = "mossystone_edges"

/obj/effect/decal/edge
name = "stone edge"
desc = "A piece of stone used to border city roads."
Expand Down Expand Up @@ -1201,6 +1279,14 @@
/turf/closed/mineral,
/turf/closed/wall/mineral)

/turf/open/floor/rogue/cobblerock/Initialize()
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
icon_state = "snobblerock"
desc = "A crude path of lumpy rocks that allows feet and cart wheels alike to escape the treacherous mud. These are covered in a layer of rime."
else
icon_state = "cobblerock"

/turf/open/floor/rogue/cobblerock/cardinal_smooth(adjacencies)
roguesmooth(adjacencies)

Expand All @@ -1211,6 +1297,22 @@
icon_state = "cobblestone_edges"
mouse_opacity = 0

/obj/effect/decal/cobbleedge/Initialize()
. = ..()
if(istype(get_area(src), /area/rogue/outdoors) || istype(get_area(src), /area/rogue/druidsgrove))
if(icon_state == "cobbleedge-n") // This shit's the only wierd one because someone, for some reason, mapped in the decal with manually set icon states EVERYWHERE
icon_state = "snobbleedge-n"
if(icon_state == "cobbleedge-e")
icon_state = "snobbleedge-e"
if(icon_state == "cobbleedge-w")
icon_state = "snobbleedge-w"
if(icon_state == "cobbleedge-sread")
icon_state = "snobbleedge-sread"
if(icon_state == "cobblestone_edges")
icon_state = "snobblestone_edges"
else
return

/obj/effect/decal/carpet
name = "exotic rug"
desc = "Dazzling symmetrical patterns flow with an old culture's style."
Expand Down
Binary file modified icons/turf/roguefloor.dmi
Binary file not shown.
Loading