cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] DCS Update + Footstep element (#10125)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-08 18:41:38 -07:00
committed by GitHub
parent 4dab3b582f
commit 4524b7b325
61 changed files with 155 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/turfs/flooring/flooring_premade.dm
View File

@@ -187,11 +187,9 @@
icon_state = "grass0"
can_dirty = FALSE //VOREStation Edit
initial_flooring = /decl/flooring/grass
// CHOMPAdd - Grass has grass footsteps
footstep = FOOTSTEP_GRASS
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
// CHOMPEnd
/turf/simulated/floor/tiled
name = "floor"

21
code/game/turfs/simulated/floor.dm
View File

@@ -13,20 +13,6 @@
var/base_desc = "The naked hull."
var/base_icon = 'icons/turf/flooring/plating_vr.dmi'
var/base_icon_state = "plating"
/* var/static/list/base_footstep_sounds = list("human" = list(
'sound/effects/footstep/plating1.ogg',
'sound/effects/footstep/plating2.ogg',
'sound/effects/footstep/plating3.ogg',
'sound/effects/footstep/plating4.ogg',
'sound/effects/footstep/plating5.ogg'),
SPECIES_TESHARI = list(
'sound/effects/footstep/BudgieStep1.ogg',
'sound/effects/footstep/BudgieStep2.ogg',
'sound/effects/footstep/BudgieStep3.ogg',
'sound/effects/footstep/BudgieStep4.ogg',
'sound/effects/footstep/BudgieStep5.ogg',
'sound/effects/footstep/BudgieStep6.ogg',
))*/ // CHOMPedit: tesh steps CHOMPEdit - Better footsteps
var/list/old_decals = null
@@ -50,9 +36,6 @@
if(floortype)
set_flooring(get_flooring_data(floortype), TRUE)
. = INITIALIZE_HINT_LATELOAD // We'll update our icons after everyone is ready
// else
// vorefootstep_sounds = base_vorefootstep_sounds //CHOMPstation edit
// footstep_sounds = base_footstep_sounds CHOMPEdit - Better footsteps
if(can_dirty && can_start_dirty)
if(prob(dirty_prob))
dirt += rand(50,100)
@@ -72,8 +55,6 @@
if(is_plating() && !initializing) // Plating -> Flooring
swap_decals()
flooring = newflooring
// vorefootstep_sounds = newflooring.vorefootstep_sounds //CHOMPstation edit
// footstep_sounds = newflooring.footstep_sounds CHOMPEdit - Better footsteps
if(!initializing)
update_icon(1)
levelupdate()
@@ -90,8 +71,6 @@
desc = base_desc
icon = base_icon
icon_state = base_icon_state
// vorefootstep_sounds = base_vorefootstep_sounds //CHOMPstation edit
// footstep_sounds = base_footstep_sounds CHOMPEdit - Better footsteps
if(!is_plating()) // Flooring -> Plating
swap_decals()

16
code/game/turfs/simulated/outdoors/outdoors.dm
View File

@@ -222,16 +222,6 @@ CHOMP Removal End */
desc = "Looks dirty."
icon = 'icons/turf/outdoors_vr.dmi'
icon_base = "dirt0"
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/newdirt/Initialize(mapload)
var/possibledirts = list(
@@ -291,12 +281,6 @@ CHOMP Removal End */
can_paint = 1
can_engrave = FALSE
footstep_sounds = list("human" = list(
'sound/effects/footstep/LightStone1.ogg',
'sound/effects/footstep/LightStone2.ogg',
'sound/effects/footstep/LightStone3.ogg',
'sound/effects/footstep/LightStone4.ogg',))
/obj/item/stack/tile/floor/sidewalk
name = "sidewalk tile"
singular_name = "floor tile"

2
code/game/turfs/simulated/water.dm
View File

@@ -24,8 +24,6 @@
/turf/simulated/floor/water/Initialize()
. = ..()
// var/decl/flooring/F = get_flooring_data(/decl/flooring/water) - CHOMPEdit
// footstep_sounds = F?.footstep_sounds CHOMPEdit - Footsteps
update_icon()
handle_fish()
// soundloop = new(list(src), FALSE) // CHOMPEdit: Removing soundloop for now.

55
code/game/turfs/turf.dm
View File

@@ -41,14 +41,63 @@
var/movement_cost = 0 // How much the turf slows down movement, if any.
// var/list/footstep_sounds = null CHOMPEdit - Better footstep sounds
// var/list/vorefootstep_sounds = null //CHOMPstation edit
var/block_tele = FALSE // If true, most forms of teleporting to or from this turf tile will fail.
var/can_build_into_floor = FALSE // Used for things like RCDs (and maybe lattices/floor tiles in the future), to see if a floor should replace it.
var/list/dangerous_objects // List of 'dangerous' objs that the turf holds that can cause something bad to happen when stepped on, used for AI mobs.
var/tmp/changing_turf
var/blocks_nonghost_incorporeal = FALSE
var/footstep
var/barefootstep
var/heavyfootstep
var/clawfootstep
/turf/simulated/floor
footstep = FOOTSTEP_FLOOR
barefootstep = FOOTSTEP_HARD_BAREFOOT
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
clawfootstep = FOOTSTEP_HARD_CLAW
/turf/simulated/floor/wood
footstep = FOOTSTEP_WOOD
barefootstep = FOOTSTEP_WOOD_BAREFOOT
clawfootstep = FOOTSTEP_WOOD_CLAW
/turf/simulated/floor/carpet
footstep = FOOTSTEP_CARPET
barefootstep = FOOTSTEP_CARPET_BAREFOOT
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
/turf/simulated/floor/plating
footstep = FOOTSTEP_PLATING
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
/turf/simulated/mineral
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
/turf/simulated/floor/outdoors
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
/turf/simulated/floor/outdoors/grass
footstep = FOOTSTEP_GRASS
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
/turf/simulated/floor/water
footstep = FOOTSTEP_WATER
barefootstep = FOOTSTEP_WATER
clawfootstep = FOOTSTEP_WATER
/turf/simulated/floor/lava
footstep = FOOTSTEP_LAVA
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
/turf/Initialize(mapload)
. = ..()
for(var/atom/movable/AM in src)