diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 2c3144a6dd7..af91868996a 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -37,6 +37,15 @@ /obj/item/clothing/shoes/magboots/rig/advanced slowdown_active = 0 +/obj/item/clothing/shoes/magboots/rig/medium + footstep_sound_override = 'sound/machines/rig/rigstep_medium.ogg' + +/obj/item/clothing/shoes/magboots/rig/heavy + footstep_sound_override = 'sound/machines/rig/rigstep_heavy.ogg' + +/obj/item/clothing/shoes/magboots/rig/chonk + footstep_sound_override = 'sound/machines/rig/rigstep_chonk.ogg' + /obj/item/clothing/suit/space/rig name = "chestpiece" allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index f9aec3b22a3..2ec754b0c54 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -19,6 +19,7 @@ offline_slowdown = 10 vision_restriction = TINT_HEAVY offline_vision_restriction = TINT_BLIND + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk species_restricted = list(BODYTYPE_UNATHI) diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index db2e6df58b3..f2daa8eef17 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -19,6 +19,8 @@ offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/combat + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk + allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT @@ -64,6 +66,7 @@ species_restricted = list(BODYTYPE_HUMAN) helm_type = /obj/item/clothing/head/helmet/space/rig/military + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY @@ -169,6 +172,7 @@ offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/tcfl + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy allowed = list( /obj/item/device/flashlight, @@ -222,6 +226,8 @@ offline_slowdown = 2 offline_vision_restriction = TINT_HEAVY + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -274,6 +280,7 @@ offline_slowdown = 2 offline_vision_restriction = TINT_HEAVY + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -342,6 +349,8 @@ offline_slowdown = 2 offline_vision_restriction = TINT_HEAVY + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -403,7 +412,7 @@ max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE glove_type = /obj/item/clothing/gloves/powerfist - boot_type = /obj/item/clothing/shoes + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk /obj/item/rig/bunker/equipped initial_modules = list( @@ -440,6 +449,7 @@ max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE glove_type = /obj/item/clothing/gloves/powerfist + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk /obj/item/rig/jinxiang/equipped initial_modules = list( @@ -479,6 +489,7 @@ siemens_coefficient = 0.1 helm_type = /obj/item/clothing/head/helmet/space/rig/nanotrasen + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy slowdown = 1 offline_slowdown = 2 diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index f64d23091dd..c016a6711ed 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -11,6 +11,7 @@ icon_supported_species_tags = list("skr") emp_protection = 35 helm_type = /obj/item/clothing/head/helmet/space/rig/ert + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy req_access = list(ACCESS_CENT_SPECOPS) species_restricted = list(BODYTYPE_SKRELL,BODYTYPE_HUMAN) armor = list( @@ -222,7 +223,7 @@ ) slowdown = 0 emp_protection = 50 - + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk species_restricted = list(BODYTYPE_HUMAN) initial_modules = list( @@ -266,6 +267,8 @@ species_restricted = list(BODYTYPE_HUMAN) + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk + initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/maneuvering_jets, diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 34a4ce999a1..c3bbe4c5cbb 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -25,6 +25,7 @@ emp_protection = 30 helm_type = /obj/item/clothing/head/helmet/space/rig/merc + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) req_access = list(ACCESS_SYNDICATE) @@ -92,6 +93,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) helm_type = /obj/item/clothing/head/helmet/space/rig/merc/distress + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk req_access = list(ACCESS_DISTRESS) diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index 96779e8e6e9..c85993ae7a0 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -24,6 +24,8 @@ species_restricted = list(BODYTYPE_SKRELL) helm_type = /obj/item/clothing/head/helmet/space/rig/skrell + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index ca797971443..f11b2bfe6f8 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -94,6 +94,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/industrial chest_type = /obj/item/clothing/suit/space/rig/industrial + boot_type = /obj/item/clothing/shoes/magboots/rig/medium allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka,/obj/item/material/twohanded/fireaxe,/obj/item/gun/energy/vaurca/thermaldrill,/obj/item/storage/backpack/cell,/obj/item/rfd/mining) @@ -208,6 +209,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SHIELDED ) + boot_type = /obj/item/clothing/shoes/magboots/rig/medium // Its almost on par with typical combat hardsuits for armor. /obj/item/rig/eva/pilot/equipped @@ -371,6 +373,7 @@ offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/hazard + boot_type = /obj/item/clothing/shoes/magboots/rig/heavy allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) @@ -415,6 +418,7 @@ slowdown = 3 offline_slowdown = 4 offline_vision_restriction = TINT_HEAVY + boot_type = /obj/item/clothing/shoes/magboots/rig/chonk allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction) diff --git a/html/changelogs/Hellfirejag-HardsuitSoundVariety.yml b/html/changelogs/Hellfirejag-HardsuitSoundVariety.yml new file mode 100644 index 00000000000..fcd20e3aa83 --- /dev/null +++ b/html/changelogs/Hellfirejag-HardsuitSoundVariety.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - soundadd: "Added 'medium', 'heavy', and 'chonk' alternate sounds for hardsuits. Many pre-existing hardsuits now use heavier sounds depending on type." diff --git a/sound/attributions.txt b/sound/attributions.txt index d4a4403f1e6..871d69fb10d 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -163,3 +163,9 @@ sound/music/lobby/lights_edge/lights_edge_2.ogg - "Running From The Wendigo" by sound/music/lobby/dangerous_space/dangerous_space_1.ogg - "You Can't Kill The Boogeyman" by Karl Casey, licensed under CC BY 3.0. Obtained From https://karlcasey.bandcamp.com/track/you-can-t-kill-the-boogeyman sound/music/lobby/dangerous_space/dangerous_space_2.ogg - "Prison Planet" by Karl Casey, licensed under CC BY 3.0. Obtained from https://karlcasey.bandcamp.com/track/prison-planet ATTRIBUTIONS SECTION END + +ATTRIBUTIONS SECTION START +sound/machines/rig/rigstep_chonk.ogg - by majormoth(Discord), licensed under CC-BY-SA-3.0 +sound/machines/rig/rigstep_heavy.ogg - by majormoth(Discord), licensed under CC-BY-SA-3.0 +sound/machines/rig/rigstep_medium.ogg - by majormoth(Discord), licensed under CC-BY-SA-3.0 +ATTRIBUTIONS SECTION END diff --git a/sound/machines/rig/rigstep_chonk.ogg b/sound/machines/rig/rigstep_chonk.ogg new file mode 100644 index 00000000000..343ee26ea2a Binary files /dev/null and b/sound/machines/rig/rigstep_chonk.ogg differ diff --git a/sound/machines/rig/rigstep_heavy.ogg b/sound/machines/rig/rigstep_heavy.ogg new file mode 100644 index 00000000000..22dc965533b Binary files /dev/null and b/sound/machines/rig/rigstep_heavy.ogg differ diff --git a/sound/machines/rig/rigstep_medium.ogg b/sound/machines/rig/rigstep_medium.ogg new file mode 100644 index 00000000000..2209e86da5f Binary files /dev/null and b/sound/machines/rig/rigstep_medium.ogg differ