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.

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

Re-Enable Clown/Mime Hardsuit and Clown Snoring #1324

Merged
merged 5 commits into from
Dec 11, 2024
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -1043,9 +1043,9 @@
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
#- type: Construction # DeltaV - Prevent clowns from making the hardsuit
# graph: ClownHardsuit
# node: clownHardsuit
- type: Construction
graph: ClownHardsuit
node: clownHardsuit
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitClown

Expand All @@ -1060,9 +1060,9 @@
sprite: Clothing/OuterClothing/Hardsuits/mime.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/mime.rsi
# - type: Construction # DeltaV - Nuh uh
# graph: MimeHardsuit
# node: mimeHardsuit
- type: Construction
graph: MimeHardsuit
node: mimeHardsuit
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitMime

Expand Down
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
#- type: constructionGraph # DeltaV - Nuh uh
# id: MimeHardsuit
# start: start
# graph:
# - node: start
# edges:
# - to: mimeHardsuit
# steps:
# - material: Cloth
# amount: 5
# doAfter: 1
# - tag: SuitEVA
# name: An EVA suit
# icon:
# sprite: Clothing/OuterClothing/Suits/eva.rsi
# state: icon
# doAfter: 1
# - tag: HelmetEVA
# name: An EVA helmet
# icon:
# sprite: Clothing/Head/Helmets/eva.rsi
# state: icon
# doAfter: 1
# - tag: CrayonRed
# name: red crayon
# icon:
# sprite: Objects/Fun/crayons.rsi
# state: red
# doAfter: 1
# - tag: CrayonBlack
# name: black crayon
# icon:
# sprite: Objects/Fun/crayons.rsi
# state: black
# doAfter: 1
# - tag: MimeBelt
# name: suspenders
# icon:
# sprite: Clothing/Belt/suspenders.rsi
# state: icon
# doAfter: 1
# - node: mimeHardsuit
# entity: ClothingOuterHardsuitMime
- type: constructionGraph
id: MimeHardsuit
start: start
graph:
- node: start
edges:
- to: mimeHardsuit
steps:
- material: Cloth
amount: 5
doAfter: 1
- tag: SuitEVA
name: An EVA suit
icon:
sprite: Clothing/OuterClothing/Suits/eva.rsi
state: icon
doAfter: 1
- tag: HelmetEVA
name: An EVA helmet
icon:
sprite: Clothing/Head/Helmets/eva.rsi
state: icon
doAfter: 1
- tag: CrayonRed
name: red crayon
icon:
sprite: Objects/Fun/crayons.rsi
state: red
doAfter: 1
- tag: CrayonBlack
name: black crayon
icon:
sprite: Objects/Fun/crayons.rsi
state: black
doAfter: 1
- tag: MimeBelt
name: suspenders
icon:
sprite: Clothing/Belt/suspenders.rsi
state: icon
doAfter: 1
- node: mimeHardsuit
entity: ClothingOuterHardsuitMime
40 changes: 20 additions & 20 deletions Resources/Prototypes/Recipes/Construction/clothing.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# - type: construction # DeltaV - Prevent clowns from making the hardsuit
# name: clown hardsuit
# id: ClownHardsuit
# graph: ClownHardsuit
# startNode: start
# targetNode: clownHardsuit
# category: construction-category-clothing
# description: A modified hardsuit fit for a clown.
# icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon }
# objectType: Item
- type: construction
name: clown vacsuit
id: ClownHardsuit
graph: ClownHardsuit
startNode: start
targetNode: clownHardsuit
category: construction-category-clothing
description: A modified vacsuit fit for a clown.
icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon }
objectType: Item

#- type: construction # DeltaV - No mimes either
# name: mime hardsuit
# id: MimeHardsuit
# graph: MimeHardsuit
# startNode: start
# targetNode: mimeHardsuit
# category: construction-category-clothing
# description: A modified hardsuit fit for a mime.
# icon: { sprite: Clothing/OuterClothing/Hardsuits/mime.rsi, state: icon }
# objectType: Item
- type: construction
name: mime vacsuit
id: MimeHardsuit
graph: MimeHardsuit
startNode: start
targetNode: mimeHardsuit
category: construction-category-clothing
description: A modified vacsuit fit for a mime.
icon: { sprite: Clothing/OuterClothing/Hardsuits/mime.rsi, state: icon }
objectType: Item

- type: construction
name: bone armor
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
Piercing: 4
groups:
Burn: 3
# DeltaV - Commenting out the clown snore sound because I am not fond of it (it makes me itchy and feral). By "I", I mean Leonardo_DaBepis.
# - type: SleepEmitSound
# snore: /Audio/Voice/Misc/silly_snore.ogg
# interval: 10
- type: SleepEmitSound
snore: /Audio/Voice/Misc/silly_snore.ogg
interval: 10
- type: Snoring # Necessary so SleepEmitSound sound effects play
Comment on lines +26 to +29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sound file triggers my misophonia and every time I hear it I want to scream and go feral, which is not conducive to MRP. This may seem like a strong emotional response to a noise but that's because it is.

- !type:AddImplantSpecial
implants: [ SadTromboneImplant ]

Expand Down
Loading