Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

microdosing debloat: ports item_equipped_movement_rustle from tg and uses it to clean up armor rustles, ports collars #1097

Merged
merged 8 commits into from
Jan 2, 2025
Merged

microdosing debloat: ports item_equipped_movement_rustle from tg and uses it to clean up armor rustles, ports collars #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c6393e
gay s-
kittysmooch Dec 24, 2024
01deabb
hold onto that
kittysmooch Dec 25, 2024
ef55acf
now do the rest of the PR
kittysmooch Dec 26, 2024
9ba9b2c
grrrr bark bark
kittysmooch Dec 27, 2024
4de560d
huh i wonder where that went
kittysmooch Dec 27, 2024
4f9f499
no more runtimes
kittysmooch Dec 27, 2024
7ae0718
Merge branch 'main' into yeah-thats-going-in-my-cringe-collection
kittysmooch Dec 29, 2024
d3cefb7
Merge remote-tracking branch 'upstream/main' into yeah-thats-going-in…
kittysmooch Jan 1, 2025
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
5 changes: 2 additions & 3 deletions _maps/templates/smalldungeons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
/obj/item/clothing/suit/roguetown/armor/plate/bikini = 1,
/obj/item/clothing/suit/roguetown/armor/plate = 1,
/obj/item/clothing/suit/roguetown/armor/longcoat = 2,
/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass = 1,
/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate = 1,


//food
Expand Down Expand Up @@ -322,8 +322,7 @@
/obj/item/clothing/suit/roguetown/armor/plate/bikini = 1,
/obj/item/clothing/suit/roguetown/armor/plate = 1,
/obj/item/clothing/suit/roguetown/armor/longcoat = 2,
/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass = 1,

/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate = 1,
)
lootcount = 1

Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/sound.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@
'sound/ambience/noises/birds (6).ogg',\
'sound/ambience/noises/birds (7).ogg')

#define SFX_CHAIN_STEP "chain_step"
#define SFX_PLATE_STEP "plate_step"
#define SFX_PLATE_COAT_STEP "plate_coat_step"
#define SFX_JINGLE_BELLS "jingle_bells"

#define INTERACTION_SOUND_RANGE_MODIFIER 0
#define EQUIP_SOUND_VOLUME 100
Expand Down
13 changes: 13 additions & 0 deletions code/game/objects/items/rogueitems/bells.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,16 @@
else

return ..()

/obj/item/jingle_bells
name = "jingling bells"
desc = "A set of little bells that make a satifying ring when jostled."
icon = 'icons/roguetown/items/misc.dmi'
icon_state = "bells"
throwforce = 5
dropshrink = 0.5
drop_sound = SFX_JINGLE_BELLS

/obj/item/jingle_bells/Initialize()
. = ..()
AddComponent(/datum/component/item_equipped_movement_rustle, SFX_JINGLE_BELLS)
30 changes: 25 additions & 5 deletions code/game/sound.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,29 @@
soundin = pick('sound/combat/wooshes/blunt/wooshlarge (1).ogg','sound/combat/wooshes/blunt/wooshlarge (2).ogg','sound/combat/wooshes/blunt/wooshlarge (3).ogg')
if("punchwoosh")
soundin = pick('sound/combat/wooshes/punch/punchwoosh (1).ogg','sound/combat/wooshes/punch/punchwoosh (2).ogg','sound/combat/wooshes/punch/punchwoosh (3).ogg')





if(SFX_CHAIN_STEP)
soundin = pick(
'sound/foley/footsteps/armor/chain (1).ogg',
'sound/foley/footsteps/armor/chain (2).ogg',
'sound/foley/footsteps/armor/chain (3).ogg',
)
if(SFX_PLATE_STEP)
soundin = pick(
'sound/foley/footsteps/armor/plate (1).ogg',
'sound/foley/footsteps/armor/plate (2).ogg',
'sound/foley/footsteps/armor/plate (3).ogg',
)
if(SFX_PLATE_COAT_STEP)
soundin = pick(
'sound/foley/footsteps/armor/coatplates (1).ogg',
'sound/foley/footsteps/armor/coatplates (2).ogg',
'sound/foley/footsteps/armor/coatplates (3).ogg',
)
if(SFX_JINGLE_BELLS)
soundin = pick(
'sound/items/jinglebell1.ogg',
'sound/items/jinglebell2.ogg',
'sound/items/jinglebell3.ogg',
'sound/items/jinglebell4.ogg',
)
return soundin
2 changes: 1 addition & 1 deletion code/modules/antagonists/roguetown/villain/lich.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
/obj/item/clothing/shoes/roguetown/boots,
/obj/item/clothing/neck/roguetown/chaincoif,
/obj/item/clothing/cloak/raincloak/mortus,
/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass,
/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate,
/obj/item/clothing/suit/roguetown/shirt/tunic/ucolored,
/obj/item/clothing/wrists/roguetown/bracers,
/obj/item/clothing/gloves/roguetown/chain,
Expand Down
2 changes: 0 additions & 2 deletions code/modules/antagonists/roguetown/villain/vampirelord.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ GLOBAL_LIST_EMPTY(vampire_objects)
armor = list("blunt" = 100, "slash" = 100, "stab" = 90, "piercing" = 0, "fire" = 0, "acid" = 0)
prevent_crits = list(BCLASS_CUT, BCLASS_STAB, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_TWIST)
blocksound = PLATEHIT
do_sound = FALSE
drop_sound = 'sound/foley/dropsound/armor_drop.ogg'
anvilrepair = /datum/skill/craft/armorsmithing
resistance_flags = FIRE_PROOF | ACID_PROOF
Expand Down Expand Up @@ -231,7 +230,6 @@ GLOBAL_LIST_EMPTY(vampire_objects)
nodismemsleeves = TRUE
max_integrity = 500
allowed_sex = list(MALE, FEMALE)
do_sound_plate = TRUE
anvilrepair = /datum/skill/craft/armorsmithing
smeltresult = /obj/item/ingot/steel
equip_delay_self = 40
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packsrogue/Brigand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
/datum/supply_pack/rogue/Brigand/blksteelcuirass
name = "Blacksteel Cuirass"
cost = 50
contains = list(/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass)
contains = list(/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate)


/datum/supply_pack/rogue/Brigand/Bevor
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cargo/packsrogue/Knight.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
/datum/supply_pack/rogue/Knight/blacksteelfullplate
name = "Blacksteel Full plate"
cost = 150
contains = list(/obj/item/clothing/suit/roguetown/armor/blacksteel/platechest)
contains = list(/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_full_plate)

/datum/supply_pack/rogue/Knight/hauberk
name = "Hauberk"
Expand Down Expand Up @@ -95,7 +95,7 @@
/datum/supply_pack/rogue/Knight/blkplatechausses
name = "Blacksteel Plate Chausses"
cost = 100
contains = list(/obj/item/clothing/under/roguetown/blacksteel/platelegs)
contains = list(/obj/item/clothing/under/roguetown/platelegs/blacksteel)

/datum/supply_pack/rogue/Knight/plateboots
name = "Plated boots"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packsrogue/Sellsword.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
/datum/supply_pack/rogue/Sellsword/steelcuirass
name = "Blacksteel Cuirass"
cost = 50
contains = list(/obj/item/clothing/suit/roguetown/armor/blacksteel/cuirass)
contains = list(/obj/item/clothing/suit/roguetown/armor/plate/blacksteel_half_plate)


/datum/supply_pack/rogue/Sellsword/Bevor
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,3 +537,6 @@ BLIND // can't see anything
else
return FALSE
return TRUE

/obj/item/clothing/proc/step_action() //this was made to rewrite clown shoes squeaking
SEND_SIGNAL(src, COMSIG_CLOTHING_STEP_ACTION)
Loading
Loading