diff --git a/Resources/Audio/Items/Toys/hellothere.ogg b/Resources/Audio/Items/Toys/hellothere.ogg deleted file mode 100644 index 22f6733bdb..0000000000 Binary files a/Resources/Audio/Items/Toys/hellothere.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/helpme.ogg b/Resources/Audio/Items/Toys/helpme.ogg deleted file mode 100644 index ebb4c79bdb..0000000000 Binary files a/Resources/Audio/Items/Toys/helpme.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/imsorry.ogg b/Resources/Audio/Items/Toys/imsorry.ogg deleted file mode 100644 index c5c93b1bfc..0000000000 Binary files a/Resources/Audio/Items/Toys/imsorry.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/thankyou.ogg b/Resources/Audio/Items/Toys/thankyou.ogg deleted file mode 100644 index 263155e526..0000000000 Binary files a/Resources/Audio/Items/Toys/thankyou.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/verygood.ogg b/Resources/Audio/Items/Toys/verygood.ogg deleted file mode 100644 index 68f62169e0..0000000000 Binary files a/Resources/Audio/Items/Toys/verygood.ogg and /dev/null differ diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index c1655824a1..2587a2427a 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -55098,14 +55098,6 @@ entities: storagebase: !type:Container ents: [] type: ContainerContainer -- uid: 5731 - type: CarvingHello - components: - - pos: 89.49635,-12.434606 - parent: 0 - type: Transform - - canCollide: False - type: Physics - uid: 5732 type: Bed components: @@ -55464,14 +55456,6 @@ entities: type: Transform - canCollide: False type: Physics -- uid: 5773 - type: CarvingHelpMe - components: - - pos: 49.5,-15.5 - parent: 0 - type: Transform - - canCollide: False - type: Physics - uid: 5774 type: Grille components: @@ -64927,14 +64911,6 @@ entities: - pos: 43.5,-2.5 parent: 0 type: Transform -- uid: 6816 - type: CarvingThankYou - components: - - pos: 76.450966,-13.440164 - parent: 0 - type: Transform - - canCollide: False - type: Physics - uid: 6817 type: WindowDirectional components: @@ -72046,14 +72022,6 @@ entities: type: Transform - canCollide: False type: Physics -- uid: 7442 - type: CarvingVeryGood - components: - - pos: 11.510399,-10.47184 - parent: 0 - type: Transform - - canCollide: False - type: Physics - uid: 7443 type: PoweredSmallLight components: @@ -72068,14 +72036,6 @@ entities: - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer -- uid: 7444 - type: CarvingImSorry - components: - - pos: 74.47542,-5.540069 - parent: 0 - type: Transform - - canCollide: False - type: Physics - uid: 7445 type: CableHV components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index c5ea5133ed..b3f5ff62e3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -9,9 +9,7 @@ ClothingOuterRobesJudge: 2 ClothingOuterPoncho: 2 ClothingOuterSanta: 2 - ClothingOuterXenos: 2 ClothingOuterSkub: 2 - ClothingHeadHatXeno: 2 ClothingOuterSuitChicken: 2 ClothingHeadHatChickenhead: 2 ClothingOuterSuitMonkey: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 4f3ef5fd51..bda46fd4ab 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -90,30 +90,6 @@ sprite: Clothing/Head/Misc/skubhead.rsi - type: IngestionBlocker -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatXenoMom - name: xeno matriarch helmet - description: Hiss hiss hiss! - components: - - type: Sprite - sprite: Clothing/Head/Misc/xenom.rsi - - type: Clothing - sprite: Clothing/Head/Misc/xenom.rsi - - type: IngestionBlocker - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatXeno - name: xenos helmet - description: Hiss hiss hiss! - components: - - type: Sprite - sprite: Clothing/Head/Misc/xenos.rsi - - type: Clothing - sprite: Clothing/Head/Misc/xenos.rsi - - type: IngestionBlocker - - type: entity parent: ClothingHeadBase id: ClothingHeadHatShrineMaidenWig diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 82d05c45cc..41f9d4d924 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -177,17 +177,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Misc/wizard.rsi -- type: entity - parent: ClothingOuterBase - id: ClothingOuterXenos - name: xenos suit - description: A suit made out of chitinous alien hide. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Misc/xenos.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Misc/xenos.rsi - - type: entity parent: ClothingOuterBase id: ClothingOuterWizardRed diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 1feba6bdd9..2b3481f515 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -9,11 +9,6 @@ - texture: Objects/Fun/toys.rsi/plushie_h.png - type: RandomSpawner rarePrototypes: - - CarvingHelpMe - - CarvingHello - - CarvingThankYou - - CarvingVeryGood - - CarvingImSorry - FoamBlade rareChance: 0.03 prototypes: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml index 5c0e729c81..504ec48104 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml @@ -57,16 +57,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/jar.rsi -- type: entity - parent: DrinkGlassBase - id: DrinkJarMetroid - name: jar metroid - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/jar_metroid.rsi - - type: entity parent: DrinkGlassBase id: DrinkJarWhat diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 4d7c6f9fc1..0c464a0bb2 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -158,115 +158,6 @@ - type: UseDelay delay: 1.0 -# This stuff might be copyright claimed by From Software. The sprites are unique -# and made by Bright but the sounds are ripped straight from the game. Idk, it's -# probably not a big deal. - -- type: entity - parent: BaseItem - id: CarvingHelpMe - name: help me carving - description: Help me! - components: - - type: Sprite - sprite: Objects/Misc/carvings.rsi - state: help_me - - type: Item - sprite: Objects/Misc/carvings.rsi - - type: EmitSoundOnThrow - sound: - path: /Audio/Items/Toys/helpme.ogg - - type: ItemCooldown - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/helpme.ogg - - type: UseDelay - delay: 1.0 - -- type: entity - parent: BaseItem - id: CarvingHello - name: hello carving - description: Hello! - components: - - type: Sprite - sprite: Objects/Misc/carvings.rsi - state: hello - - type: Item - sprite: Objects/Misc/carvings.rsi - - type: EmitSoundOnThrow - sound: - path: /Audio/Items/Toys/hellothere.ogg - - type: ItemCooldown - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/hellothere.ogg - - type: UseDelay - delay: 1.0 - -- type: entity - parent: BaseItem - id: CarvingThankYou - name: thank you carving - description: Thank you! - components: - - type: Sprite - sprite: Objects/Misc/carvings.rsi - state: thank_you - - type: Item - sprite: Objects/Misc/carvings.rsi - - type: EmitSoundOnThrow - sound: - path: /Audio/Items/Toys/thankyou.ogg - - type: ItemCooldown - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/thankyou.ogg - - type: UseDelay - delay: 1.0 - -- type: entity - parent: BaseItem - id: CarvingVeryGood - name: very good carving - description: Very good! - components: - - type: Sprite - sprite: Objects/Misc/carvings.rsi - state: very_good - - type: Item - sprite: Objects/Misc/carvings.rsi - - type: EmitSoundOnThrow - sound: - path: /Audio/Items/Toys/verygood.ogg - - type: ItemCooldown - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/verygood.ogg - - type: UseDelay - delay: 1.0 - -- type: entity - parent: BaseItem - id: CarvingImSorry - name: sorry carving - description: I'm sorry. - components: - - type: Sprite - sprite: Objects/Misc/carvings.rsi - state: im_sorry - - type: Item - sprite: Objects/Misc/carvings.rsi - - type: EmitSoundOnThrow - sound: - path: /Audio/Items/Toys/imsorry.ogg - - type: ItemCooldown - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/imsorry.ogg - - type: UseDelay - delay: 1.0 - ## Figurines - type: entity diff --git a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/equipped-HELMET.png deleted file mode 100644 index 21e0c06630..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/icon.png deleted file mode 100644 index 4b2146812f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-left.png deleted file mode 100644 index 2651b2fc24..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-right.png deleted file mode 100644 index 3af08fa203..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/meta.json deleted file mode 100644 index a470e00944..0000000000 --- a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/equipped-HELMET.png deleted file mode 100644 index ffe3cb0e1c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/icon.png deleted file mode 100644 index a866ad033c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-left.png deleted file mode 100644 index 1257f84a91..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-right.png deleted file mode 100644 index 0ec4772344..0000000000 Binary files a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/meta.json deleted file mode 100644 index a470e00944..0000000000 --- a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 5bd5700c1b..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/icon.png deleted file mode 100644 index f389b598b3..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-left.png deleted file mode 100644 index af93efd129..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-right.png deleted file mode 100644 index a72cf276c2..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/meta.json deleted file mode 100644 index e482264df5..0000000000 --- a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar_metroid.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/jar_metroid.rsi/icon.png deleted file mode 100644 index 8181c07685..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/jar_metroid.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar_metroid.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar_metroid.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/jar_metroid.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/hello.png b/Resources/Textures/Objects/Misc/carvings.rsi/hello.png deleted file mode 100644 index 94bdd42dc3..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/hello.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/help_me.png b/Resources/Textures/Objects/Misc/carvings.rsi/help_me.png deleted file mode 100644 index 37435f1261..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/help_me.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/im_sorry.png b/Resources/Textures/Objects/Misc/carvings.rsi/im_sorry.png deleted file mode 100644 index 06e2dd9887..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/im_sorry.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/carvings.rsi/inhand-left.png deleted file mode 100644 index 366b63535e..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/carvings.rsi/inhand-right.png deleted file mode 100644 index 1ac763ed26..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json deleted file mode 100644 index 1ca8c6420b..0000000000 --- a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "@Bright#2366", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "hello" - }, - { - "name": "help_me" - }, - { - "name": "thank_you" - }, - { - "name": "im_sorry" - }, - { - "name": "very_good" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/thank_you.png b/Resources/Textures/Objects/Misc/carvings.rsi/thank_you.png deleted file mode 100644 index 823004d4fc..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/thank_you.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/very_good.png b/Resources/Textures/Objects/Misc/carvings.rsi/very_good.png deleted file mode 100644 index cfd614ab6f..0000000000 Binary files a/Resources/Textures/Objects/Misc/carvings.rsi/very_good.png and /dev/null differ