new-frontiers-14 · dvir001 · Oct 16, 2024 · Oct 8, 2024 · Oct 9, 2024 · Oct 9, 2024
diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl
@@ -0,0 +1,20 @@
+advertisement-goblinbane-1 = The only good goblin is clean goblin! Clean goblin is DEAD goblin!
+advertisement-goblinbane-2 = Have you washed your hands lately, goblin? With soap?
+advertisement-goblinbane-3 = When was the last time you flossed?
+advertisement-goblinbane-4 = Come here! I'll wash your face off!
+advertisement-goblinbane-5 = You. Will. Suffer. Uhh.. I mean.. You'll become clean!
+advertisement-goblinbane-6 = Soap! Ever heard of it?!
+advertisement-goblinbane-7 = Filth. I despise it. I seek to eradicate it. Goblins are filthy.
+advertisement-goblinbane-8 = Want to hear a joke? Knock-knock. Who's there? Goblin janitor! Hhah!
+advertisement-goblinbane-9 = I'm walking, seeking, cleaning and cleansing.
+advertisement-goblinbane-10 = Your untidiness makes my water boil!
+advertisement-goblinbane-11 = Space Cleaner!
+advertisement-goblinbane-12 = You should've used paper tovels after washing your hands.
+advertisement-goblinbane-13 = I could smell you from adjacent compartment, goblin.
+advertisement-goblinbane-14 = There will be no mercy, unclean one!
+advertisement-goblinbane-15 = Goblins. Dirt. I hate dirt.
+advertisement-goblinbane-16 = Here, gobbo-gobbo-gobbo! I wont bite! Pinky promise!
+advertisement-goblinbane-17 = When I'm done scraping the dirt from you I'll make a mop handle from your bones.
+advertisement-goblinbane-18 = If you don't brush your teeth, I'll brush them off off you.
+advertisement-goblinbane-19 = *gurgles*
+advertisement-goblinbane-20 = You didn't flush!!
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -55,3 +55,15 @@ ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Anta
                                         - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be.
                                         - [color=red]DO NOT[/color] destroy or hide valuable loot in the dungeon.
                                         - [color=red]DO NOT[/color] leave the planet.
+
+ghost-role-information-goblinbane-name = The Goblinbane
+ghost-role-information-goblinbane-ghost-name = The Ghost of Goblinbane
+ghost-role-information-goblinbane-description = Hunt down those pesky-little-dirty-smelly goblins. And felinids. And also chaplains.
+ghost-role-information-goblinbane-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color] capable of summoning minions. [color=yellow]Do note[/color], your minions will be hostile to everyone, except you.
+                                        Search and destroy goblins/felinids/chaplains.
+                                        Please note that [color=yellow]all server rules still apply.[/color]. Additionally:
+                                        - [color=yellow]Reminder[/color] that Frontier Outpost (the station and 200m area around it) is a safe zone.
+                                        - [color=red]DO NOT[/color] attack players on the Outpost.
+                                        - [color=red]DO NOT[/color] use your abilities on the Outpost.
+                                        - [color=red]DO NOT[/color] intentionally damage Frontier Outpost, other POIs, shuttles.
+                                        - [color=red]DO NOT[/color] devour walls and airlocks on Frontier Outpost, other POIs, shuttles.
diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -13672,7 +13672,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 1
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 927
     components:

diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -10347,7 +10347,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,1.5
       parent: 1653
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 799
     components:

diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -2849,7 +2849,7 @@ entities:
     - type: Transform
       pos: 36.5,31.5
       parent: 1653
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 406
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -12154,7 +12154,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 932
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -12276,7 +12276,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 932
     components:

diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -14910,7 +14910,7 @@ entities:
     - type: Transform
       pos: 22.5,28.5
       parent: 1653
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 157
     components:

diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -13513,7 +13513,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,1.5
       parent: 1653
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 889
     components:

diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -13497,15 +13497,15 @@ entities:
     - type: Transform
       pos: 20.5,24.5
       parent: 1653
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 1924
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 52.5,0.5
       parent: 1653
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 799
     components:

diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
@@ -5558,7 +5558,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,1.5
       parent: 1
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 326
     components:

diff --git a/Resources/Maps/_NF/POI/mchobo.yml b/Resources/Maps/_NF/POI/mchobo.yml
@@ -5998,7 +5998,7 @@ entities:
     - type: Transform
       pos: -6.5,8.5
       parent: 1
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 932
     components:

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -201,7 +201,7 @@
   - type: Appearance
 
 - type: entity
-  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
+  parent: [ JanitorClothes, NFClothingBeltStorageBase ] # Frontier: added JanitorClothes
   id: ClothingBeltJanitor
   name: janibelt
   description: A belt used to hold most janitorial supplies.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -95,7 +95,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent: [ ChaplainClothes, ClothingOuterBaseToggleable ] # Frontier: added ChaplainClothes
   id: ClothingOuterHoodieChaplain
   name: chaplain's hoodie
   description: Black and strict chaplain hoodie.
@@ -219,7 +219,7 @@
     sprite: Clothing/OuterClothing/Misc/skubbody.rsi
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: [ ChaplainClothes, ClothingOuterBase ] # Frontier: added ChaplainClothes
   id: ClothingOuterPlagueSuit
   name: plague doctor suit
   description: A bad omen.
@@ -230,7 +230,7 @@
     sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: [ ChaplainClothes, ClothingOuterBase ] # Frontier: added ChaplainClothes
   id: ClothingOuterNunRobe
   name: nun robe
   description: Maximum piety in this star system.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -420,7 +420,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterHydro
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [ JanitorClothes, ClothingOuterWinterCoatToggleable ] # Frontier: added JanitorClothes
   id: ClothingOuterWinterJani
   name: janitorial winter coat
   components:

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -99,7 +99,7 @@
     sprite: Clothing/Shoes/Specific/cult.rsi
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ JanitorClothes, ClothingShoesBase ] # Frontier: added JanitorClothes
   id: ClothingShoesGaloshes
   name: galoshes
   description: Rubber boots.

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -233,7 +233,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [ JanitorClothes, ClothingUniformSkirtBase ] # Frontier: added JanitorClothes
   id: ClothingUniformJumpskirtJanitor
   name: janitor jumpskirt
   description: The jumpskirt for the poor sop with a mop.

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -113,7 +113,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ChaplainClothes, ClothingUniformBase ] # Frontier: added ChaplainClothes
   id: ClothingUniformJumpsuitChaplain
   name: chaplain's jumpsuit
   description: It's a black jumpsuit, often worn by religious folk.
@@ -408,7 +408,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ JanitorClothes, ClothingUniformBase ] # Frontier: added JanitorClothes
   id: ClothingUniformJumpsuitJanitor
   name: janitor jumpsuit
   description: The jumpsuit for the poor sop with a mop.

diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/goblinbane.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/goblinbane.yml
@@ -0,0 +1,5 @@
+- type: localizedDataset
+  id: goblinbanechatter
+  values:
+    prefix: advertisement-goblinbane-
+    count: 20
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
@@ -10,7 +10,7 @@
     sprite: _NF/Clothing/Belt/arcadia.rsi
 
 - type: entity
-  parent: NFClothingBeltStorageBase
+  parent: [ ChaplainClothes, NFClothingBeltStorageBase ]
   id: ClothingBeltChaplainSash
   name: chaplain sash
   description: Who knew that scarves can be also tied around your waist?

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
@@ -11,7 +11,7 @@
   - type: HamsterWearable
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatPilgrim
   name: pilgrim's hat
   description: "Thou shalt not suffer a turkey to live."
@@ -22,7 +22,7 @@
     sprite: _NF/Clothing/Head/Hats/pilgrim_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatWideBrimmed
   name: wide-brimmed hat
   description: Works great as frisbee substitute.
@@ -33,7 +33,7 @@
     sprite: _NF/Clothing/Head/Hats/widebrim_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatCardinal
   name: cardinal's hat
   description: Keeps your head well protected from sun and reason.
@@ -44,7 +44,7 @@
     sprite: _NF/Clothing/Head/Hats/cardinal_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatWitchhunter
   name: witch hunter's hat
   description: "Thou shalt not suffer a witch to live."
@@ -55,7 +55,7 @@
     sprite: _NF/Clothing/Head/Hats/witch_hunter_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatBishopMitre
   name: bishop's mitre
   description: How to wear this thing? Ah! The other way around!
@@ -66,7 +66,7 @@
     sprite: _NF/Clothing/Head/Hats/bishop_mitre.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatKippah
   name: kippah
   description: Worn on the head like a dome.
@@ -77,7 +77,7 @@
     sprite: _NF/Clothing/Head/Hats/kippah.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatHoodCardinalHood
   categories: [ HideSpawnMenu ]
   name: cardinal's hood

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: [ ChaplainClothes, ClothingNeckBase ]
   id: ClothingNeckCrucifix
   name: crucifix
   description: Damn, it feels good to be so pious.

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: [ ChaplainClothes, ClothingNeckBase ]
   id: ClothingNeckScarfChaplainStole
   name: chaplain's stole
   description: A necessary evil for ordained priests outfit. Gives at least +2 to your holiness.

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
@@ -19,7 +19,7 @@
     damageCoefficient: 0.80
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ ChaplainClothes, ClothingOuterStorageBase ]
   id: ClothingOuterCoatBishop
   name: bishop's robes
   description: Golden threads aren't actually made of gold. Bummer.
@@ -30,7 +30,7 @@
     sprite: _NF/Clothing/OuterClothing/Misc/bishop_robe.rsi
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent:  [ ChaplainClothes, ClothingOuterBaseToggleable ]
   id: ClothingOuterCoatWitchHunter
   name: witch hunter's coat
   description: Looks even better under constant rain with storm wind.
@@ -43,7 +43,7 @@
     clothingPrototype: ClothingHeadHatHoodChaplainHood
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent:  [ ChaplainClothes, ClothingOuterBaseToggleable ]
   id: ClothingOuterCoatCardinal
   name: cardinal's coat
   description: Nobody expects the Spanish Inquisition!

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -33,7 +33,7 @@
   description: A grey suit, complete with tie clip.
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ChaplainClothes, ClothingUniformBase ]
   id: ClothingUniformJumpsuitChaplainPilgrimVest
   name: pilgrim jumpsuit
   description: Knock-knock. Would you care to have a word about our Lord-n-Savior Nar-Sss.. Err.. Space Jeebus?

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: ContrabandClothing
+  abstract: true
+  components:
+  - type: FactionClothing
+    faction: ContrabandClothing
+
+- type: entity
+  id: JanitorClothes
+  abstract: true
+  components:
+  - type: FactionClothing
+    faction: JanitorClothes
+
+- type: entity
+  id: ChaplainClothes
+  abstract: true
+  components:
+  - type: FactionClothing
+    faction: ChaplainClothes