mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-14 12:13:06 +00:00
finishes icon cleanup, adds more props, adds flora, adds some prop mechanics
This commit is contained in:
Darlantan
@@ -1,27 +0,0 @@
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "sand0_edge"
|
||||
plane = TURF_PLANE
|
||||
layer = ABOVE_TURF_LAYER
|
||||
mouse_opacity = 0 //Don't block underlying tile interactions
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/sand0_edge
|
||||
name = "sand0 edge"
|
||||
icon_state = "sand0_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/gravel_edge
|
||||
name = "gravel edge"
|
||||
icon_state = "gravel_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/mud_edge
|
||||
name = "mud edge"
|
||||
icon_state = "mud_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/grass_edge
|
||||
name = "grass edge"
|
||||
icon_state = "grass_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/deep_grass_edge
|
||||
name = "deep grass edge"
|
||||
icon_state = "deep_grass_edge"
|
||||
@@ -1,125 +0,0 @@
|
||||
|
||||
/obj/structure/prop/desert_planet/rock
|
||||
name = "desert rock"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "rock"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/largerock
|
||||
name = "desert large rock"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "largerock"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder1
|
||||
name = "desert boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "boulder1"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder2
|
||||
name = "desert boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "boulder2"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder3
|
||||
name = "desert boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "boulder3"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder4
|
||||
name = "desert boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "boulder4"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/largeboulder1
|
||||
name = "desert large boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet_64x64.dmi'
|
||||
icon_state = "largeboulder1"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/largeboulder2
|
||||
name = "desert large boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet_64x64.dmi'
|
||||
icon_state = "largeboulder2"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/largeboulder3
|
||||
name = "desert large boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'icons/turf/desert_planet_64x64.dmi'
|
||||
icon_state = "largeboulder3"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/cliff
|
||||
name = "desert cliff"
|
||||
desc = "A sheer cliff of smooth desert stone, quite steep."
|
||||
icon = 'icons/turf/desert_planet_64x64.dmi'
|
||||
icon_state = "cliff"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/shadow
|
||||
name = "shadow"
|
||||
desc = "Looking at the cliff's shadow, cool off from the heat."
|
||||
icon = 'icons/turf/desert_planet_64x64.dmi'
|
||||
icon_state = "shadow"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/palmtree
|
||||
name = "palm tree"
|
||||
desc = "Tall palm tree, makes for a good shade."
|
||||
icon = 'icons/turf/desert_planet_160x160.dmi'
|
||||
icon_state = "palmtree"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/palmtreeshort
|
||||
name = "palm tree"
|
||||
desc = "Tall palm tree, makes for a good shade."
|
||||
icon = 'icons/turf/desert_planet_160x160.dmi'
|
||||
icon_state = "palmtreeshort"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
@@ -1,213 +0,0 @@
|
||||
/* Testing
|
||||
/turf/simulated/floor/outdoors/desert_planet/sand
|
||||
name = "sand"
|
||||
desc = "Sandy, taste salty and gritty."
|
||||
icon = 'modular_chomp/icons/turf/desert_planet.dmi'
|
||||
edge_blending_priority = 2
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
initial_flooring = /decl/flooring/sand
|
||||
can_dig = false
|
||||
*/
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/sand
|
||||
name = "sand"
|
||||
desc = "Salty and gritty."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "sand0"
|
||||
//edge_blending_priority = 1
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/* #I want this for the desert tiles.
|
||||
/turf/simulated/floor/outdoors/desert_planet/sand
|
||||
name = "sand"
|
||||
desc = "Salty and gritty."
|
||||
icon = 'modular_chomp/icons/turf/desert_planet.dmi'
|
||||
icon_base = "sand"
|
||||
footstep_sounds = list("human" = list(
|
||||
'sound/effects/footstep/asteroid1.ogg',
|
||||
'sound/effects/footstep/asteroid2.ogg',
|
||||
'sound/effects/footstep/asteroid3.ogg',
|
||||
'sound/effects/footstep/asteroid4.ogg',
|
||||
'sound/effects/footstep/asteroid5.ogg',
|
||||
'sound/effects/footstep/MedDirt1.ogg',
|
||||
'sound/effects/footstep/MedDirt2.ogg',
|
||||
'sound/effects/footstep/MedDirt3.ogg',
|
||||
'sound/effects/footstep/MedDirt4.ogg'))
|
||||
|
||||
/turf/simulated/floor/outdoors/sand/Initialize(mapload)
|
||||
var/possiblesands = list(
|
||||
"sand" = 50,
|
||||
"sand" = 1,
|
||||
"ironsand3" = 1,
|
||||
"ironsand4" = 1,
|
||||
"ironsand5" = 1,
|
||||
"ironsand6" = 1,
|
||||
"ironsand7" = 1,
|
||||
"ironsand8" = 1,
|
||||
"ironsand9" = 1,
|
||||
"ironsand10" = 1,
|
||||
"ironsand11" = 1,
|
||||
"ironsand12" = 1,
|
||||
"ironsand13" = 1,
|
||||
"ironsand14" = 1,
|
||||
"ironsand15" = 1
|
||||
|
||||
)
|
||||
flooring_override = pickweight(possiblesands)
|
||||
return ..()
|
||||
|
||||
/turf/simulated/floor/water/hotspring
|
||||
name = "Hotsprings"
|
||||
desc = "A natural hotspring connecting to an aquifer. It seems the facility was built ontop of it."
|
||||
edge_blending_priority = -2
|
||||
movement_cost = 8
|
||||
depth = 2
|
||||
water_state = "water_shallow"
|
||||
outdoors = FALSE
|
||||
|
||||
/turf/simulated/floor/water/hotspring/Entered(atom/movable/AM, atom/oldloc)
|
||||
if(istype(AM, /mob/living))
|
||||
var/mob/living/L = AM
|
||||
L.update_water()
|
||||
if(L.check_submerged() <= 0)
|
||||
return
|
||||
if(!istype(oldloc, /turf/simulated/floor/water/hotspring))
|
||||
to_chat(L, "<span class='warning'>You feel an overwhelming wave of warmth from entering \the [src]!</span>")
|
||||
AM.water_act(5)
|
||||
..()
|
||||
|
||||
|
||||
*/
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/deep_sand
|
||||
name = "sand"
|
||||
desc = "Salty and gritty."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "deep_sand"
|
||||
movement_cost = 3
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/grass
|
||||
name = "grass"
|
||||
desc = "Lively green grass, soft to walk on."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "grass"
|
||||
//edge_blending_priority = 4
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/deep_grass
|
||||
name = "dense grass"
|
||||
desc = "Dense patch of grass, seems like a soft spot to lay on."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "deep_grass"
|
||||
//edge_blending_priority = 5
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/gravel
|
||||
name = "gravel"
|
||||
desc = "Mix of dirt and sand, it crumbles in your hand."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "gravel"
|
||||
//edge_blending_priority = 2
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/mud
|
||||
name = "mud"
|
||||
desc = "Squishy damp dirt, smells muddy."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "mud"
|
||||
//edge_blending_priority = 3
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/sandstone_tiles
|
||||
name = "sandstone_tiles"
|
||||
desc = "Smooth polished sandstone tiles, fitted and fixed in patters"
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "sandstone_tiles"
|
||||
//edge_blending_priority = 3
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/sand0_edge
|
||||
name = "sand0_edge"
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "sand0_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/gravel_edge
|
||||
name = "gravel_edge"
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "gravel_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/mud_edge
|
||||
name = "mud_edge"
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "mud_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/grass_edge
|
||||
name = "grass_edge"
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "grass_edge"
|
||||
|
||||
/obj/effect/floor_decal/desert_planet/floor/deep_grass_edge
|
||||
name = "deep_grass_edge"
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "deep_grass_edge"
|
||||
|
||||
|
||||
/* #No idea how water tiles work
|
||||
/turf/simulated/floor/outdoors/desert_planet/water
|
||||
name = "water"
|
||||
desc = "Clear cool water, looks potable."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "water"
|
||||
var/water_state = "water_shallow"
|
||||
var/under_state = "sand"
|
||||
can_be_plated = FALSE
|
||||
outdoors = OUTDOORS_YES
|
||||
flags = TURF_ACID_IMMUNE
|
||||
layer = WATER_FLOOR_LAYER
|
||||
can_dirty = FALSE // It's water
|
||||
var/depth = 1 // Higher numbers indicates deeper water.
|
||||
var/reagent_type = "water"
|
||||
edge_blending_priority = 2
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/desert_planet/sand)
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/deep_water
|
||||
name = "deep water"
|
||||
desc = "deep enough you can't see the bottom of it."
|
||||
icon = 'icons/turf/desert_planet.dmi'
|
||||
icon_state = "deep_water"
|
||||
var/water_state = "water_shallow"
|
||||
var/under_state = "sand"
|
||||
can_be_plated = FALSE
|
||||
outdoors = OUTDOORS_YES
|
||||
flags = TURF_ACID_IMMUNE
|
||||
layer = WATER_FLOOR_LAYER
|
||||
can_dirty = FALSE // It's water
|
||||
var/depth = 2 // Higher numbers indicates deeper water.
|
||||
var/reagent_type = "water"
|
||||
edge_blending_priority = 4
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/desert_planet/sand)
|
||||
|
||||
//I want this for the water tiles
|
||||
/turf/simulated/floor/water
|
||||
name = "shallow water"
|
||||
desc = "A body of water. It seems shallow enough to walk through, if needed."
|
||||
icon = 'icons/turf/outdoors.dmi'
|
||||
icon_state = "seashallow" // So it shows up in the map editor as water.
|
||||
var/water_state = "water_shallow"
|
||||
var/under_state = "rock"
|
||||
edge_blending_priority = -1
|
||||
movement_cost = 4
|
||||
can_be_plated = FALSE
|
||||
outdoors = OUTDOORS_YES
|
||||
flags = TURF_ACID_IMMUNE
|
||||
|
||||
layer = WATER_FLOOR_LAYER
|
||||
|
||||
can_dirty = FALSE // It's water
|
||||
|
||||
var/depth = 1 // Higher numbers indicates deeper water.
|
||||
|
||||
var/reagent_type = "water"
|
||||
// var/datum/looping_sound/water/soundloop CHOMPEdit: Removing soundloop for now.
|
||||
*/
|
||||
@@ -0,0 +1,333 @@
|
||||
// Props
|
||||
/obj/structure/prop/desert_rock
|
||||
icon = 'modular_chomp/icons/obj/desert_planet/desert_rocks.dmi'
|
||||
desc = "Sandy and smooth from erosion."
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_rock/rock
|
||||
name = "desert rock"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/attack_hand(mob/living/user)
|
||||
if(user.is_incorporeal())
|
||||
return
|
||||
to_chat(user, "You push on the [src].")
|
||||
var/movedir = user.dir
|
||||
if(do_after(user, 3 SECONDS, src))
|
||||
step(src, movedir)
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock
|
||||
icon_state = "desert_rock"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock1
|
||||
icon_state = "desert_rock1"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock2
|
||||
icon_state = "desert_rock2"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock3
|
||||
icon_state = "desert_rock3"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock4
|
||||
icon_state = "desert_rock4"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock5
|
||||
icon_state = "desert_rock5"
|
||||
|
||||
/obj/structure/prop/desert_rock/rock/rock6
|
||||
icon_state = "desert_rock6"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble
|
||||
name = "sandy pebble"
|
||||
density = FALSE
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/Crossed(atom/movable/AM as mob|obj)
|
||||
if(AM.is_incorporeal())
|
||||
return
|
||||
if(istype(AM, /mob/living))
|
||||
var/mob/living/M = AM
|
||||
if(M.m_intent == "run" && prob(5))
|
||||
M.Weaken(2)
|
||||
to_chat(M, "You trip over the [src]!")
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble
|
||||
icon_state = "desert_pebble"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble1
|
||||
icon_state = "desert_pebble1"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble2
|
||||
icon_state = "desert_pebble2"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble3
|
||||
icon_state = "desert_pebble3"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble4
|
||||
icon_state = "desert_pebble4"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble5
|
||||
icon_state = "desert_pebble5"
|
||||
|
||||
/obj/structure/prop/desert_rock/pebble/pebble6
|
||||
icon_state = "desert_pebble6"
|
||||
|
||||
/obj/structure/prop/desert_rock/anthill
|
||||
name = "ant hill"
|
||||
desc = "See how many ants you can spot."
|
||||
icon = 'modular_chomp/icons/obj/desert_planet/desert_plants.dmi'
|
||||
icon_state = "anthill0"
|
||||
|
||||
/obj/structure/prop/desert_rock/anthill/New()
|
||||
..()
|
||||
icon_state = "anthill[rand(0,2)]"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64
|
||||
name = "large rock"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'modular_chomp/icons/obj/desert_planet/desert_props_64x64.dmi'
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lrock
|
||||
icon_state = "lrock"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lrock1
|
||||
icon_state = "lrock1"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lrock2
|
||||
icon_state = "lrock2"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lrock3
|
||||
icon_state = "lrock3"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lrock4
|
||||
icon_state = "lrock4"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lribs
|
||||
name = "ribs"
|
||||
desc = "Bleached white by baking sunlight."
|
||||
icon_state = "lribs"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lribs1
|
||||
name = "ribs"
|
||||
desc = "Bleached white by baking sunlight."
|
||||
icon_state = "lribs1"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lskull
|
||||
name = "skull"
|
||||
desc = "Bleached white by baking sunlight."
|
||||
icon_state = "lskull"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/lbone
|
||||
name = "bone"
|
||||
desc = "Bleached white by baking sunlight."
|
||||
icon_state = "lbone"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/palmuria
|
||||
name = "palm"
|
||||
desc = "Stout and bushy."
|
||||
icon_state = "palmuria"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/palmuria1
|
||||
name = "palm"
|
||||
desc = "Stout and bushy."
|
||||
icon_state = "palmuria1"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160
|
||||
name = "desert large boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'modular_chomp/icons/obj/desert_planet/desert_planet_160x160.dmi'
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/largeboulder
|
||||
icon_state = "large_boulder"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/tallboulder
|
||||
icon_state = "tall_boulder"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/boulder
|
||||
icon_state = "boulder"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus1
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus1"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus2
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus2"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus3
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus3"
|
||||
|
||||
// Flora
|
||||
/obj/structure/flora/desert_planet
|
||||
name = "desert plant"
|
||||
desc = "Probably a succulent."
|
||||
icon = 'modular_chomp/icons/obj/desert_planet/desert_plants.dmi'
|
||||
|
||||
/obj/structure/flora/desert_planet/potted_plant
|
||||
name = "potted plant"
|
||||
desc = "Colloquially known as a pot plant."
|
||||
icon_state = "potplant0"
|
||||
|
||||
/obj/structure/flora/desert_planet/potted_plant/New()
|
||||
..()
|
||||
icon_state = "potplant[rand(0,2)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/thicket
|
||||
name = "thicket"
|
||||
desc = "Weedy growths."
|
||||
icon_state = "thicket0"
|
||||
|
||||
/obj/structure/flora/desert_planet/thicket/New()
|
||||
..()
|
||||
icon_state = "thicket[rand(0,6)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/shrub
|
||||
name = "shrub"
|
||||
desc = "Dense and weedy."
|
||||
icon_state = "shrub0"
|
||||
|
||||
/obj/structure/flora/desert_planet/shrub/New()
|
||||
..()
|
||||
icon_state = "shrub[rand(0,6)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/bush
|
||||
name = "bush"
|
||||
desc = "Denser and weedier."
|
||||
icon_state = "bush0"
|
||||
|
||||
/obj/structure/flora/desert_planet/bush/New()
|
||||
..()
|
||||
icon_state = "bush[rand(0,5)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/barrelcacti
|
||||
name = "barrel cacti"
|
||||
desc = "Small, adorable, and begging for a hug."
|
||||
icon_state = "barrelcacti0"
|
||||
|
||||
/obj/structure/flora/desert_planet/barrelcacti/New()
|
||||
..()
|
||||
icon_state = "barrelcacti[rand(0,3)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/palmy
|
||||
name = "yucca bush"
|
||||
desc = "Probably not actually a yucca."
|
||||
icon_state = "palmy0"
|
||||
|
||||
/obj/structure/flora/desert_planet/palmy/New()
|
||||
..()
|
||||
icon_state = "palmy[rand(0,2)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/shrubber
|
||||
name = "thorny bush"
|
||||
desc = "Makes for great fur accessories."
|
||||
icon_state = "shrubber0"
|
||||
|
||||
/obj/structure/flora/desert_planet/shrubber/New()
|
||||
..()
|
||||
icon_state = "shrubber[rand(0,2)]"
|
||||
|
||||
/obj/structure/flora/desert_planet/lbarrelcacti
|
||||
name = "barrel cactus"
|
||||
desc = "Absolutely begging for pets."
|
||||
icon_state = "lbarrelcacti0"
|
||||
|
||||
/obj/structure/flora/desert_planet/lbarrelcacti/New()
|
||||
..()
|
||||
icon_state = "lbarrelcacti[rand(0,2)]"
|
||||
|
||||
// Trees
|
||||
/obj/structure/flora/tree/desert_planet
|
||||
name = "palm tree"
|
||||
desc = "Tall palm tree, makes for a good shade."
|
||||
icon = 'modular_chomp/icons/obj/desert_planet/desert_planet_160x160.dmi'
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
can_buckle = FALSE
|
||||
product = /obj/item/stack/material/log
|
||||
product_amount = 50
|
||||
health = 2000
|
||||
max_health = 2000
|
||||
//var/fruit
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtreeb
|
||||
icon_state = "palmtreeb"
|
||||
base_state = "palmr" // Necessary for stumps to work.
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtreeb1
|
||||
icon_state = "palmtreeb1"
|
||||
base_state = "palml"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtree
|
||||
icon_state = "palmtree"
|
||||
base_state = "palmr"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtree1
|
||||
icon_state = "palmtree1"
|
||||
base_state = "palml"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtreeb
|
||||
icon_state = "mpalmtreeb"
|
||||
base_state = "palmr"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtreeb1
|
||||
icon_state = "mpalmtreeb1"
|
||||
base_state = "palml"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtree
|
||||
icon_state = "mpalmtree"
|
||||
base_state = "palml"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtree1
|
||||
icon_state = "mpalmtree1"
|
||||
base_state = "palmr"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree
|
||||
icon_state = "spalmtree"
|
||||
base_state = "palmls"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree1
|
||||
icon_state = "spalmtree1"
|
||||
base_state = "palmrs"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree3
|
||||
icon_state = "spalmtree3"
|
||||
base_state = "palmls"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree4
|
||||
icon_state = "spalmtree4"
|
||||
base_state = "palmrs"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/desert_tree
|
||||
name = "barren tree"
|
||||
desc = "Completely barren."
|
||||
icon_state = "desert_tree"
|
||||
base_state = "desert"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/desert_tree1
|
||||
name = "gnarled tree"
|
||||
desc = "Twisted but living."
|
||||
icon_state = "desert_tree1"
|
||||
base_state = "desert"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/desert_tree3
|
||||
name = "hardy tree"
|
||||
desc = "Thriving despite the conditions."
|
||||
icon_state = "desert_tree3"
|
||||
base_state = "desert"
|
||||
product_amount = 100
|
||||
health = 4000
|
||||
max_health = 4000
|
||||
@@ -1,186 +0,0 @@
|
||||
// TODO: split up icon files so all of this isn't reading from the turfs folder
|
||||
|
||||
/obj/structure/prop/desert_planet
|
||||
icon = 'modular_chomp/icons/turf/desert_planet.dmi'
|
||||
desc = "Sandy and smooth from erosion."
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/prop/desert_planet/rock
|
||||
name = "desert rock"
|
||||
icon_state = "rock"
|
||||
density = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet/largerock
|
||||
name = "desert large rock"
|
||||
icon_state = "largerock"
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder1
|
||||
name = "desert boulder"
|
||||
icon_state = "boulder1"
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder2
|
||||
name = "desert boulder"
|
||||
icon_state = "boulder2"
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder3
|
||||
name = "desert boulder"
|
||||
icon_state = "boulder3"
|
||||
|
||||
/obj/structure/prop/desert_planet/boulder4
|
||||
name = "desert boulder"
|
||||
icon_state = "boulder4"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64
|
||||
name = "desert large boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'modular_chomp/icons/turf/desert_planet_64x64.dmi'
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 64
|
||||
bound_height = 64
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/largeboulder1
|
||||
icon_state = "largeboulder1"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/largeboulder2
|
||||
icon_state = "largeboulder2"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/largeboulder3
|
||||
icon_state = "largeboulder3"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/cliff
|
||||
name = "desert cliff"
|
||||
desc = "A sheer cliff of smooth desert stone, quite steep."
|
||||
icon_state = "cliff"
|
||||
|
||||
/obj/structure/prop/desert_planet64x64/shadow
|
||||
name = "shadow"
|
||||
desc = "The cliff shadow looks useful for cooling off from the heat."
|
||||
icon_state = "shadow"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160
|
||||
name = "desert large boulder"
|
||||
desc = "Sandy and smooth from erosion."
|
||||
icon = 'modular_chomp/icons/turf/desert_planet_160x160.dmi'
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
bound_width = 160
|
||||
bound_height = 160
|
||||
can_buckle = FALSE
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/largeboulder
|
||||
icon_state = "large_boulder"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/tallboulder
|
||||
icon_state = "tall_boulder"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/boulder
|
||||
icon_state = "boulder"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus1
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus1"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus2
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus2"
|
||||
|
||||
/obj/structure/prop/desert_planet160x160/lcactus3
|
||||
name = "cactus"
|
||||
desc = "Large and prickly."
|
||||
icon_state = "lcactus3"
|
||||
|
||||
/obj/structure/flora/desert_planet
|
||||
name = "desert plant"
|
||||
desc = "Probably a succulent"
|
||||
icon = 'modular_chomp/icons/turf/desert_planet.dmi'
|
||||
|
||||
/obj/structure/flora/desert_planet/floralia
|
||||
name = "floralia"
|
||||
desc = "Faintly floral."
|
||||
icon_state = "floralia"
|
||||
|
||||
/obj/structure/flora/desert_planet/ike
|
||||
name = "ike"
|
||||
desc = "Bushy."
|
||||
icon_state = "ike"
|
||||
|
||||
/obj/structure/flora/desert_planet/barrelcactus
|
||||
name = "barrel cactus"
|
||||
desc = "Round and prickly."
|
||||
icon_state = "barrelcactus"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet
|
||||
name = "palm tree"
|
||||
desc = "Tall palm tree, makes for a good shade."
|
||||
icon = 'modular_chomp/icons/turf/desert_planet_160x160.dmi'
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
bound_width = 160
|
||||
bound_height = 160
|
||||
can_buckle = FALSE
|
||||
product = /obj/item/stack/material/log
|
||||
product_amount = 50
|
||||
health = 2000
|
||||
max_health = 2000
|
||||
//var/fruit
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtreeb
|
||||
icon_state = "palmtreeb"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtreeb1
|
||||
icon_state = "palmtreeb1"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtree
|
||||
icon_state = "palmtree"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/palmtree1
|
||||
icon_state = "palmtree1"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtreeb
|
||||
icon_state = "mpalmtreeb"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtreeb1
|
||||
icon_state = "mpalmtreeb1"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtree
|
||||
icon_state = "mpalmtree"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/mpalmtree1
|
||||
icon_state = "mpalmtree1"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree
|
||||
icon_state = "spalmtree"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree2
|
||||
icon_state = "spalmtree2"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree3
|
||||
icon_state = "spalmtree3"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/spalmtree4
|
||||
icon_state = "spalmtree4"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/desert_tree
|
||||
name = "barren tree"
|
||||
desc = "Completely barren."
|
||||
icon_state = "desert_tree"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/desert_tree1
|
||||
name = "gnarled tree"
|
||||
desc = "Twisted but living."
|
||||
icon_state = "desert_tree1"
|
||||
|
||||
/obj/structure/flora/tree/desert_planet/desert_tree3
|
||||
name = "hardy tree"
|
||||
desc = "Thriving despite the conditions."
|
||||
icon_state = "desert_tree3"
|
||||
@@ -13,7 +13,7 @@
|
||||
/turf/simulated/floor/outdoors/desert_planet
|
||||
name = "sand"
|
||||
desc = "Salty and gritty."
|
||||
icon = 'modular_chomp/icons/turf/desert_planet.dmi'
|
||||
icon = 'modular_chomp/icons/turf/desert_tiles.dmi'
|
||||
modular_icon = TRUE // This must be true to add edges from our .dmi files.
|
||||
|
||||
/turf/simulated/floor/outdoors/desert_planet/sand
|
||||
@@ -80,10 +80,11 @@
|
||||
// At last we've come full circle, a floor which is actually a wall.
|
||||
/turf/simulated/floor/outdoors/desert_planet/sandrock
|
||||
name = "sandstone"
|
||||
desc = "Worn, patterned sandstone."
|
||||
icon_state = "sandrock"
|
||||
desc = "Rough sandstone."
|
||||
icon_state = "stonewall"
|
||||
density = TRUE
|
||||
opacity = TRUE
|
||||
edge_blending_priority = 7
|
||||
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
|
||||
var/last_act = 0
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
tt_desc = "Canis lupus familiaris"
|
||||
//faction = "mexico" //They are from Mexico. //Amusing but this prompts aggression from crew-aligned mobs.
|
||||
|
||||
icon = 'modular_chomp/icons/turf/desert_planet.dmi'
|
||||
icon = 'modular_chomp/icons/turf/desert_tiles.dmi'
|
||||
icon_state = "dog"
|
||||
item_state = "dog"
|
||||
icon_living = "dog"
|
||||
|
||||
BIN
modular_chomp/icons/obj/desert_planet/desert_planet_160x160.dmi
Normal file
BIN
modular_chomp/icons/obj/desert_planet/desert_planet_160x160.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 123 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 79 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 23 KiB |
@@ -1721,7 +1721,6 @@
|
||||
#include "code\game\turfs\initialization\init.dm"
|
||||
#include "code\game\turfs\initialization\maintenance.dm"
|
||||
#include "code\game\turfs\simulated\angled_walls_and_doors_department_colors.dm"
|
||||
#include "code\game\turfs\simulated\desert_planet_structures.dm"
|
||||
#include "code\game\turfs\simulated\fancy_shuttles.dm"
|
||||
#include "code\game\turfs\simulated\floor.dm"
|
||||
#include "code\game\turfs\simulated\floor_acts.dm"
|
||||
@@ -1744,7 +1743,6 @@
|
||||
#include "code\game\turfs\simulated\dungeon\floor.dm"
|
||||
#include "code\game\turfs\simulated\dungeon\wall.dm"
|
||||
#include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm"
|
||||
#include "code\game\turfs\simulated\outdoors\desert_planet.dm"
|
||||
#include "code\game\turfs\simulated\outdoors\dirt.dm"
|
||||
#include "code\game\turfs\simulated\outdoors\grass.dm"
|
||||
#include "code\game\turfs\simulated\outdoors\ironsand_vr.dm"
|
||||
@@ -4513,9 +4511,9 @@
|
||||
#include "modular_chomp\code\game\jobs\job\noncrew.dm"
|
||||
#include "modular_chomp\code\game\jobs\job\silicon.dm"
|
||||
#include "modular_chomp\code\game\machinery\airconditioner_ch.dm"
|
||||
#include "modular_chomp\code\game\objects\structures\desert_planet_structures.dm"
|
||||
#include "modular_chomp\code\game\objects\structures\watercloset_ch.dm"
|
||||
#include "modular_chomp\code\game\objects\structures\crate_lockers\largecrate.dm"
|
||||
#include "modular_chomp\code\game\turfs\simulated\desert_planet_structures.dm"
|
||||
#include "modular_chomp\code\game\turfs\simulated\simulated.dm"
|
||||
#include "modular_chomp\code\game\turfs\simulated\outdoors\desert_planet.dm"
|
||||
#include "modular_chomp\code\modules\admin\functions\modify_traits.dm"
|
||||
|
||||
Reference in New Issue
Block a user