From c395add21c6efe40c9c32381be7d427aa3f9b236 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 11:44:41 -0400 Subject: [PATCH 01/27] Everybody needs a kiss added kiss added lick --- .../floofstation/interaction/verbs/noop.ftl | 11 +++++++ .../Floof/Interactions/noop_interactions.yml | 29 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl create mode 100644 Resources/Prototypes/Floof/Interactions/noop_interactions.yml diff --git a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl new file mode 100644 index 00000000000..a206d9c95dc --- /dev/null +++ b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl @@ -0,0 +1,11 @@ +interaction-Kiss-name = Kiss +interaction-Kiss-description = A kiss melts the pains away. +interaction-Kiss-success-self-popup = You kiss {THE($target)}. +interaction-Kiss-success-target-popup = {THE($user)} Kisss you. +interaction-Kiss-success-others-popup = {THE($user)} Kisss {THE($target)}. + +interaction-Lick-name = Lick +interaction-Lick-description = Lick your co-worker, what HR?. +interaction-Lick-success-self-popup = You lick {THE($target)}. +interaction-Lick-success-target-popup = {THE($user)} Licks you. +interaction-Lick-success-others-popup = {THE($user)} Licks {THE($target)}. diff --git a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml new file mode 100644 index 00000000000..f1016a08f9d --- /dev/null +++ b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml @@ -0,0 +1,29 @@ +- type: Interaction + id: Kiss + parent: [BaseGlobal, BaseHands] + priority: 2 + #icon: /Textures/Interface/Actions/hug.png + delay: 0.7 + range: {max: 1} + hideByRequirement: true + requirement: + !type:MobStateRequirement + inverted: true + action: + # TODO: this should pull the target closer or sumth, but I need to code that action first + !type:NoOpAction + +- type: Interaction + id: Lick + parent: [BaseGlobal, BaseHands] + priority: 1 + #icon: /Textures/Interface/Actions/hug.png + delay: 0.4 + range: {max: 1} + hideByRequirement: true + requirement: + !type:MobStateRequirement + inverted: true + action: + !type:NoOpAction + From b202a818b71e9bb10a576348a84d37e80f4227f7 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 15:15:38 -0400 Subject: [PATCH 02/27] Update Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- .../Locale/en-US/floofstation/interaction/verbs/noop.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl index a206d9c95dc..82cfe07f579 100644 --- a/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl +++ b/Resources/Locale/en-US/floofstation/interaction/verbs/noop.ftl @@ -1,11 +1,11 @@ interaction-Kiss-name = Kiss interaction-Kiss-description = A kiss melts the pains away. interaction-Kiss-success-self-popup = You kiss {THE($target)}. -interaction-Kiss-success-target-popup = {THE($user)} Kisss you. -interaction-Kiss-success-others-popup = {THE($user)} Kisss {THE($target)}. +interaction-Kiss-success-target-popup = {THE($user)} kisses you. +interaction-Kiss-success-others-popup = {THE($user)} kisses {THE($target)}. interaction-Lick-name = Lick interaction-Lick-description = Lick your co-worker, what HR?. interaction-Lick-success-self-popup = You lick {THE($target)}. -interaction-Lick-success-target-popup = {THE($user)} Licks you. -interaction-Lick-success-others-popup = {THE($user)} Licks {THE($target)}. +interaction-Lick-success-target-popup = {THE($user)} licks you. +interaction-Lick-success-others-popup = {THE($user)} licks {THE($target)}. From 6bbdf76b7af1d98695d9aa4b14aad1f90a44d70c Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 15:15:54 -0400 Subject: [PATCH 03/27] Update Resources/Prototypes/Floof/Interactions/noop_interactions.yml Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Prototypes/Floof/Interactions/noop_interactions.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml index f1016a08f9d..e6b2f20ee7e 100644 --- a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/noop_interactions.yml @@ -1,8 +1,7 @@ - type: Interaction id: Kiss parent: [BaseGlobal, BaseHands] - priority: 2 - #icon: /Textures/Interface/Actions/hug.png + priority: 0 delay: 0.7 range: {max: 1} hideByRequirement: true From 0358154a3d8557516d51309269b7d75690162934 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Fri, 13 Sep 2024 21:33:16 -0400 Subject: [PATCH 04/27] Updated to add mood modifiers and moved to appropriate files --- Resources/Locale/en-US/Floof/mood/mood.ftl | 3 +++ ...{noop_interactions.yml => mood_interactions.yml} | 13 ++++++++----- .../Floof/Mood/genericPositiveEffects.yml | 12 ++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 Resources/Locale/en-US/Floof/mood/mood.ftl rename Resources/Prototypes/Floof/Interactions/{noop_interactions.yml => mood_interactions.yml} (73%) create mode 100644 Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml diff --git a/Resources/Locale/en-US/Floof/mood/mood.ftl b/Resources/Locale/en-US/Floof/mood/mood.ftl new file mode 100644 index 00000000000..203f3911a39 --- /dev/null +++ b/Resources/Locale/en-US/Floof/mood/mood.ftl @@ -0,0 +1,3 @@ +mood-effect-BeingKissed = That kiss was delightful. + +mood-effect-BeingLicked = I've been Licked! diff --git a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml similarity index 73% rename from Resources/Prototypes/Floof/Interactions/noop_interactions.yml rename to Resources/Prototypes/Floof/Interactions/mood_interactions.yml index e6b2f20ee7e..4c2102e443a 100644 --- a/Resources/Prototypes/Floof/Interactions/noop_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -2,7 +2,7 @@ id: Kiss parent: [BaseGlobal, BaseHands] priority: 0 - delay: 0.7 + delay: 0.4 range: {max: 1} hideByRequirement: true requirement: @@ -10,19 +10,22 @@ inverted: true action: # TODO: this should pull the target closer or sumth, but I need to code that action first - !type:NoOpAction + !type:MoodAction + effect: BeingHugged - type: Interaction id: Lick parent: [BaseGlobal, BaseHands] - priority: 1 + priority: 0 #icon: /Textures/Interface/Actions/hug.png - delay: 0.4 + delay: 0.7 range: {max: 1} hideByRequirement: true requirement: !type:MobStateRequirement inverted: true action: - !type:NoOpAction + # TODO: this should pull the target closer or sumth, but I need to code that action first + !type:MoodAction + effect: BeingHugged diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml new file mode 100644 index 00000000000..4ce5bb3e1f1 --- /dev/null +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -0,0 +1,12 @@ +- type: moodEffect + id: BeingKissed + moodChange: 4 + timeout: 120 + category: PositiveInteraction + + - type: moodEffect + id: BeingLicked + moodChange: 4 + timeout: 120 + category: PositiveInteraction + \ No newline at end of file From 1a3c42280e3ed33d9d920784c1dc62505a4aa7ad Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 14 Sep 2024 00:52:06 -0400 Subject: [PATCH 05/27] fixing a yml white space issue --- Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml index 4ce5bb3e1f1..98fb16133a8 100644 --- a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -4,7 +4,7 @@ timeout: 120 category: PositiveInteraction - - type: moodEffect +- type: moodEffect id: BeingLicked moodChange: 4 timeout: 120 From 0123900512e65fb48f5351bace098e8aa321419c Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 14 Sep 2024 09:08:14 -0400 Subject: [PATCH 06/27] maybe this white space. --- Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml index 98fb16133a8..9646bf40f83 100644 --- a/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml +++ b/Resources/Prototypes/Floof/Mood/genericPositiveEffects.yml @@ -3,10 +3,9 @@ moodChange: 4 timeout: 120 category: PositiveInteraction - + - type: moodEffect id: BeingLicked moodChange: 4 timeout: 120 category: PositiveInteraction - \ No newline at end of file From fb9928a9ebb7afb3ff5eef8583f71cdb462897e2 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Mon, 16 Sep 2024 16:38:28 -0400 Subject: [PATCH 07/27] Update mood_interactions.yml --- Resources/Prototypes/Floof/Interactions/mood_interactions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml index 4c2102e443a..1f23901090e 100644 --- a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -11,7 +11,7 @@ action: # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction - effect: BeingHugged + effect: BeingKissed - type: Interaction id: Lick @@ -27,5 +27,5 @@ action: # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction - effect: BeingHugged + effect: BeingLicked From 2af2cb82501a78896434acb9d0bfc9a2c9746da9 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Thu, 19 Sep 2024 18:32:11 -0400 Subject: [PATCH 08/27] adding audio for kiss and lick --- Resources/Audio/Floof/Lewd/kiss.ogg | Bin 0 -> 7039 bytes Resources/Audio/Floof/Lewd/lick.ogg | Bin 0 -> 6808 bytes .../Prototypes/Floof/Interactions/base.yml | 29 ++++++++++++++++++ .../Floof/Interactions/mood_interactions.yml | 4 +-- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Resources/Audio/Floof/Lewd/kiss.ogg create mode 100644 Resources/Audio/Floof/Lewd/lick.ogg create mode 100644 Resources/Prototypes/Floof/Interactions/base.yml diff --git a/Resources/Audio/Floof/Lewd/kiss.ogg b/Resources/Audio/Floof/Lewd/kiss.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3a342a33570dac98953bef83b7e11a7a63ef5533 GIT binary patch literal 7039 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/Floof/Lewd/lick.ogg b/Resources/Audio/Floof/Lewd/lick.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8aee9bb0443e6c967ebb7c9cd829c4686e0e3f64 GIT binary patch literal 6808 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 Date: Sat, 28 Sep 2024 00:01:29 -0400 Subject: [PATCH 09/27] applying requested changes from PR --- .../Prototypes/Floof/Interactions/base.yml | 29 ------------------- .../Floof/Interactions/mood_interactions.yml | 15 ++++++---- 2 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 Resources/Prototypes/Floof/Interactions/base.yml diff --git a/Resources/Prototypes/Floof/Interactions/base.yml b/Resources/Prototypes/Floof/Interactions/base.yml deleted file mode 100644 index 0f890eac22f..00000000000 --- a/Resources/Prototypes/Floof/Interactions/base.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Base interaction that involves hands -- type: Interaction - id: BaseLips - abstract: true - requiresCanInteract: true - contactInteraction: true - range: - max: 1.2 - effectSuccess: - popup: Obvious - sound: {path: /Audio/Floof/Lewd/kiss.ogg} - effectFailure: - popup: Fail - sound: {path: /Audio/Floof/Lewd/kiss.ogg} - -# Base interaction that involves hands -- type: Interaction - id: BaseTongue - abstract: true - requiresCanInteract: true - contactInteraction: true - range: - max: 1.2 - effectSuccess: - popup: Obvious - sound: {path: /Audio/Floof/Lewd/lick.ogg} - effectFailure: - popup: Fail - sound: {path: /Audio/Floof/Lewd/lick.ogg} diff --git a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml index 97527b875c7..ec43dd4564d 100644 --- a/Resources/Prototypes/Floof/Interactions/mood_interactions.yml +++ b/Resources/Prototypes/Floof/Interactions/mood_interactions.yml @@ -1,7 +1,7 @@ - type: Interaction id: Kiss - parent: [BaseGlobal, BaseLips] - priority: 0 + parent: [BaseGlobal, BaseHands] + priority: -1 delay: 0.4 range: {max: 1} hideByRequirement: true @@ -12,11 +12,14 @@ # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction effect: BeingKissed + effectSuccess: + popup: Obvious + sound: {path: /Audio/Floof/Lewd/kiss.ogg} - type: Interaction id: Lick - parent: [BaseGlobal, BaseTongue] - priority: 0 + parent: [BaseGlobal, BaseHands] + priority: -2 #icon: /Textures/Interface/Actions/hug.png delay: 0.7 range: {max: 1} @@ -28,4 +31,6 @@ # TODO: this should pull the target closer or sumth, but I need to code that action first !type:MoodAction effect: BeingLicked - + effectSuccess: + popup: Obvious + sound: {path: /Audio/Floof/Lewd/lick.ogg} From dadeb948925b8407949ad5e07c1ccb1da7fc80cc Mon Sep 17 00:00:00 2001 From: Fansana <116083121+Fansana@users.noreply.github.com> Date: Sun, 29 Sep 2024 04:15:10 +0200 Subject: [PATCH 10/27] Update Rslimes.yml --- .../Prototypes/Entities/Mobs/NPCs/Rslimes.yml | 70 +------------------ 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml index 03ce5a04e6e..d2b2791a0d6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml @@ -218,72 +218,4 @@ - map: [ "enum.DamageStateVisualLayers.Base" ] state: alive color: "#c6c8cc" - -- type: entity - id: reagentslimeVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 1 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: ReagentSlime - prob: 0.01 - - id: ReagentSlimeBeer - prob: 0.01 - - id: ReagentSlimePax - prob: 0.01 - - id: ReagentSlimeNocturine - prob: 0.01 - - id: ReagentSlimeTHC - prob: 0.01 - - id: ReagentSlimeBicaridine - prob: 0.01 - - id: ReagentSlimeToxin - prob: 0.01 - - id: ReagentSlimeNapalm - prob: 0.01 - - id: ReagentSlimeOmnizine - prob: 0.01 - - id: ReagentSlimeMuteToxin - prob: 0.01 - - id: ReagentSlimeNorepinephricAcid - prob: 0.01 - - id: ReagentSlimeEphedrine - prob: 0.01 - - id: ReagentSlimeRobustHarvest - prob: 0.01 - - id: ReagentSlimeIchor - prob: 0.01 - - id: ReagentSlimeBleach - prob: 0.01 - - id: ReagentSlimeSoap - prob: 0.01 - - id: ReagentSlimeSpacelube - prob: 0.01 - - id: ReagentSlimeBuzzachloricbees - prob: 0.01 - - id: ReagentSlimeWehjuice - prob: 0.01 - - id: ReagentCognizine - prob: 0.01 - - id: ReagentSlimeNecrosol - prob: 0.01 - - id: ReagentSlimeSpaceDrugs - prob: 0.01 - - id: ReagentSlimeUnstableMutagen - prob: 0.01 - - id: ReagentSlimeLead - prob: 0.01 - - id: ReagentSlimechlorinetriflouride - prob: 0.01 - - id: ReagentSlimePotassium - prob: 0.01 - - id: ReagentSlimeLotophagoiOil - prob: 0.01 + From 6c4b560ae61986636519ff3d84bb19dc2067794e Mon Sep 17 00:00:00 2001 From: fox Date: Sun, 29 Sep 2024 05:15:15 +0300 Subject: [PATCH 11/27] Lewd & fun loadouts --- .../en-US/Floof/loadouts/categories.ftl | 1 + .../en-US/Floof/loadouts/itemgroups.ftl | 2 + .../Floof/CharacterItemGroups/funGroup.yml | 46 +++++ .../Floof/Entities/Objects/Tools/leash.yml | 1 + .../Floof/Loadouts/Categories/categories.yml | 4 + Resources/Prototypes/Floof/Loadouts/items.yml | 31 +++ .../Prototypes/Floof/Loadouts/itemsLewd.yml | 181 ++++++++++++++++++ Resources/Prototypes/Floof/Loadouts/neck.yml | 11 ++ 8 files changed, 277 insertions(+) create mode 100644 Resources/Locale/en-US/Floof/loadouts/categories.ftl create mode 100644 Resources/Prototypes/Floof/CharacterItemGroups/funGroup.yml create mode 100644 Resources/Prototypes/Floof/Loadouts/Categories/categories.yml create mode 100644 Resources/Prototypes/Floof/Loadouts/itemsLewd.yml diff --git a/Resources/Locale/en-US/Floof/loadouts/categories.ftl b/Resources/Locale/en-US/Floof/loadouts/categories.ftl new file mode 100644 index 00000000000..b1b74a0baec --- /dev/null +++ b/Resources/Locale/en-US/Floof/loadouts/categories.ftl @@ -0,0 +1 @@ +loadout-category-ItemsLewd = Lewd diff --git a/Resources/Locale/en-US/Floof/loadouts/itemgroups.ftl b/Resources/Locale/en-US/Floof/loadouts/itemgroups.ftl index d9e7ba83b31..845d5d890d1 100644 --- a/Resources/Locale/en-US/Floof/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/Floof/loadouts/itemgroups.ftl @@ -6,3 +6,5 @@ character-item-group-LoadoutNeck2 = Civilian Neckwear character-item-group-LoadoutOuter2 = Civilian Outerwear character-item-group-LoadoutShoes2 = Civilian Shoes character-item-group-LoadoutUniformsCivilian2 = Civilian Uniforms +character-item-group-LoadoutFun = Fun +character-item-group-LoadoutLewd = Lewd diff --git a/Resources/Prototypes/Floof/CharacterItemGroups/funGroup.yml b/Resources/Prototypes/Floof/CharacterItemGroups/funGroup.yml new file mode 100644 index 00000000000..9bcedff2c23 --- /dev/null +++ b/Resources/Prototypes/Floof/CharacterItemGroups/funGroup.yml @@ -0,0 +1,46 @@ +- type: characterItemGroup + id: LoadoutFun + items: + - type: loadout + id: LoadoutItemLeashBasic + - type: loadout + id: LoadoutItemLeashShort + +# If you are ever going to add more: open regex101; in list mode, find "id: (.+)", replace with "- type: loadout\n id: $1\n", paste the result here +- type: characterItemGroup + id: LoadoutLewd + items: + - type: loadout + id: LoadoutItemLewdWand + - type: loadout + id: LoadoutItemLewdVibeGreen + - type: loadout + id: LoadoutItemLewdVibeTeal + - type: loadout + id: LoadoutItemLewdVibePink + - type: loadout + id: LoadoutItemLewdVibeRed + - type: loadout + id: LoadoutItemLewdVibeYellow + - type: loadout + id: LoadoutItemLewdFleshlightGreen + - type: loadout + id: LoadoutItemLewdFleshlightTeal + - type: loadout + id: LoadoutItemLewdFleshlightPink + - type: loadout + id: LoadoutItemLewdFleshlightRed + - type: loadout + id: LoadoutItemLewdFleshlightYellow + - type: loadout + id: LoadoutItemWhipPink + - type: loadout + id: LoadoutItemWhipTeal + - type: loadout + id: LoadoutItemWhipPinkCrotch + - type: loadout + id: LoadoutItemWhipTealCrotch + - type: loadout + id: LoadoutItemSpankPinkPaddle + - type: loadout + id: LoadoutItemSpankTealPaddle diff --git a/Resources/Prototypes/Floof/Entities/Objects/Tools/leash.yml b/Resources/Prototypes/Floof/Entities/Objects/Tools/leash.yml index c674d92913b..61609d781e2 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Tools/leash.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Tools/leash.yml @@ -26,6 +26,7 @@ detachDelay: 4 selfDetachDelay: 10 +# TODO this should be named LeashShort... - type: entity id: ShortLeash parent: BaseLeash diff --git a/Resources/Prototypes/Floof/Loadouts/Categories/categories.yml b/Resources/Prototypes/Floof/Loadouts/Categories/categories.yml new file mode 100644 index 00000000000..bba2370f90d --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/Categories/categories.yml @@ -0,0 +1,4 @@ +# TODO make this a subcategory of items when EE splits items into subcategories +- type: loadoutCategory + id: ItemsLewd + root: true diff --git a/Resources/Prototypes/Floof/Loadouts/items.yml b/Resources/Prototypes/Floof/Loadouts/items.yml index 589648174cc..0cec29c6be0 100644 --- a/Resources/Prototypes/Floof/Loadouts/items.yml +++ b/Resources/Prototypes/Floof/Loadouts/items.yml @@ -11,3 +11,34 @@ cost: 0 items: - ClothingBeltSuspenders + +- type: loadout + id: LoadoutItemRemoteSignaller + category: Items + cost: 1 + items: + - RemoteSignaller + +# Leashes +- type: loadout + id: LoadoutItemLeashBasic + category: Items + cost: 2 + exclusive: true + items: + - LeashBasic + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutFun + +- type: loadout + id: LoadoutItemLeashShort + category: Items + cost: 2 + exclusive: true + items: + - ShortLeash + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutFun + diff --git a/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml b/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml new file mode 100644 index 00000000000..f45aef76144 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml @@ -0,0 +1,181 @@ +# Note: only explicitly lewd items go into this category. +# Items with ambiguous uses like leashes should go into Items + +# Wands +- type: loadout + id: LoadoutItemLewdWand + category: ItemsLewd + cost: 2 + exclusive: true + items: + - LewdWand + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdVibeGreen + category: ItemsLewd + cost: 2 + exclusive: true + items: + - LewdVibeGreen + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdVibeTeal + category: ItemsLewd + cost: 2 + exclusive: true + items: + - LewdVibeTeal + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdVibePink + category: ItemsLewd + cost: 2 + exclusive: true + items: + - LewdVibePink + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutFun + +- type: loadout + id: LoadoutItemLewdVibeRed + category: ItemsLewd + cost: 2 + exclusive: true + items: + - LewdVibeRed + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdVibeYellow + category: ItemsLewd + cost: 2 + exclusive: true + items: + - LewdVibeYellow + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +# Fleshlights +- type: loadout + id: LoadoutItemLewdFleshlightGreen + category: ItemsLewd + cost: 0 + items: + - LewdFleshlightGreen + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdFleshlightTeal + category: ItemsLewd + cost: 2 + items: + - LewdFleshlightTeal + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdFleshlightPink + category: ItemsLewd + cost: 2 + items: + - LewdFleshlightPink + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdFleshlightRed + category: ItemsLewd + cost: 2 + items: + - LewdFleshlightRed + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemLewdFleshlightYellow + category: ItemsLewd + cost: 2 + items: + - LewdFleshlightYellow + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +# Whips +- type: loadout + id: LoadoutItemWhipPink + category: ItemsLewd + cost: 2 + items: + - WhipPink + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemWhipTeal + category: ItemsLewd + cost: 2 + items: + - WhipTeal + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemWhipPinkCrotch + category: ItemsLewd + cost: 2 + items: + - WhipPinkCrotch + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemWhipTealCrotch + category: ItemsLewd + cost: 2 + items: + - WhipTealCrotch + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemSpankPinkPaddle + category: ItemsLewd + cost: 2 + items: + - SpankPinkPaddle + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd + +- type: loadout + id: LoadoutItemSpankTealPaddle + category: ItemsLewd + cost: 2 + items: + - SpankTealPaddle + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLewd diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index 43cafedef76..482270e6dbf 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -53,3 +53,14 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutNeck2 + +- type: loadout + id: LoadoutItemsNeckShockCollar + category: Neck + cost: 1 + exclusive: true + items: + - ShockCollar + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeck2 From 9729c1bdd2e0d4a81ebd94da3738c2b8b54fb3d3 Mon Sep 17 00:00:00 2001 From: fox Date: Sun, 29 Sep 2024 05:30:27 +0300 Subject: [PATCH 12/27] Fix --- Resources/Prototypes/Floof/Loadouts/itemsLewd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml b/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml index f45aef76144..b3e6dcefc62 100644 --- a/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml +++ b/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml @@ -44,7 +44,7 @@ - LewdVibePink requirements: - !type:CharacterItemGroupRequirement - group: LoadoutFun + group: LoadoutLewd - type: loadout id: LoadoutItemLewdVibeRed From cb2fa5eddf7485ed70f2647330cdd1986b866e47 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Sun, 29 Sep 2024 02:41:41 +0000 Subject: [PATCH 13/27] Automatic Changelog Update (#179) --- Resources/Changelog/Floof.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 4b1cdfd23d9..dc24f01dae1 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1090,3 +1090,10 @@ Entries: id: 146 time: '2024-09-28T11:51:55.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/215 +- author: neuPanda + changes: + - type: Add + message: Kiss an Lick + id: 147 + time: '2024-09-29T02:41:17.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/179 From 1b36e741270923624c5aba8ed3c60618676929f8 Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sun, 29 Sep 2024 05:57:02 +0300 Subject: [PATCH 14/27] Update Resources/Prototypes/Floof/Loadouts/itemsLewd.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- Resources/Prototypes/Floof/Loadouts/itemsLewd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml b/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml index b3e6dcefc62..fb00f999dc3 100644 --- a/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml +++ b/Resources/Prototypes/Floof/Loadouts/itemsLewd.yml @@ -72,7 +72,7 @@ - type: loadout id: LoadoutItemLewdFleshlightGreen category: ItemsLewd - cost: 0 + cost: 2 items: - LewdFleshlightGreen requirements: From 79db97efde550efc9c67512a817a6b08a0da88db Mon Sep 17 00:00:00 2001 From: Fansana Date: Sun, 29 Sep 2024 18:39:00 +0200 Subject: [PATCH 15/27] Revert "Update Rslimes.yml" This reverts commit dadeb948925b8407949ad5e07c1ccb1da7fc80cc. --- .../Prototypes/Entities/Mobs/NPCs/Rslimes.yml | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml index d2b2791a0d6..03ce5a04e6e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml @@ -218,4 +218,72 @@ - map: [ "enum.DamageStateVisualLayers.Base" ] state: alive color: "#c6c8cc" - + +- type: entity + id: reagentslimeVents + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + startAnnouncement: true + earliestStart: 20 + reoccurrenceDelay: 12 + minimumPlayers: 1 + weight: 6 # Really weak compared to other critters + duration: 60 + - type: VentCrittersRule + entries: + - id: ReagentSlime + prob: 0.01 + - id: ReagentSlimeBeer + prob: 0.01 + - id: ReagentSlimePax + prob: 0.01 + - id: ReagentSlimeNocturine + prob: 0.01 + - id: ReagentSlimeTHC + prob: 0.01 + - id: ReagentSlimeBicaridine + prob: 0.01 + - id: ReagentSlimeToxin + prob: 0.01 + - id: ReagentSlimeNapalm + prob: 0.01 + - id: ReagentSlimeOmnizine + prob: 0.01 + - id: ReagentSlimeMuteToxin + prob: 0.01 + - id: ReagentSlimeNorepinephricAcid + prob: 0.01 + - id: ReagentSlimeEphedrine + prob: 0.01 + - id: ReagentSlimeRobustHarvest + prob: 0.01 + - id: ReagentSlimeIchor + prob: 0.01 + - id: ReagentSlimeBleach + prob: 0.01 + - id: ReagentSlimeSoap + prob: 0.01 + - id: ReagentSlimeSpacelube + prob: 0.01 + - id: ReagentSlimeBuzzachloricbees + prob: 0.01 + - id: ReagentSlimeWehjuice + prob: 0.01 + - id: ReagentCognizine + prob: 0.01 + - id: ReagentSlimeNecrosol + prob: 0.01 + - id: ReagentSlimeSpaceDrugs + prob: 0.01 + - id: ReagentSlimeUnstableMutagen + prob: 0.01 + - id: ReagentSlimeLead + prob: 0.01 + - id: ReagentSlimechlorinetriflouride + prob: 0.01 + - id: ReagentSlimePotassium + prob: 0.01 + - id: ReagentSlimeLotophagoiOil + prob: 0.01 From 6d0a6acea27414f470056029cc476fc61981c69f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 29 Sep 2024 01:30:26 -0400 Subject: [PATCH 16/27] resolve conflict --- .../Prototypes/Entities/Mobs/NPCs/Rslimes.yml | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml index 03ce5a04e6e..0f50c62cf0b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml @@ -218,7 +218,7 @@ - map: [ "enum.DamageStateVisualLayers.Base" ] state: alive color: "#c6c8cc" - + - type: entity id: reagentslimeVents parent: BaseGameRule @@ -234,56 +234,56 @@ - type: VentCrittersRule entries: - id: ReagentSlime - prob: 0.01 + prob: 0.002 - id: ReagentSlimeBeer - prob: 0.01 + prob: 0.002 - id: ReagentSlimePax - prob: 0.01 + prob: 0.002 - id: ReagentSlimeNocturine - prob: 0.01 + prob: 0.002 - id: ReagentSlimeTHC - prob: 0.01 + prob: 0.002 - id: ReagentSlimeBicaridine - prob: 0.01 + prob: 0.002 - id: ReagentSlimeToxin - prob: 0.01 + prob: 0.002 - id: ReagentSlimeNapalm - prob: 0.01 + prob: 0.002 - id: ReagentSlimeOmnizine - prob: 0.01 + prob: 0.002 - id: ReagentSlimeMuteToxin - prob: 0.01 + prob: 0.002 - id: ReagentSlimeNorepinephricAcid - prob: 0.01 + prob: 0.002 - id: ReagentSlimeEphedrine - prob: 0.01 + prob: 0.002 - id: ReagentSlimeRobustHarvest - prob: 0.01 + prob: 0.002 - id: ReagentSlimeIchor - prob: 0.01 + prob: 0.002 - id: ReagentSlimeBleach - prob: 0.01 + prob: 0.002 - id: ReagentSlimeSoap - prob: 0.01 + prob: 0.002 - id: ReagentSlimeSpacelube - prob: 0.01 + prob: 0.002 - id: ReagentSlimeBuzzachloricbees - prob: 0.01 + prob: 0.002 - id: ReagentSlimeWehjuice - prob: 0.01 + prob: 0.002 - id: ReagentCognizine - prob: 0.01 + prob: 0.002 - id: ReagentSlimeNecrosol - prob: 0.01 + prob: 0.002 - id: ReagentSlimeSpaceDrugs - prob: 0.01 + prob: 0.002 - id: ReagentSlimeUnstableMutagen - prob: 0.01 + prob: 0.002 - id: ReagentSlimeLead - prob: 0.01 + prob: 0.002 - id: ReagentSlimechlorinetriflouride - prob: 0.01 + prob: 0.002 - id: ReagentSlimePotassium - prob: 0.01 + prob: 0.002 - id: ReagentSlimeLotophagoiOil - prob: 0.01 + prob: 0.002 From fed7979b4f57bd07bc2e8695270f0808626733fb Mon Sep 17 00:00:00 2001 From: Fansana <116083121+Fansana@users.noreply.github.com> Date: Sun, 29 Sep 2024 18:56:48 +0200 Subject: [PATCH 17/27] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b2547ec7343..3655d448e5d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # Floofstation CODEOWNERS -* @Memeji @FoxxoTrystan +* @Fansana @Memeji @FoxxoTrystan From 00c5903768935dfceba7d6a63b05440329e12fa3 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Sun, 29 Sep 2024 17:16:46 +0000 Subject: [PATCH 18/27] Automatic Changelog Update (#218) --- Resources/Changelog/Floof.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index dc24f01dae1..a66c03f8763 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1097,3 +1097,10 @@ Entries: id: 147 time: '2024-09-29T02:41:17.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/179 +- author: Fansana + changes: + - type: Tweak + message: nerf reagent slimes + id: 148 + time: '2024-09-29T17:16:22.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/218 From a05d419bcbe63785959b91d68a8cbb07b1c1ab69 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Sun, 29 Sep 2024 12:20:44 -0600 Subject: [PATCH 19/27] Update Rslimes.yml slime fix --- .../Prototypes/Entities/Mobs/NPCs/Rslimes.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml index 0f50c62cf0b..351c2f8f453 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml @@ -228,7 +228,7 @@ startAnnouncement: true earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 1 + minimumPlayers: 30 weight: 6 # Really weak compared to other critters duration: 60 - type: VentCrittersRule @@ -236,11 +236,11 @@ - id: ReagentSlime prob: 0.002 - id: ReagentSlimeBeer - prob: 0.002 + prob: 0.003 - id: ReagentSlimePax - prob: 0.002 + prob: 0.001 - id: ReagentSlimeNocturine - prob: 0.002 + prob: 0.001 - id: ReagentSlimeTHC prob: 0.002 - id: ReagentSlimeBicaridine @@ -250,7 +250,7 @@ - id: ReagentSlimeNapalm prob: 0.002 - id: ReagentSlimeOmnizine - prob: 0.002 + prob: 0.003 - id: ReagentSlimeMuteToxin prob: 0.002 - id: ReagentSlimeNorepinephricAcid @@ -258,7 +258,7 @@ - id: ReagentSlimeEphedrine prob: 0.002 - id: ReagentSlimeRobustHarvest - prob: 0.002 + prob: 0.003 - id: ReagentSlimeIchor prob: 0.002 - id: ReagentSlimeBleach @@ -270,20 +270,20 @@ - id: ReagentSlimeBuzzachloricbees prob: 0.002 - id: ReagentSlimeWehjuice - prob: 0.002 + prob: 0.003 - id: ReagentCognizine - prob: 0.002 + prob: 0.003 - id: ReagentSlimeNecrosol prob: 0.002 - id: ReagentSlimeSpaceDrugs - prob: 0.002 + prob: 0.003 - id: ReagentSlimeUnstableMutagen - prob: 0.002 + prob: 0.001 - id: ReagentSlimeLead - prob: 0.002 + prob: 0.001 - id: ReagentSlimechlorinetriflouride prob: 0.002 - id: ReagentSlimePotassium prob: 0.002 - id: ReagentSlimeLotophagoiOil - prob: 0.002 + prob: 0.003 From fdda6339add25d16361e64363ec39b9d6e0acfa2 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Sun, 29 Sep 2024 12:21:18 -0600 Subject: [PATCH 20/27] Update xenopet.yml vent fix --- .../Prototypes/Entities/Mobs/NPCs/xenopet.yml | 52 ++++++++----------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml index 09dd78c6c0d..88a3cc24b22 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml @@ -352,16 +352,14 @@ duration: 60 - type: VentCrittersRule entries: - - id: MobXeno - prob: 0.01 - id: MobXenoNeutralRouny - prob: 0.005 + prob: 0.008 - id: MobXenoNeutralDrone - prob: 0.005 + prob: 0.008 - id: MobXenoNeutralPraetorian - prob: 0.005 + prob: 0.008 - id: MobXenoNeutralRavager - prob: 0.005 + prob: 0.008 - type: entity id: ArgocyteVents @@ -372,37 +370,35 @@ startAnnouncement: true earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 12 + minimumPlayers: 30 weight: 6 # Really weak compared to other critters duration: 60 - type: VentCrittersRule entries: - - id: BaseMobArgocyte - prob: 0.01 - id: MobArgocyteSlurva - prob: 0.005 + prob: 0.003 - id: MobArgocyteBarrier - prob: 0.005 + prob: 0.003 - id: MobArgocyteSkitter - prob: 0.005 + prob: 0.003 - id: MobArgocyteSwiper - prob: 0.005 + prob: 0.003 - id: MobArgocyteMolder - prob: 0.01 + prob: 0.003 - id: MobArgocytePouncer - prob: 0.005 + prob: 0.003 - id: MobArgocyteGlider - prob: 0.005 + prob: 0.003 - id: MobArgocyteHarvester - prob: 0.005 + prob: 0.003 - id: MobArgocyteCrawler - prob: 0.005 + prob: 0.003 - id: MobArgocyteEnforcer - prob: 0.005 + prob: 0.003 - id: MobArgocyteFounder - prob: 0.005 + prob: 0.003 - id: MobArgocyteLeviathing - prob: 0.005 + prob: 0.001 - type: entity id: MeatVents @@ -413,13 +409,11 @@ startAnnouncement: true earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 12 + minimumPlayers: 20 weight: 6 # Really weak compared to other critters duration: 60 - type: VentCrittersRule entries: - - id: BaseMobFlesh - prob: 0.01 - id: MobFleshJared prob: 0.005 - id: MobFleshGolem @@ -457,7 +451,7 @@ startAnnouncement: true earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 12 + minimumPlayers: 20 weight: 6 # Really weak compared to other critters duration: 60 - type: VentCrittersRule @@ -467,11 +461,11 @@ - id: MobCarpMagic prob: 0.01 - id: MobCarpHolo - prob: 0.01 + prob: 0.008 - id: MobCarpRainbow prob: 0.01 - id: MobShark - prob: 0.01 + prob: 0.008 - id: MobCarpDragon prob: 0.01 @@ -484,7 +478,7 @@ startAnnouncement: true earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 12 + minimumPlayers: 20 weight: 6 # Really weak compared to other critters duration: 60 - type: VentCrittersRule @@ -507,7 +501,7 @@ startAnnouncement: true earliestStart: 20 reoccurrenceDelay: 12 - minimumPlayers: 12 + minimumPlayers: 20 weight: 6 # Really weak compared to other critters duration: 60 - type: VentCrittersRule From b7ca78f21330fb46e3b40601f3be9931049cf0ee Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Sun, 29 Sep 2024 18:26:48 +0000 Subject: [PATCH 21/27] Automatic Changelog Update (#219) --- Resources/Changelog/Floof.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index a66c03f8763..82991d0c3f5 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1104,3 +1104,10 @@ Entries: id: 148 time: '2024-09-29T17:16:22.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/218 +- author: fenndragon + changes: + - type: Tweak + message: 'Tweaked spawn rates of Various Ventcritter Spawn events ' + id: 149 + time: '2024-09-29T18:26:23.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/219 From b3694fa1545617c2a73d0ac9c61facc39ef51ee6 Mon Sep 17 00:00:00 2001 From: Fansana Date: Sun, 29 Sep 2024 20:35:42 +0200 Subject: [PATCH 22/27] no --- .../Prototypes/Entities/Mobs/NPCs/Rslimes.yml | 579 ++++----- .../Prototypes/Entities/Mobs/NPCs/xenopet.yml | 1068 ++++++++--------- 2 files changed, 824 insertions(+), 823 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml index 351c2f8f453..dbfb1f14e0d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml @@ -1,289 +1,290 @@ -- type: entity - id: ReagentSlimeIchor - parent: ReagentSlime - suffix: Ichor - components: - - type: Bloodstream - bloodReagent: Ichor - - type: PointLight - color: "#f4692e" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#f4692e" - -- type: entity - id: ReagentSlimeBleach - parent: ReagentSlime - suffix: Bleach - components: - - type: Bloodstream - bloodReagent: Bleach - - type: PointLight - color: "#a1000b" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#a1000b" - -- type: entity - id: ReagentSlimeSoap - parent: ReagentSlime - suffix: Soap - components: - - type: Bloodstream - bloodReagent: SoapReagent - - type: PointLight - color: "#c8dfc9" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#c8dfc9" - -- type: entity - id: ReagentSlimeSpacelube - parent: ReagentSlime - suffix: Spacelube - components: - - type: Bloodstream - bloodReagent: SpaceLube - - type: PointLight - color: "#77b58e" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#77b58e" - -- type: entity - id: ReagentSlimeBuzzachloricbees - parent: ReagentSlime - suffix: Buzzachloricbees - components: - - type: Bloodstream - bloodReagent: BuzzochloricBees - - type: PointLight - color: "#FFD35D" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#FFD35D" - -- type: entity - id: ReagentSlimeWehjuice - parent: ReagentSlime - suffix: Wehjuice - components: - - type: Bloodstream - bloodReagent: JuiceThatMakesYouWeh - - type: PointLight - color: "#59b23a" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#59b23a" - -- type: entity - id: ReagentCognizine - parent: ReagentSlime - suffix: Cognizine - components: - - type: Bloodstream - bloodReagent: Cognizine - - type: PointLight - color: "#b50ee8" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#b50ee8" - -- type: entity - id: ReagentSlimeNecrosol - parent: ReagentSlime - suffix: Necrosol - components: - - type: Bloodstream - bloodReagent: Necrosol - - type: PointLight - color: "#86a5bd" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#86a5bd" - -- type: entity - id: ReagentSlimeSpaceDrugs - parent: ReagentSlime - suffix: SpaceDrugs - components: - - type: Bloodstream - bloodReagent: SpaceDrugs - - type: PointLight - color: "#63806e" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#63806e" - -- type: entity - id: ReagentSlimeUnstableMutagen - parent: ReagentSlime - suffix: UnstableMutagen - components: - - type: Bloodstream - bloodReagent: UnstableMutagen - - type: PointLight - color: "#00ff5f" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#00ff5f" - -- type: entity - id: ReagentSlimeLead - parent: ReagentSlime - suffix: Lead - components: - - type: Bloodstream - bloodReagent: Lead - - type: PointLight - color: "#5C6274" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#5C6274" - -- type: entity - id: ReagentSlimechlorinetriflouride - parent: ReagentSlime - suffix: chlorinetriflouride - components: - - type: Bloodstream - bloodReagent: ChlorineTrifluoride - - type: PointLight - color: "#FFC8C8" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#FFC8C8" - -- type: entity - id: ReagentSlimePotassium - parent: ReagentSlime - suffix: Potassium - components: - - type: Bloodstream - bloodReagent: Potassium - - type: PointLight - color: "#c6c8cc" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#c6c8cc" - -- type: entity - id: reagentslimeVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 30 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: ReagentSlime - prob: 0.002 - - id: ReagentSlimeBeer - prob: 0.003 - - id: ReagentSlimePax - prob: 0.001 - - id: ReagentSlimeNocturine - prob: 0.001 - - id: ReagentSlimeTHC - prob: 0.002 - - id: ReagentSlimeBicaridine - prob: 0.002 - - id: ReagentSlimeToxin - prob: 0.002 - - id: ReagentSlimeNapalm - prob: 0.002 - - id: ReagentSlimeOmnizine - prob: 0.003 - - id: ReagentSlimeMuteToxin - prob: 0.002 - - id: ReagentSlimeNorepinephricAcid - prob: 0.002 - - id: ReagentSlimeEphedrine - prob: 0.002 - - id: ReagentSlimeRobustHarvest - prob: 0.003 - - id: ReagentSlimeIchor - prob: 0.002 - - id: ReagentSlimeBleach - prob: 0.002 - - id: ReagentSlimeSoap - prob: 0.002 - - id: ReagentSlimeSpacelube - prob: 0.002 - - id: ReagentSlimeBuzzachloricbees - prob: 0.002 - - id: ReagentSlimeWehjuice - prob: 0.003 - - id: ReagentCognizine - prob: 0.003 - - id: ReagentSlimeNecrosol - prob: 0.002 - - id: ReagentSlimeSpaceDrugs - prob: 0.003 - - id: ReagentSlimeUnstableMutagen - prob: 0.001 - - id: ReagentSlimeLead - prob: 0.001 - - id: ReagentSlimechlorinetriflouride - prob: 0.002 - - id: ReagentSlimePotassium - prob: 0.002 - - id: ReagentSlimeLotophagoiOil - prob: 0.003 +#- type: entity +# id: ReagentSlimeIchor +# parent: ReagentSlime +# suffix: Ichor +# components: +# - type: Bloodstream +# bloodReagent: Ichor +# - type: PointLight +# color: "#f4692e" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#f4692e" +# +#- type: entity +# id: ReagentSlimeBleach +# parent: ReagentSlime +# suffix: Bleach +# components: +# - type: Bloodstream +# bloodReagent: Bleach +# - type: PointLight +# color: "#a1000b" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#a1000b" +# +#- type: entity +# id: ReagentSlimeSoap +# parent: ReagentSlime +# suffix: Soap +# components: +# - type: Bloodstream +# bloodReagent: SoapReagent +# - type: PointLight +# color: "#c8dfc9" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#c8dfc9" +# +#- type: entity +# id: ReagentSlimeSpacelube +# parent: ReagentSlime +# suffix: Spacelube +# components: +# - type: Bloodstream +# bloodReagent: SpaceLube +# - type: PointLight +# color: "#77b58e" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#77b58e" +# +#- type: entity +# id: ReagentSlimeBuzzachloricbees +# parent: ReagentSlime +# suffix: Buzzachloricbees +# components: +# - type: Bloodstream +# bloodReagent: BuzzochloricBees +# - type: PointLight +# color: "#FFD35D" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#FFD35D" +# +#- type: entity +# id: ReagentSlimeWehjuice +# parent: ReagentSlime +# suffix: Wehjuice +# components: +# - type: Bloodstream +# bloodReagent: JuiceThatMakesYouWeh +# - type: PointLight +# color: "#59b23a" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#59b23a" +# +#- type: entity +# id: ReagentCognizine +# parent: ReagentSlime +# suffix: Cognizine +# components: +# - type: Bloodstream +# bloodReagent: Cognizine +# - type: PointLight +# color: "#b50ee8" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#b50ee8" +# +#- type: entity +# id: ReagentSlimeNecrosol +# parent: ReagentSlime +# suffix: Necrosol +# components: +# - type: Bloodstream +# bloodReagent: Necrosol +# - type: PointLight +# color: "#86a5bd" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#86a5bd" +# +#- type: entity +# id: ReagentSlimeSpaceDrugs +# parent: ReagentSlime +# suffix: SpaceDrugs +# components: +# - type: Bloodstream +# bloodReagent: SpaceDrugs +# - type: PointLight +# color: "#63806e" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#63806e" +# +#- type: entity +# id: ReagentSlimeUnstableMutagen +# parent: ReagentSlime +# suffix: UnstableMutagen +# components: +# - type: Bloodstream +# bloodReagent: UnstableMutagen +# - type: PointLight +# color: "#00ff5f" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#00ff5f" +# +#- type: entity +# id: ReagentSlimeLead +# parent: ReagentSlime +# suffix: Lead +# components: +# - type: Bloodstream +# bloodReagent: Lead +# - type: PointLight +# color: "#5C6274" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#5C6274" +# +#- type: entity +# id: ReagentSlimechlorinetriflouride +# parent: ReagentSlime +# suffix: chlorinetriflouride +# components: +# - type: Bloodstream +# bloodReagent: ChlorineTrifluoride +# - type: PointLight +# color: "#FFC8C8" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#FFC8C8" +# +#- type: entity +# id: ReagentSlimePotassium +# parent: ReagentSlime +# suffix: Potassium +# components: +# - type: Bloodstream +# bloodReagent: Potassium +# - type: PointLight +# color: "#c6c8cc" +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/elemental.rsi +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: alive +# color: "#c6c8cc" +# +#- type: entity +# id: reagentslimeVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 30 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: ReagentSlime +# prob: 0.002 +# - id: ReagentSlimeBeer +# prob: 0.003 +# - id: ReagentSlimePax +# prob: 0.001 +# - id: ReagentSlimeNocturine +# prob: 0.001 +# - id: ReagentSlimeTHC +# prob: 0.002 +# - id: ReagentSlimeBicaridine +# prob: 0.002 +# - id: ReagentSlimeToxin +# prob: 0.002 +# - id: ReagentSlimeNapalm +# prob: 0.002 +# - id: ReagentSlimeOmnizine +# prob: 0.003 +# - id: ReagentSlimeMuteToxin +# prob: 0.002 +# - id: ReagentSlimeNorepinephricAcid +# prob: 0.002 +# - id: ReagentSlimeEphedrine +# prob: 0.002 +# - id: ReagentSlimeRobustHarvest +# prob: 0.003 +# - id: ReagentSlimeIchor +# prob: 0.002 +# - id: ReagentSlimeBleach +# prob: 0.002 +# - id: ReagentSlimeSoap +# prob: 0.002 +# - id: ReagentSlimeSpacelube +# prob: 0.002 +# - id: ReagentSlimeBuzzachloricbees +# prob: 0.002 +# - id: ReagentSlimeWehjuice +# prob: 0.003 +# - id: ReagentCognizine +# prob: 0.003 +# - id: ReagentSlimeNecrosol +# prob: 0.002 +# - id: ReagentSlimeSpaceDrugs +# prob: 0.003 +# - id: ReagentSlimeUnstableMutagen +# prob: 0.001 +# - id: ReagentSlimeLead +# prob: 0.001 +# - id: ReagentSlimechlorinetriflouride +# prob: 0.002 +# - id: ReagentSlimePotassium +# prob: 0.002 +# - id: ReagentSlimeLotophagoiOil +# prob: 0.003 +# diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml index 88a3cc24b22..e8428004a3b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml @@ -1,534 +1,534 @@ -- type: entity - name: Neutral Rouny - id: MobXenoNeutralRouny - parent: MobXenoRounyNPC - description: They mostly come at night. Mostly. - components: - - type: NpcFactionMember - factions: - - Passive - - type: PointLight - radius: 2 - energy: 1 - color: "#B85E5E" - - type: MovementAlwaysTouching - - type: GhostRole - name: ghost-role-information-friendlyxeno-name - description: ghost-role-information-friendlyxeno-description - rules: ghost-role-information-friendlyxeno-rules - - type: GhostTakeoverAvailable - - type: LanguageKnowledge - speaks: - - Xeno - understands: - - Xeno - - TauCetiBasic - -- type: entity - name: Neutral Praetorian - id: MobXenoNeutralPraetorian - parent: MobXenoPraetorianNPC - description: They mostly come at night. Mostly. - components: - - type: NpcFactionMember - factions: - - Passive - - type: PointLight - radius: 2 - energy: 1 - color: "#62B85E" - - type: GhostRole - name: ghost-role-information-friendlyxeno-name - description: ghost-role-information-friendlyxeno-description - rules: ghost-role-information-friendlyxeno-rules - - type: GhostTakeoverAvailable - - type: LanguageKnowledge - speaks: - - Xeno - understands: - - Xeno - - TauCetiBasic - -- type: entity - name: Neutral Drone - id: MobXenoNeutralDrone - parent: MobXenoDroneNPC - description: They mostly come at night. Mostly. - components: - - type: NpcFactionMember - factions: - - Passive - - type: PointLight - radius: 2 - energy: 1 - color: "#8B5EB8" - - type: GhostRole - name: ghost-role-information-friendlyxeno-name - description: ghost-role-information-friendlyxeno-description - rules: ghost-role-information-friendlyxeno-rules - - type: GhostTakeoverAvailable - - type: LanguageKnowledge - speaks: - - Xeno - understands: - - Xeno - - TauCetiBasic - -- type: entity - name: Neutral Ravager - id: MobXenoNeutralRavager - parent: MobXenoRavagerNPC - description: They mostly come at night. Mostly. - components: - - type: NpcFactionMember - factions: - - Passive - - type: PointLight - radius: 2 - energy: 1 - color: "#E3954D" - - type: GhostRole - name: ghost-role-information-friendlyxeno-name - description: ghost-role-information-friendlyxeno-description - rules: ghost-role-information-friendlyxeno-rules - - type: GhostTakeoverAvailable - - type: LanguageKnowledge - speaks: - - Xeno - understands: - - Xeno - - TauCetiBasic - -- type: inventoryTemplate - id: friendxeno - slots: - - name: id - slotTexture: id - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - displayName: ID - - name: head - slotTexture: head - slotFlags: HEAD - uiWindowPos: 1,2 - strippingWindowPos: 0,0 - displayName: Head - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 0,1 - strippingWindowPos: 1,1 - displayName: Mask - -- type: entity - name: Friend-Shaped - parent: MobXenoNeutralRouny - id: MobXenoFriendShaped - description: A very clearly friend-shaped Xeno. - components: - - type: NpcFactionMember - factions: - - PetsNT - - type: Tool - speed: 3 - qualities: - - Prying - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/Xenos/rouny.rsi - scale: 0.5, 0.5 - - type: GhostRole - - type: GhostTakeoverAvailable - - type: Inventory - templateId: friendxeno - - type: IdExaminable - - type: InventorySlots - - type: Stripping - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Grammar - attributes: - proper: true - gender: male - - type: Body - prototype: Friendshaped - requiredLegs: 1 # TODO: More than 1 leg - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-reptile - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/lizard_happy.ogg - -- type: entity - name: Patriach - parent: MobXenoNeutralPraetorian - id: MobXenoPatriarch - description: A not entirely clearly friend-shaped Xeno. - components: - - type: NpcFactionMember - factions: - - PetsNT - - type: Tool - speed: 3 - qualities: - - Prying - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/patriarch.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: patriarch - - type: DamageStateVisuals - states: - Alive: - Base: patriarch - Critical: - Base: patriarch_crit - Dead: - Base: patriarch_dead - - type: Inventory - templateId: friendxeno - - type: IdExaminable - - type: InventorySlots - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Grammar - attributes: - proper: true - gender: male - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-reptile - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/lizard_happy.ogg - -- type: entity - name: FXES - parent: MobXenoNeutralDrone - id: MobXenoFXES - description: A very clearly friend-shaped Xeno. - components: - - type: NpcFactionMember - factions: - - PetsNT - - type: Tool - speed: 3 - qualities: - - Prying - - type: Inventory - templateId: friendxeno - - type: IdExaminable - - type: InventorySlots - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Grammar - attributes: - proper: true - gender: male - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-reptile - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/lizard_happy.ogg - -- type: entity - name: Hell-Shaped - parent: MobXenoNeutralRavager - id: MobXenoHellShaped - description: A very clearly friend-shaped Xeno. - components: - - type: NpcFactionMember - factions: - - PetsNT - - type: Tool - speed: 3 - qualities: - - Prying - - type: Inventory - templateId: friendxeno - - type: IdExaminable - - type: InventorySlots - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Grammar - attributes: - proper: true - gender: male - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-reptile - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/lizard_happy.ogg - -- type: entity - name: FXE Subject 7355 - parent: MobXenoNeutralRavager - id: MobXenoSubjectTess - description: An extremely oddly coloured xeno, with glowing stripes. An odd mutation. - components: - - type: NpcFactionMember - factions: - - PetsNT - - type: Tool - speed: 3 - qualities: - - Prying - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/subject7355.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: subject7355 - - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] - state: glow - shader: unshaded - - type: PointLight - radius: 2 - energy: 1 - color: "#639fff" - - type: DamageStateVisuals - states: - Alive: - Base: subject7355 - Critical: - Base: subject7355_crit - Dead: - Base: subject7355_dead - - type: Inventory - templateId: friendxeno - - type: IdExaminable - - type: InventorySlots - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Grammar - attributes: - proper: true - gender: male - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-reptile - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/lizard_happy.ogg - -- type: entity - id: neutralXenoVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 1 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobXenoNeutralRouny - prob: 0.008 - - id: MobXenoNeutralDrone - prob: 0.008 - - id: MobXenoNeutralPraetorian - prob: 0.008 - - id: MobXenoNeutralRavager - prob: 0.008 - -- type: entity - id: ArgocyteVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 30 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobArgocyteSlurva - prob: 0.003 - - id: MobArgocyteBarrier - prob: 0.003 - - id: MobArgocyteSkitter - prob: 0.003 - - id: MobArgocyteSwiper - prob: 0.003 - - id: MobArgocyteMolder - prob: 0.003 - - id: MobArgocytePouncer - prob: 0.003 - - id: MobArgocyteGlider - prob: 0.003 - - id: MobArgocyteHarvester - prob: 0.003 - - id: MobArgocyteCrawler - prob: 0.003 - - id: MobArgocyteEnforcer - prob: 0.003 - - id: MobArgocyteFounder - prob: 0.003 - - id: MobArgocyteLeviathing - prob: 0.001 - -- type: entity - id: MeatVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 20 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobFleshJared - prob: 0.005 - - id: MobFleshGolem - prob: 0.005 - - id: MobFleshClamp - prob: 0.005 - - id: MobFleshLover - prob: 0.005 - - id: MobAbomination - prob: 0.005 - -- type: entity - id: TickVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 1 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobTick - prob: 0.01 - -- type: entity - id: CarpVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 20 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobCarp - prob: 0.01 - - id: MobCarpMagic - prob: 0.01 - - id: MobCarpHolo - prob: 0.008 - - id: MobCarpRainbow - prob: 0.01 - - id: MobShark - prob: 0.008 - - id: MobCarpDragon - prob: 0.01 - -- type: entity - id: SpaceVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 20 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobBearSpace - prob: 0.01 - - id: MobKangarooSpace - prob: 0.01 - - id: MobSpiderSpace - prob: 0.01 - - id: MobCobraSpace - prob: 0.01 - -- type: entity - id: LightVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: true - earliestStart: 20 - reoccurrenceDelay: 12 - minimumPlayers: 20 - weight: 6 # Really weak compared to other critters - duration: 60 - - type: VentCrittersRule - entries: - - id: MobLivingLight - prob: 0.01 - - id: MobLuminousPerson - prob: 0.01 - - id: MobLuminousObject - prob: 0.01 - - id: MobLuminousEntity - prob: 0.01 - -- type: entity - name: Friendly Xeno spawner - id: friendlyxenoSpawner - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: Mobs/Aliens/Xenos/drone.rsi - state: sleeping - - type: RandomSpawner - prototypes: - - MobXenoNeutralRouny - - MobXenoNeutralPraetorian - - MobXenoNeutralDrone - - MobXenoNeutralRavager - chance: 1 +#- type: entity +# name: Neutral Rouny +# id: MobXenoNeutralRouny +# parent: MobXenoRounyNPC +# description: They mostly come at night. Mostly. +# components: +# - type: NpcFactionMember +# factions: +# - Passive +# - type: PointLight +# radius: 2 +# energy: 1 +# color: "#B85E5E" +# - type: MovementAlwaysTouching +# - type: GhostRole +# name: ghost-role-information-friendlyxeno-name +# description: ghost-role-information-friendlyxeno-description +# rules: ghost-role-information-friendlyxeno-rules +# - type: GhostTakeoverAvailable +# - type: LanguageKnowledge +# speaks: +# - Xeno +# understands: +# - Xeno +# - TauCetiBasic +# +#- type: entity +# name: Neutral Praetorian +# id: MobXenoNeutralPraetorian +# parent: MobXenoPraetorianNPC +# description: They mostly come at night. Mostly. +# components: +# - type: NpcFactionMember +# factions: +# - Passive +# - type: PointLight +# radius: 2 +# energy: 1 +# color: "#62B85E" +# - type: GhostRole +# name: ghost-role-information-friendlyxeno-name +# description: ghost-role-information-friendlyxeno-description +# rules: ghost-role-information-friendlyxeno-rules +# - type: GhostTakeoverAvailable +# - type: LanguageKnowledge +# speaks: +# - Xeno +# understands: +# - Xeno +# - TauCetiBasic +# +#- type: entity +# name: Neutral Drone +# id: MobXenoNeutralDrone +# parent: MobXenoDroneNPC +# description: They mostly come at night. Mostly. +# components: +# - type: NpcFactionMember +# factions: +# - Passive +# - type: PointLight +# radius: 2 +# energy: 1 +# color: "#8B5EB8" +# - type: GhostRole +# name: ghost-role-information-friendlyxeno-name +# description: ghost-role-information-friendlyxeno-description +# rules: ghost-role-information-friendlyxeno-rules +# - type: GhostTakeoverAvailable +# - type: LanguageKnowledge +# speaks: +# - Xeno +# understands: +# - Xeno +# - TauCetiBasic +# +#- type: entity +# name: Neutral Ravager +# id: MobXenoNeutralRavager +# parent: MobXenoRavagerNPC +# description: They mostly come at night. Mostly. +# components: +# - type: NpcFactionMember +# factions: +# - Passive +# - type: PointLight +# radius: 2 +# energy: 1 +# color: "#E3954D" +# - type: GhostRole +# name: ghost-role-information-friendlyxeno-name +# description: ghost-role-information-friendlyxeno-description +# rules: ghost-role-information-friendlyxeno-rules +# - type: GhostTakeoverAvailable +# - type: LanguageKnowledge +# speaks: +# - Xeno +# understands: +# - Xeno +# - TauCetiBasic +# +#- type: inventoryTemplate +# id: friendxeno +# slots: +# - name: id +# slotTexture: id +# slotFlags: IDCARD +# slotGroup: SecondHotbar +# stripTime: 6 +# uiWindowPos: 2,1 +# strippingWindowPos: 2,4 +# displayName: ID +# - name: head +# slotTexture: head +# slotFlags: HEAD +# uiWindowPos: 1,2 +# strippingWindowPos: 0,0 +# displayName: Head +# - name: mask +# slotTexture: mask +# slotFlags: MASK +# uiWindowPos: 0,1 +# strippingWindowPos: 1,1 +# displayName: Mask +# +#- type: entity +# name: Friend-Shaped +# parent: MobXenoNeutralRouny +# id: MobXenoFriendShaped +# description: A very clearly friend-shaped Xeno. +# components: +# - type: NpcFactionMember +# factions: +# - PetsNT +# - type: Tool +# speed: 3 +# qualities: +# - Prying +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Aliens/Xenos/rouny.rsi +# scale: 0.5, 0.5 +# - type: GhostRole +# - type: GhostTakeoverAvailable +# - type: Inventory +# templateId: friendxeno +# - type: IdExaminable +# - type: InventorySlots +# - type: Stripping +# - type: Strippable +# - type: UserInterface +# interfaces: +# - key: enum.StrippingUiKey.Key +# type: StrippableBoundUserInterface +# - type: Grammar +# attributes: +# proper: true +# gender: male +# - type: Body +# prototype: Friendshaped +# requiredLegs: 1 # TODO: More than 1 leg +# - type: InteractionPopup +# successChance: 0.5 +# interactSuccessString: petting-success-reptile +# interactFailureString: petting-failure-generic +# interactSuccessSpawn: EffectHearts +# interactSuccessSound: +# path: /Audio/Animals/lizard_happy.ogg +# +#- type: entity +# name: Patriach +# parent: MobXenoNeutralPraetorian +# id: MobXenoPatriarch +# description: A not entirely clearly friend-shaped Xeno. +# components: +# - type: NpcFactionMember +# factions: +# - PetsNT +# - type: Tool +# speed: 3 +# qualities: +# - Prying +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/patriarch.rsi +# layers: +# - map: ["enum.DamageStateVisualLayers.Base"] +# state: patriarch +# - type: DamageStateVisuals +# states: +# Alive: +# Base: patriarch +# Critical: +# Base: patriarch_crit +# Dead: +# Base: patriarch_dead +# - type: Inventory +# templateId: friendxeno +# - type: IdExaminable +# - type: InventorySlots +# - type: Strippable +# - type: UserInterface +# interfaces: +# - key: enum.StrippingUiKey.Key +# type: StrippableBoundUserInterface +# - type: Grammar +# attributes: +# proper: true +# gender: male +# - type: InteractionPopup +# successChance: 0.5 +# interactSuccessString: petting-success-reptile +# interactFailureString: petting-failure-generic +# interactSuccessSpawn: EffectHearts +# interactSuccessSound: +# path: /Audio/Animals/lizard_happy.ogg +# +#- type: entity +# name: FXES +# parent: MobXenoNeutralDrone +# id: MobXenoFXES +# description: A very clearly friend-shaped Xeno. +# components: +# - type: NpcFactionMember +# factions: +# - PetsNT +# - type: Tool +# speed: 3 +# qualities: +# - Prying +# - type: Inventory +# templateId: friendxeno +# - type: IdExaminable +# - type: InventorySlots +# - type: Strippable +# - type: UserInterface +# interfaces: +# - key: enum.StrippingUiKey.Key +# type: StrippableBoundUserInterface +# - type: Grammar +# attributes: +# proper: true +# gender: male +# - type: InteractionPopup +# successChance: 0.5 +# interactSuccessString: petting-success-reptile +# interactFailureString: petting-failure-generic +# interactSuccessSpawn: EffectHearts +# interactSuccessSound: +# path: /Audio/Animals/lizard_happy.ogg +# +#- type: entity +# name: Hell-Shaped +# parent: MobXenoNeutralRavager +# id: MobXenoHellShaped +# description: A very clearly friend-shaped Xeno. +# components: +# - type: NpcFactionMember +# factions: +# - PetsNT +# - type: Tool +# speed: 3 +# qualities: +# - Prying +# - type: Inventory +# templateId: friendxeno +# - type: IdExaminable +# - type: InventorySlots +# - type: Strippable +# - type: UserInterface +# interfaces: +# - key: enum.StrippingUiKey.Key +# type: StrippableBoundUserInterface +# - type: Grammar +# attributes: +# proper: true +# gender: male +# - type: InteractionPopup +# successChance: 0.5 +# interactSuccessString: petting-success-reptile +# interactFailureString: petting-failure-generic +# interactSuccessSpawn: EffectHearts +# interactSuccessSound: +# path: /Audio/Animals/lizard_happy.ogg +# +#- type: entity +# name: FXE Subject 7355 +# parent: MobXenoNeutralRavager +# id: MobXenoSubjectTess +# description: An extremely oddly coloured xeno, with glowing stripes. An odd mutation. +# components: +# - type: NpcFactionMember +# factions: +# - PetsNT +# - type: Tool +# speed: 3 +# qualities: +# - Prying +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/subject7355.rsi +# layers: +# - map: ["enum.DamageStateVisualLayers.Base"] +# state: subject7355 +# - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] +# state: glow +# shader: unshaded +# - type: PointLight +# radius: 2 +# energy: 1 +# color: "#639fff" +# - type: DamageStateVisuals +# states: +# Alive: +# Base: subject7355 +# Critical: +# Base: subject7355_crit +# Dead: +# Base: subject7355_dead +# - type: Inventory +# templateId: friendxeno +# - type: IdExaminable +# - type: InventorySlots +# - type: Strippable +# - type: UserInterface +# interfaces: +# - key: enum.StrippingUiKey.Key +# type: StrippableBoundUserInterface +# - type: Grammar +# attributes: +# proper: true +# gender: male +# - type: InteractionPopup +# successChance: 0.5 +# interactSuccessString: petting-success-reptile +# interactFailureString: petting-failure-generic +# interactSuccessSpawn: EffectHearts +# interactSuccessSound: +# path: /Audio/Animals/lizard_happy.ogg +# +#- type: entity +# id: neutralXenoVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 1 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobXenoNeutralRouny +# prob: 0.008 +# - id: MobXenoNeutralDrone +# prob: 0.008 +# - id: MobXenoNeutralPraetorian +# prob: 0.008 +# - id: MobXenoNeutralRavager +# prob: 0.008 +# +#- type: entity +# id: ArgocyteVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 30 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobArgocyteSlurva +# prob: 0.003 +# - id: MobArgocyteBarrier +# prob: 0.003 +# - id: MobArgocyteSkitter +# prob: 0.003 +# - id: MobArgocyteSwiper +# prob: 0.003 +# - id: MobArgocyteMolder +# prob: 0.003 +# - id: MobArgocytePouncer +# prob: 0.003 +# - id: MobArgocyteGlider +# prob: 0.003 +# - id: MobArgocyteHarvester +# prob: 0.003 +# - id: MobArgocyteCrawler +# prob: 0.003 +# - id: MobArgocyteEnforcer +# prob: 0.003 +# - id: MobArgocyteFounder +# prob: 0.003 +# - id: MobArgocyteLeviathing +# prob: 0.001 +# +#- type: entity +# id: MeatVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 20 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobFleshJared +# prob: 0.005 +# - id: MobFleshGolem +# prob: 0.005 +# - id: MobFleshClamp +# prob: 0.005 +# - id: MobFleshLover +# prob: 0.005 +# - id: MobAbomination +# prob: 0.005 +# +#- type: entity +# id: TickVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 1 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobTick +# prob: 0.01 +# +#- type: entity +# id: CarpVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 20 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobCarp +# prob: 0.01 +# - id: MobCarpMagic +# prob: 0.01 +# - id: MobCarpHolo +# prob: 0.008 +# - id: MobCarpRainbow +# prob: 0.01 +# - id: MobShark +# prob: 0.008 +# - id: MobCarpDragon +# prob: 0.01 +# +#- type: entity +# id: SpaceVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 20 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobBearSpace +# prob: 0.01 +# - id: MobKangarooSpace +# prob: 0.01 +# - id: MobSpiderSpace +# prob: 0.01 +# - id: MobCobraSpace +# prob: 0.01 +# +#- type: entity +# id: LightVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 20 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobLivingLight +# prob: 0.01 +# - id: MobLuminousPerson +# prob: 0.01 +# - id: MobLuminousObject +# prob: 0.01 +# - id: MobLuminousEntity +# prob: 0.01 +# +#- type: entity +# name: Friendly Xeno spawner +# id: friendlyxenoSpawner +# parent: MarkerBase +# components: +# - type: Sprite +# layers: +# - state: green +# - sprite: Mobs/Aliens/Xenos/drone.rsi +# state: sleeping +# - type: RandomSpawner +# prototypes: +# - MobXenoNeutralRouny +# - MobXenoNeutralPraetorian +# - MobXenoNeutralDrone +# - MobXenoNeutralRavager +# chance: 1 From 0d008e9ca150eda282f222a7a33c17194658aa6e Mon Sep 17 00:00:00 2001 From: Fansana Date: Sun, 29 Sep 2024 20:45:48 +0200 Subject: [PATCH 23/27] remove broken slimes --- .../Entities/Mobs/NPCs/elemental.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index dd5e5f27604..366a2f22a48 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -333,20 +333,20 @@ - ReagentSlimePomelustine # Floofstation - ReagentSlimePhilterex # Floofstation - ReagentSlimeLibidozenithizine # Floofstation - - ReagentSlimeIchor - - ReagentSlimeBleach - - ReagentSlimeSoap - - ReagentSlimeSpacelube - - ReagentSlimeBuzzachloricbees - - ReagentSlimeWehjuice - - ReagentCognizine + #- ReagentSlimeIchor + #- ReagentSlimeBleach + #- ReagentSlimeSoap + #- ReagentSlimeSpacelube + #- ReagentSlimeBuzzachloricbees + #- ReagentSlimeWehjuice + #- ReagentCognizine - ReagentSlimeOpporozidone # Floofstation - - ReagentSlimeNecrosol - - ReagentSlimeSpaceDrugs - - ReagentSlimeUnstableMutagen - - ReagentSlimeLead - - ReagentSlimechlorinetriflouride - - ReagentSlimePotassium + #- ReagentSlimeNecrosol + #- ReagentSlimeSpaceDrugs + #- ReagentSlimeUnstableMutagen + #- ReagentSlimeLead + #- ReagentSlimechlorinetriflouride + #- ReagentSlimePotassium - ReagentSlimeLotophagoiOil chance: 1 From cbe8841bf3ed453a240aac1a4a039bdf0f2b3a12 Mon Sep 17 00:00:00 2001 From: Fansana Date: Sun, 29 Sep 2024 22:41:12 +0200 Subject: [PATCH 24/27] add friend-shaped --- .../Prototypes/Entities/Mobs/NPCs/xenopet.yml | 184 +++++++++--------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml index e8428004a3b..05071934306 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml @@ -1,28 +1,28 @@ -#- type: entity -# name: Neutral Rouny -# id: MobXenoNeutralRouny -# parent: MobXenoRounyNPC -# description: They mostly come at night. Mostly. -# components: -# - type: NpcFactionMember -# factions: -# - Passive -# - type: PointLight -# radius: 2 -# energy: 1 -# color: "#B85E5E" -# - type: MovementAlwaysTouching -# - type: GhostRole -# name: ghost-role-information-friendlyxeno-name -# description: ghost-role-information-friendlyxeno-description -# rules: ghost-role-information-friendlyxeno-rules -# - type: GhostTakeoverAvailable -# - type: LanguageKnowledge -# speaks: -# - Xeno -# understands: -# - Xeno -# - TauCetiBasic +- type: entity + name: Neutral Rouny + id: MobXenoNeutralRouny + parent: MobXenoRounyNPC + description: They mostly come at night. Mostly. + components: + - type: NpcFactionMember + factions: + - Passive + - type: PointLight + radius: 2 + energy: 1 + color: "#B85E5E" + - type: MovementAlwaysTouching + - type: GhostRole + name: ghost-role-information-friendlyxeno-name + description: ghost-role-information-friendlyxeno-description + rules: ghost-role-information-friendlyxeno-rules + - type: GhostTakeoverAvailable + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - TauCetiBasic # #- type: entity # name: Neutral Praetorian @@ -99,73 +99,73 @@ # - Xeno # - TauCetiBasic # -#- type: inventoryTemplate -# id: friendxeno -# slots: -# - name: id -# slotTexture: id -# slotFlags: IDCARD -# slotGroup: SecondHotbar -# stripTime: 6 -# uiWindowPos: 2,1 -# strippingWindowPos: 2,4 -# displayName: ID -# - name: head -# slotTexture: head -# slotFlags: HEAD -# uiWindowPos: 1,2 -# strippingWindowPos: 0,0 -# displayName: Head -# - name: mask -# slotTexture: mask -# slotFlags: MASK -# uiWindowPos: 0,1 -# strippingWindowPos: 1,1 -# displayName: Mask -# -#- type: entity -# name: Friend-Shaped -# parent: MobXenoNeutralRouny -# id: MobXenoFriendShaped -# description: A very clearly friend-shaped Xeno. -# components: -# - type: NpcFactionMember -# factions: -# - PetsNT -# - type: Tool -# speed: 3 -# qualities: -# - Prying -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Aliens/Xenos/rouny.rsi -# scale: 0.5, 0.5 -# - type: GhostRole -# - type: GhostTakeoverAvailable -# - type: Inventory -# templateId: friendxeno -# - type: IdExaminable -# - type: InventorySlots -# - type: Stripping -# - type: Strippable -# - type: UserInterface -# interfaces: -# - key: enum.StrippingUiKey.Key -# type: StrippableBoundUserInterface -# - type: Grammar -# attributes: -# proper: true -# gender: male -# - type: Body -# prototype: Friendshaped -# requiredLegs: 1 # TODO: More than 1 leg -# - type: InteractionPopup -# successChance: 0.5 -# interactSuccessString: petting-success-reptile -# interactFailureString: petting-failure-generic -# interactSuccessSpawn: EffectHearts -# interactSuccessSound: -# path: /Audio/Animals/lizard_happy.ogg +- type: inventoryTemplate + id: friendxeno + slots: + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,2 + strippingWindowPos: 0,0 + displayName: Head + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 0,1 + strippingWindowPos: 1,1 + displayName: Mask + +- type: entity + name: Friend-Shaped + parent: MobXenoNeutralRouny + id: MobXenoFriendShaped + description: A very clearly friend-shaped Xeno. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Tool + speed: 3 + qualities: + - Prying + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/rouny.rsi + scale: 0.5, 0.5 + - type: GhostRole + - type: GhostTakeoverAvailable + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Stripping + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: Body + prototype: Friendshaped + requiredLegs: 1 # TODO: More than 1 leg + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg # #- type: entity # name: Patriach From 5f7e3f5cd9feb550a7107984a040649fb1aaf7cf Mon Sep 17 00:00:00 2001 From: Fansana Date: Tue, 1 Oct 2024 18:09:26 +0200 Subject: [PATCH 25/27] fix disposal pipes ejection --- .../Disposal/Unit/EntitySystems/DisposableSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs index 38e39238039..ddc1b754a06 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs @@ -136,9 +136,9 @@ public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, { _xformSystem.AttachToGridOrMap(entity, xform); - if (holder.PreviousDirection != Direction.Invalid && _xformQuery.TryGetComponent(xform.ParentUid, out var parentXform)) + if (holder.PreviousDirection != Direction.Invalid && gridUid != null && _xformQuery.TryGetComponent(gridUid, out var parentXform)) { - var direction = holder.PreviousDirection.ToAngle(); + var direction = holder.CurrentDirection.ToAngle(); direction += _xformSystem.GetWorldRotation(parentXform); _throwing.TryThrow(entity, direction.ToWorldVec() * 3f, 10f); } From 0667d5316e7127d8e6bee750623b12a46635776b Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:15:05 +0000 Subject: [PATCH 26/27] Automatic Changelog Update (#217) --- Resources/Changelog/Floof.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 82991d0c3f5..a301f507e6d 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1111,3 +1111,12 @@ Entries: id: 149 time: '2024-09-29T18:26:23.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/219 +- author: Mnemotechnician + changes: + - type: Add + message: >- + Loadouts have been expanded with leashes, remote signalers, shock + collars, and a wide variety of lewd items. + id: 150 + time: '2024-10-01T16:14:39.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/217 From c1808bd2caf802a0759de8a461bb83227ff0eb91 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:34:05 +0000 Subject: [PATCH 27/27] Automatic Changelog Update (#220) --- Resources/Changelog/Floof.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index a301f507e6d..a753cc910c6 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1120,3 +1120,10 @@ Entries: id: 150 time: '2024-10-01T16:14:39.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/217 +- author: Fansana + changes: + - type: Fix + message: Fix the disposal pipe ejection to space and after pipe bends. + id: 151 + time: '2024-10-01T17:33:39.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/220