diff --git a/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs b/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs index 3248a6b9c805..6f779b43357e 100644 --- a/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs +++ b/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs @@ -4,6 +4,9 @@ using Robust.Server.GameObjects; using Robust.Server.Audio; using Robust.Shared.Prototypes; +using Content.Shared.Hands.EntitySystems; +using Robust.Shared.Containers; +using System.Linq; namespace Content.Server.Thief.Systems; @@ -17,6 +20,8 @@ public sealed class ThiefUndeterminedBackpackSystem : EntitySystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; public override void Initialize() { @@ -37,14 +42,18 @@ private void OnApprove(Entity backpack, ref if (backpack.Comp.SelectedSets.Count != backpack.Comp.MaxSelectedSets) return; + var bag = Spawn("ClothingBackpackDuffel", _transform.GetMapCoordinates(backpack.Owner)); + var bagContainer = _container.GetAllContainers(bag).First(); + _hands.TryPickupAnyHand(args.Actor, bag); + foreach (var i in backpack.Comp.SelectedSets) { var set = _proto.Index(backpack.Comp.PossibleSets[i]); foreach (var item in set.Content) { var ent = Spawn(item, _transform.GetMapCoordinates(backpack.Owner)); - if (TryComp(ent, out var itemComponent)) - _transform.DropNextTo(ent, backpack.Owner); + if (HasComp(ent)) + _container.InsertOrDrop(ent, bagContainer); } } _audio.PlayPvs(backpack.Comp.ApproveSound, backpack.Owner); diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml index 0e2d966dbae4..37ee58225197 100644 --- a/Resources/Changelog/Impstation.yml +++ b/Resources/Changelog/Impstation.yml @@ -1843,3 +1843,58 @@ id: 238 time: '2024-09-21T02:11:42.0000000+00:00' url: https://github.com/impstation/imp-station-14/pull/307 +- author: Tox3ct + changes: + - message: Added gray plushie. thui love keb piskun plushie + type: Add + id: 239 + time: '2024-09-21T18:04:28.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/315 +- author: Pinkbat5 + changes: + - message: HoPs rejoice! Brigmedic and roboticist can be selected as presets in + the ID card computer. + type: Add + - message: Scientists can now select the robotics PDA in their loadout. + type: Tweak + id: 240 + time: '2024-09-21T18:06:03.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/312 +- author: Pinkbat5 + changes: + - message: Added bronzeheart medal to Head of Security locker. + type: Add + id: 241 + time: '2024-09-21T18:06:46.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/313 +- author: aada + changes: + - message: NanoTrasen has signed new contracts with expert staff across many departments. + The experts happen to also be clowns. + type: Add + - message: New clown prestige loadouts. + type: Add + id: 242 + time: '2024-09-21T18:05:08.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/316 +- author: hivehum + changes: + - message: The Heretic greeting has more sauce. + type: Tweak + id: 243 + time: '2024-09-21T22:38:12.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/320 +- author: Darkmajia + changes: + - message: Heretic equipment is now marked with a contraband tag. + type: Add + id: 244 + time: '2024-09-21T22:38:24.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/318 +- author: TGRCDev + changes: + - message: Thief toolboxes now spawn a duffel bag to place your items in. + type: Tweak + id: 245 + time: '2024-09-21T22:39:53.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/317 diff --git a/Resources/Locale/en-US/Goobstation/Heretic/contraband/contraband-severity.ftl b/Resources/Locale/en-US/Goobstation/Heretic/contraband/contraband-severity.ftl new file mode 100644 index 000000000000..ce021f254edf --- /dev/null +++ b/Resources/Locale/en-US/Goobstation/Heretic/contraband/contraband-severity.ftl @@ -0,0 +1 @@ +contraband-examine-text-Heretic = [color=MediumPurple]This item is highly illegal heretical contraband![/color] \ No newline at end of file diff --git a/Resources/Locale/en-US/Goobstation/Heretic/game-ticking/game-presets/preset-heretic.ftl b/Resources/Locale/en-US/Goobstation/Heretic/game-ticking/game-presets/preset-heretic.ftl index 0a01a4024475..3b619d4cf614 100644 --- a/Resources/Locale/en-US/Goobstation/Heretic/game-ticking/game-presets/preset-heretic.ftl +++ b/Resources/Locale/en-US/Goobstation/Heretic/game-ticking/game-presets/preset-heretic.ftl @@ -9,9 +9,11 @@ heretic-gamemode-description = Dimensional anomaly detected within the station. There is no additional data. heretic-role-greeting-fluff = - Another day at a meaningless job. You feel a shimmer around you, as a realization of something strange in the air unfolds. You look inwards and discover something that will change your life. - - The Gates of Mansus open up to your mind. + Another day at a meaningless job… + …For everyone else. + You feel a shimmer around you; you feel something supernatural buzzing through the air. You look inwards and discover something that will change your life. + Forgotten, devoured, gutted. Humanity has forgotten the eldritch forces of decay, but the veil has weakened. We will make them taste fear again… + The Gates of Mansus crack open, and you peer inside. heretic-role-greeting = You are the Heretic! @@ -37,4 +39,4 @@ ghostrole-stalker-name = Flesh Stalker ghostrole-ghoul-desc = Aid your summoner in achieving ascension. ghostrole-prophet-desc = Aid your summoner in achieving ascension. Connect other believers to the Mansus Link. ghostrole-stalker-desc = Aid your summoner in achieving ascension. Jaunt and sabotage crew's lighting. -ghostrole-ghoul-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the one who summoned you and other eldritch beings. \ No newline at end of file +ghostrole-ghoul-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the one who summoned you and other eldritch beings. diff --git a/Resources/Locale/en-US/abilities/changeling.ftl b/Resources/Locale/en-US/abilities/changeling.ftl index e9424bca4cce..1deada837b2c 100644 --- a/Resources/Locale/en-US/abilities/changeling.ftl +++ b/Resources/Locale/en-US/abilities/changeling.ftl @@ -4,7 +4,7 @@ changeling-chemicals-deficit = Not enough chemicals! changeling-action-fail-lesserform = Can't use it while in lesser form! changeling-action-fail-absorbed = Need to absorb {$number} more organics to use it! -changeling-absorb-start = {CAPITALIZE(THE($user))} starts absorbing {CAPITALIZE(THE($target))}'s! +changeling-absorb-start = {CAPITALIZE(THE($user))} starts absorbing {CAPITALIZE(THE($target))}! changeling-absorb-fail-incapacitated = You can't absorb it until it's not incapacitated. changeling-absorb-fail-absorbed = You've already absorbed it. changeling-absorb-fail-unabsorbable = The target is not absorbable. diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index d728277a0494..9d4115937e3f 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -49,8 +49,10 @@ loadout-group-passenger-shoes = Passenger shoes loadout-group-passenger-neck = Passenger neck loadout-group-bartender-head = Bartender head +loadout-group-bartender-mask = Bartender mask loadout-group-bartender-jumpsuit = Bartender jumpsuit loadout-group-bartender-outerclothing = Bartender outer clothing +loadout-group-bartender-shoes = Bartender shoes loadout-group-bartender-mixologist = Mixologist Qualification loadout-group-chef-head = Chef head @@ -69,17 +71,22 @@ loadout-group-chaplain-mask = Chaplain mask loadout-group-chaplain-jumpsuit = Chaplain jumpsuit loadout-group-chaplain-outerclothing = Chaplain outer clothing loadout-group-chaplain-neck = Chaplain neck +loadout-group-chaplain-shoes = Chaplain shoes loadout-group-janitor-head = Janitor head +loadout-group-janitor-mask = Janitor mask loadout-group-janitor-jumpsuit = Janitor jumpsuit loadout-group-janitor-gloves = Janitor gloves loadout-group-janitor-outerclothing = Janitor outer clothing +loadout-group-janitor-shoes = Janitor shoes loadout-group-janitor-plunger = Janitor plunger loadout-group-botanist-head = Botanist head +loadout-group-botanist-mask = Botanist mask loadout-group-botanist-jumpsuit = Botanist jumpsuit loadout-group-botanist-backpack = Botanist backpack loadout-group-botanist-outerclothing = Botanist outer clothing +loadout-group-botanist-shoes = Botanist shoes loadout-group-clown-head = Clown head loadout-group-clown-jumpsuit = Clown jumpsuit @@ -107,6 +114,7 @@ loadout-group-quartermaster-backpack = Quartermaster backpack loadout-group-quartermaster-headset = Quartermaster headset loadout-group-cargo-technician-head = Cargo Technician head +loadout-group-cargo-technician-mask = Cargo Technician mask loadout-group-cargo-technician-jumpsuit = Cargo Technician jumpsuit loadout-group-cargo-technician-backpack = Cargo Technician backpack loadout-group-cargo-technician-outerclothing = Cargo Technician outer clothing @@ -130,6 +138,7 @@ loadout-group-chief-engineer-headset = Chief Engineer headset loadout-group-technical-assistant-jumpsuit = Technical Assistant jumpsuit loadout-group-station-engineer-head = Station Engineer head +loadout-group-station-engineer-mask = Station Engineer mask loadout-group-station-engineer-jumpsuit = Station Engineer jumpsuit loadout-group-station-engineer-backpack = Station Engineer backpack loadout-group-station-engineer-outerclothing = Station Engineer outer clothing @@ -151,6 +160,7 @@ loadout-group-research-director-backpack = Research Director backpack loadout-group-research-director-headset = Research Director headset loadout-group-scientist-head = Scientist head +loadout-group-scientist-mask = Scientist mask loadout-group-scientist-neck = Scientist neck loadout-group-scientist-jumpsuit = Scientist jumpsuit loadout-group-scientist-backpack = Scientist backpack @@ -172,8 +182,10 @@ loadout-group-head-of-security-headset = Head of Security headset loadout-group-warden-head = Warden head loadout-group-warden-jumpsuit = Warden jumpsuit loadout-group-warden-outerclothing = Warden outer clothing +loadout-group-upper-security-shoes = Security shoes loadout-group-security-head = Security head +loadout-group-security-mask = Security mask loadout-group-security-jumpsuit = Security jumpsuit loadout-group-security-backpack = Security backpack loadout-group-security-belt = Security Belt @@ -202,6 +214,7 @@ loadout-group-chief-medical-officer-neck = Chief Medical Officer neck loadout-group-chief-medical-officer-headset = Chief Medical Officer headset loadout-group-medical-doctor-head = Medical Doctor head +loadout-group-medical-doctor-mask = Medical Doctor mask loadout-group-medical-doctor-jumpsuit = Medical Doctor jumpsuit loadout-group-medical-doctor-outerclothing = Medical Doctor outer clothing loadout-group-medical-doctor-backpack = Medical Doctor backpack @@ -213,6 +226,7 @@ loadout-group-medical-intern-jumpsuit = Medical intern jumpsuit loadout-group-chemist-jumpsuit = Chemist jumpsuit loadout-group-chemist-outerclothing = Chemist outer clothing loadout-group-chemist-backpack = Chemist backpack +loadout-group-chemist-shoes = Chemist shoes loadout-group-paramedic-head = Paramedic head loadout-group-paramedic-jumpsuit = Paramedic jumpsuit @@ -220,7 +234,9 @@ loadout-group-paramedic-outerclothing = Paramedic outer clothing loadout-group-paramedic-shoes = Paramedic shoes # Wildcards +loadout-group-reporter-mask = Reporter mask loadout-group-reporter-jumpsuit = Reporter jumpsuit +loadout-group-reporter-shoes = Reporter shoes loadout-group-psychologist-jumpsuit = Psychologist jumpsuit diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 1aaddeab45d4..ed67c9af8291 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -39,6 +39,7 @@ - id: PlushieMoth - id: PlushieArachind - id: PlushiePenguin + - id: PlushieGray - type: entity id: CrateFunPlushie @@ -397,4 +398,4 @@ - type: StorageFill contents: - id: StackOfCigs - amount: 1 \ No newline at end of file + amount: 1 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 31ebad618370..2e80984f3853 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -326,6 +326,7 @@ - id: SecurityTechFabCircuitboard - id: WeaponDisabler - id: WantedListCartridge + - id: ClothingNeckBronzeheart # Hardsuit table, used for suit storage as well - type: entityTable diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 25eb06778a0d..81608c655cb0 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -297,6 +297,102 @@ Piercing: 0.95 Heat: 0.95 +# admeme only +- type: entity + parent: [ClothingMaskClown, BaseCommandContraband] + id: ClothingMaskClownCaptain + name: authority clown wig and mask + description: A mask and wig for when the captain shows their true colors. + components: + - type: Sprite + sprite: Clothing/Mask/clown_captain.rsi + - type: Clothing + sprite: Clothing/Mask/clown_captain.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownCargo + name: strong clown wig and mask + description: A powerful mask and wig for the clown that can drag a crate with one hand. + components: + - type: Sprite + sprite: Clothing/Mask/clown_cargo.rsi + - type: Clothing + sprite: Clothing/Mask/clown_cargo.rsi + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownChaplin + name: holy clown wig and mask + description: A mask and wig symbolizing clown asceticism. + components: + - type: Sprite + sprite: Clothing/Mask/clown_chaplin.rsi + - type: Clothing + sprite: Clothing/Mask/clown_chaplin.rsi + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownEngineer + name: practical clown wig and mask + description: A problem solver's mask and wig. + components: + - type: Sprite + sprite: Clothing/Mask/clown_engineer.rsi + - type: Clothing + sprite: Clothing/Mask/clown_engineer.rsi + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownMedical + name: helpful clown wig and mask + description: Copyright infringing mask and wig. + components: + - type: Sprite + sprite: Clothing/Mask/clown_medical.rsi + - type: Clothing + sprite: Clothing/Mask/clown_medical.rsi + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownRobotics + name: cyber clown wig and mask + description: Mask and wig of choice for the clown that doesn't need to be taught how to use a computer. + components: + - type: Sprite + sprite: Clothing/Mask/clown_robotics.rsi + - type: Clothing + sprite: Clothing/Mask/clown_robotics.rsi + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownScience + name: genius clown wig and mask + description: Only the smartest clowns get to wear this mask and wig. + components: + - type: Sprite + sprite: Clothing/Mask/clown_science.rsi + - type: Clothing + sprite: Clothing/Mask/clown_science.rsi + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownService + name: giving clown wig and mask + description: Mask and wig for the clown with the willpower not to steal. + components: + - type: Sprite + sprite: Clothing/Mask/clown_service.rsi + - type: Clothing + sprite: Clothing/Mask/clown_service.rsi + - type: entity parent: ClothingMaskBase id: ClothingMaskJoy diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 57ec79f598af..a3945ab512cd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1047,6 +1047,21 @@ - type: Icon state: pda-brigmedic +- type: entity + parent: BasePDA + id: RoboticsPDA + name: robotics PDA + description: It's covered in scratches. + components: + - type: Pda + id: ResearchIDCard + state: pda-roboticist + - type: PdaBorderColor + borderColor: "#484848" + accentVColor: "#d33725" + - type: Icon + state: pda-roboticist + - type: entity parent: ClownPDA id: CluwnePDA diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 3797c05d7148..4bb1a19798da 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -884,6 +884,34 @@ graph: YarnNoodles node: noodles +- type: entity + parent: BasePlushie + id: PlushieGray + name: gray plushie + description: Manufactured recently to commemorate the gray exchange program becoming a booming success. It feels plasticky and seems easy to chew on. Thui love keb piskun plushie!! + components: + - type: Sprite + state: plushie_gray + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Gray/gray_scream.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Gray/gray_cry.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Gray/gray_scream.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Voice/Gray/gray_scream.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Gray/gray_scream.ogg + - type: Food + requiresSpecialDigestion: false + useSound: + path: /Audio/Voice/Gray/gray_scream.ogg + ## Cheapo Figurines - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 30e7cfa9daca..0b7b7cd6f198 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -467,6 +467,26 @@ layers: - state: default - state: idbrigmedic + - type: IdCard + jobTitle: Brigmedic + jobIcon: JobIconBrigmedic + - type: PresetIdCard + job: Brigmedic + +- type: entity + parent: IDCardStandard + id: RoboticsIDCard + name: robotics ID card + components: + - type: Sprite + layers: + - state: default + - state: idroboticist + - type: IdCard + jobTitle: Roboticist + jobIcon: JobIconRoboticist + - type: PresetIdCard + job: Roboticist - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Head/hoods.yml index 80309c347036..027cf1db70e8 100644 --- a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Head/hoods.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseHereticContraband] id: ClothingHeadHatHoodHeretic name: ominous hood description: A torn, dust-caked hood. Strange eyes line the inside. diff --git a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Mask/masks.yml b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Mask/masks.yml index 211bb0a39f13..5577f378baaa 100644 --- a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Mask/masks.yml +++ b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Mask/masks.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingMaskBase + parent: [ClothingMaskBase, BaseHereticContraband] id: ClothingMaskMadHeretic name: abyssal mask description: A mask created from suffering. When you look into its eyes, it looks back. diff --git a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Neck/specific.yml index 02a3909b5ade..45d3cd4ee3ae 100644 --- a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Neck/specific.yml +++ b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/Neck/specific.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseHereticContraband] id: ClothingNeckAmberFocus name: amber focus description: An amber focusing glass that provides a link to the world beyond. The necklace seems to twitch, but only when you look at it from the corner of your eye. diff --git a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/OuterClothing/armor.yml index 6b5a2371435f..6614efa22ecc 100644 --- a/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Goobstation/Heretic/Entities/Clothing/OuterClothing/armor.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingOuterBaseMedium, ClothingOuterStorageToggleableBase] + parent: [ClothingOuterBaseMedium, ClothingOuterStorageToggleableBase, BaseHereticContraband] id: ClothingOuterArmorHeretic name: ominous armor description: A ragged, dusty set of robes. Strange eyes line the inside. diff --git a/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/Weapons/Melee/heretic_blades.yml b/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/Weapons/Melee/heretic_blades.yml index 88944d6f4000..a109a8f3b237 100644 --- a/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/Weapons/Melee/heretic_blades.yml +++ b/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/Weapons/Melee/heretic_blades.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseHereticContraband] id: HereticBladeBase name: eldritch blade description: The sickly blade used by sinister individuals for rituals and sacrifices. diff --git a/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/base_contraband.yml new file mode 100644 index 000000000000..aaa41577d544 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Heretic/Entities/Objects/base_contraband.yml @@ -0,0 +1,9 @@ +# heretic items +- type: entity + id: BaseHereticContraband + abstract: true + components: + - type: Contraband + severity: Heretic + # no one should be carrying this around visibly! + allowedDepartments: null \ No newline at end of file diff --git a/Resources/Prototypes/Goobstation/Heretic/contraband_severities.yml b/Resources/Prototypes/Goobstation/Heretic/contraband_severities.yml new file mode 100644 index 000000000000..cff97d7e580e --- /dev/null +++ b/Resources/Prototypes/Goobstation/Heretic/contraband_severities.yml @@ -0,0 +1,4 @@ +# This is clear heretic contraband and is illegal to own IC. +- type: contrabandSeverity + id: Heretic + examineText: contraband-examine-text-Heretic \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index d9c4faed8ce3..209fad2a32cd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -46,6 +46,12 @@ equipment: outerClothing: ClothingOuterWinterJani +# Shoes +- type: loadout + id: JanitorGaloshes + equipment: + shoes: ClothingShoesGaloshes + # Misc - type: loadout id: JanitorGoldenPlunger diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index a2978ddc703c..fb35f5031198 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -153,6 +153,11 @@ equipment: id: SciencePDA +- type: loadout + id: RoboticistPDA + equipment: + id: RoboticsPDA + - type: loadout id: SeniorResearcherPDA effects: diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/clown_mask.yml b/Resources/Prototypes/Loadouts/Miscellaneous/clown_mask.yml new file mode 100644 index 000000000000..568cbb1636d8 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Miscellaneous/clown_mask.yml @@ -0,0 +1,235 @@ +# Timers +- type: loadoutEffectGroup + id: ClownExpertTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + +- type: loadoutEffectGroup + id: ClownJanitorTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobJanitor + time: 108000 # 30 hrs + +- type: loadoutEffectGroup + id: ClownCargoTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 216000 #60 hrs + +- type: loadoutEffectGroup + id: ClownEngineerTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 216000 #60 hrs + +- type: loadoutEffectGroup + id: ClownDoctorTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Medical + time: 216000 #60 hrs + +- type: loadoutEffectGroup + id: ClownScientistTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Science + time: 216000 #60 hrs + +- type: loadoutEffectGroup + id: ClownSecurityTimer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 108000 # 30 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Security + time: 216000 #60 hrs + +# Civilian +- type: loadout + id: ChaplinClown + effects: + - !type:GroupLoadoutEffect + proto: ClownExpertTimer + equipment: + mask: ClothingMaskClownChaplin + +- type: loadout + id: ChaplinHonkrobes + effects: + - !type:GroupLoadoutEffect + proto: ClownExpertTimer + equipment: + outerClothing: ClothingOuterClownPriest + +- type: loadout + id: ServiceClown + effects: + - !type:GroupLoadoutEffect + proto: ClownExpertTimer + equipment: + mask: ClothingMaskClownService + +- type: loadout + id: ClownShoesExpert + effects: + - !type:GroupLoadoutEffect + proto: ClownExpertTimer + equipment: + shoes: ClothingShoesClown + +- type: loadout + id: JanitorClown + effects: + - !type:GroupLoadoutEffect + proto: ClownJanitorTimer + equipment: + mask: ClothingMaskClownScience + +- type: loadout + id: JanitorClownShoes + effects: + - !type:GroupLoadoutEffect + proto: ClownJanitorTimer + equipment: + shoes: ClothingShoesClown + +# Cargo +- type: loadout + id: CargoClown + effects: + - !type:GroupLoadoutEffect + proto: ClownCargoTimer + equipment: + mask: ClothingMaskClownCargo + +- type: loadout + id: CargoClownShoes + effects: + - !type:GroupLoadoutEffect + proto: ClownCargoTimer + equipment: + shoes: ClothingShoesClown + +# Engineer +- type: loadout + id: EngineerClown + effects: + - !type:GroupLoadoutEffect + proto: ClownEngineerTimer + equipment: + mask: ClothingMaskClownEngineer + +- type: loadout + id: EngineerClownShoes + effects: + - !type:GroupLoadoutEffect + proto: ClownEngineerTimer + equipment: + shoes: ClothingShoesClown + +# Doctor +- type: loadout + id: DoctorClown + effects: + - !type:GroupLoadoutEffect + proto: ClownDoctorTimer + equipment: + mask: ClothingMaskClownMedical + +- type: loadout + id: DoctorClownShoes + effects: + - !type:GroupLoadoutEffect + proto: ClownDoctorTimer + equipment: + shoes: ClothingShoesClown + +# Scientist +- type: loadout + id: ScientistClown + effects: + - !type:GroupLoadoutEffect + proto: ClownScientistTimer + equipment: + mask: ClothingMaskClownScience + +- type: loadout + id: RoboticsClown + effects: + - !type:GroupLoadoutEffect + proto: ClownScientistTimer + equipment: + mask: ClothingMaskClownRobotics + +- type: loadout + id: ScientistClownShoes + effects: + - !type:GroupLoadoutEffect + proto: ClownScientistTimer + equipment: + shoes: ClothingShoesClown + +# Security +- type: loadout + id: SecurityClown + effects: + - !type:GroupLoadoutEffect + proto: ClownSecurityTimer + equipment: + mask: ClothingMaskClownSecurity + +- type: loadout + id: SecurityClownShoes + effects: + - !type:GroupLoadoutEffect + proto: ClownSecurityTimer + equipment: + shoes: ClothingShoesClown diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index dd8ff9b37c01..f866cea6ba8f 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -282,6 +282,13 @@ - BartenderHead - BartenderBowler +- type: loadoutGroup + id: BartenderMask + name: loadout-group-bartender-mask + minLimit: 0 + loadouts: + - ServiceClown + - type: loadoutGroup id: BartenderJumpsuit name: loadout-group-bartender-jumpsuit @@ -299,6 +306,13 @@ - BartenderApron - BartenderWintercoat +- type: loadoutGroup + id: BartenderShoes + name: loadout-group-bartender-shoes + loadouts: + - BlackShoes + - ClownShoesExpert + - type: loadoutGroup id: Mixologist name: loadout-group-bartender-mixologist @@ -319,6 +333,7 @@ minLimit: 0 loadouts: - ChefMask + - ServiceClown - type: loadoutGroup id: ChefJumpsuit @@ -342,6 +357,7 @@ loadouts: - BlackShoes - ChefShoes + - ClownShoesExpert - type: loadoutGroup id: LibrarianJumpsuit @@ -391,6 +407,7 @@ minLimit: 0 loadouts: - ChaplainMask + - ChaplinClown - type: loadoutGroup id: ChaplainJumpsuit @@ -410,6 +427,7 @@ - ChaplainNunRobe - ChaplainBlackHoodie - ChaplainHoodie + - ChaplinHonkrobes - type: loadoutGroup id: ChaplainNeck @@ -418,6 +436,13 @@ loadouts: - ChaplainNeck +- type: loadoutGroup + id: ChaplainShoes + name: loadout-group-chaplain-shoes + loadouts: + - BlackShoes + - ClownShoesExpert + - type: loadoutGroup id: JanitorHead name: loadout-group-janitor-head @@ -425,6 +450,13 @@ loadouts: - JanitorHead +- type: loadoutGroup + id: JanitorMask + name: loadout-group-janitor-mask + minLimit: 0 + loadouts: + - JanitorClown + - type: loadoutGroup id: JanitorJumpsuit name: loadout-group-janitor-jumpsuit @@ -448,6 +480,13 @@ loadouts: - JanitorWintercoat +- type: loadoutGroup + id: JanitorShoes + name: loadout-group-janitor-shoes + loadouts: + - JanitorGaloshes + - JanitorClownShoes + - type: loadoutGroup id: JanitorPlunger name: loadout-group-janitor-plunger @@ -463,6 +502,13 @@ - BotanistHead - BotanistBandana +- type: loadoutGroup + id: BotanistMask + name: loadout-group-botanist-mask + minLimit: 0 + loadouts: + - ServiceClown + - type: loadoutGroup id: BotanistJumpsuit name: loadout-group-botanist-jumpsuit @@ -487,6 +533,13 @@ - BotanistApron - BotanistWintercoat +- type: loadoutGroup + id: BotanistShoes + name: loadout-group-botanist-shoes + loadouts: + - BrownShoes + - ClownShoesExpert + - type: loadoutGroup id: ClownHead name: loadout-group-clown-head @@ -710,6 +763,13 @@ loadouts: - CargoTechnicianHead +- type: loadoutGroup + id: CargoTechnicianMask + name: loadout-group-cargo-technician-mask + minLimit: 0 + loadouts: + - CargoClown + - type: loadoutGroup id: CargoTechnicianJumpsuit name: loadout-group-cargo-technician-jumpsuit @@ -738,6 +798,7 @@ loadouts: - BlackShoes - CargoWinterBoots + - CargoClownShoes - type: loadoutGroup id: CargoTechnicianPDA @@ -852,6 +913,13 @@ - StationEngineerHardhatRed - SeniorEngineerBeret +- type: loadoutGroup + id: StationEngineerMask + name: loadout-group-station-engineer-mask + minLimit: 0 + loadouts: + - EngineerClown + - type: loadoutGroup id: StationEngineerJumpsuit name: loadout-group-station-engineer-jumpsuit @@ -884,6 +952,7 @@ loadouts: - WorkBoots - EngineeringWinterBoots + - EngineerClownShoes - type: loadoutGroup id: StationEngineerID @@ -998,6 +1067,14 @@ - SkullBandana - ScientificBeret +- type: loadoutGroup + id: ScientistMask + name: loadout-group-scientist-mask + minLimit: 0 + loadouts: + - ScientistClown + - RoboticsClown + - type: loadoutGroup id: ScientistNeck name: loadout-group-scientist-neck @@ -1044,6 +1121,7 @@ - WhiteShoes - BlackShoes - ScienceWinterBoots + - ScientistClownShoes - type: loadoutGroup id: ScientistGloves @@ -1059,6 +1137,7 @@ name: loadout-group-scientist-id loadouts: - ScientistPDA + - RoboticistPDA - SeniorResearcherPDA - type: loadoutGroup @@ -1157,6 +1236,13 @@ - SecurityHat - TrooperHat +- type: loadoutGroup + id: SecurityMask + name: loadout-group-security-mask + minLimit: 0 + loadouts: + - SecurityClown + - type: loadoutGroup id: SecurityJumpsuit name: loadout-group-security-jumpsuit @@ -1199,6 +1285,14 @@ loadouts: - JackBoots - SecurityWinterBoots + - SecurityClownShoes + +- type: loadoutGroup + id: UpperSecurityShoes + name: loadout-group-upper-security-shoes + loadouts: + - JackBoots + - SecurityWinterBoots - type: loadoutGroup id: SecurityPDA @@ -1367,11 +1461,12 @@ - MedicalDoctorDuffel - type: loadoutGroup - id: MedicalShoes + id: MedicalDoctorShoes name: loadout-group-medical-doctor-shoes loadouts: - WhiteShoes - MedicalWinterBoots + - DoctorClownShoes - type: loadoutGroup id: MedicalDoctorPDA @@ -1395,6 +1490,14 @@ loadouts: - SterileMask +- type: loadoutGroup + id: MedicalDoctorMask + name: loadout-group-medical-doctor-mask + minLimit: 0 + loadouts: + - SterileMask + - DoctorClown + - type: loadoutGroup id: MedicalInternJumpsuit name: loadout-group-medical-intern-jumpsuit @@ -1426,6 +1529,13 @@ - ChemistSatchel - ChemistDuffel +- type: loadoutGroup + id: ChemistShoes + name: loadout-group-chemist-shoes + loadouts: + - WhiteShoes + - MedicalWinterBoots + - type: loadoutGroup id: ParamedicHead name: loadout-group-paramedic-head @@ -1466,6 +1576,13 @@ - LoadoutSpeciesVoxNitrogen # Wildcards +- type: loadoutGroup + id: ReporterMask + name: loadout-group-reporter-mask + minLimit: 0 + loadouts: + - ServiceClown + - type: loadoutGroup id: ReporterJumpsuit name: loadout-group-reporter-jumpsuit @@ -1473,6 +1590,13 @@ - ReporterJumpsuit - JournalistJumpsuit +- type: loadoutGroup + id: ReporterShoes + name: loadout-group-reporter-shoes + loadouts: + - WhiteShoes + - ClownShoesExpert + - type: loadoutGroup id: PsychologistJumpsuit name: loadout-group-psychologist-jumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index d060af73a046..95a351fed970 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -57,9 +57,11 @@ groups: - GroupTankHarness - BartenderHead + - BartenderMask - BartenderJumpsuit - CommonBackpack - BartenderOuterClothing + - BartenderShoes - Glasses - Survival - Trinkets @@ -125,6 +127,7 @@ - ChaplainJumpsuit - CommonBackpack - ChaplainOuterClothing + - ChaplainShoes - Glasses - Survival - Trinkets @@ -135,10 +138,12 @@ groups: - GroupTankHarness - JanitorHead + - JanitorMask - JanitorJumpsuit - JanitorGloves - CommonBackpack - JanitorOuterClothing + - JanitorShoes - Glasses - Survival - Trinkets @@ -150,9 +155,11 @@ groups: - GroupTankHarness - BotanistHead + - BotanistMask - BotanistJumpsuit - BotanistBackpack - BotanistOuterClothing + - BotanistShoes - Glasses - Survival - Trinkets @@ -220,6 +227,7 @@ groups: - GroupTankHarness - CargoTechnicianHead + - CargoTechnicianMask - CargoTechnicianJumpsuit - CargoTechnicianBackpack - CargoTechnicianOuterClothing @@ -274,6 +282,7 @@ groups: - GroupTankHarness - StationEngineerHead + - StationEngineerMask - StationEngineerJumpsuit - StationEngineerBackpack - StationEngineerOuterClothing @@ -318,6 +327,7 @@ groups: - GroupTankHarness - ScientistHead + - ScientistMask - ScientistNeck - ScientistJumpsuit - ScientistBackpack @@ -352,7 +362,7 @@ - HeadofSecurityBackpack - SecurityBelt - HeadofSecurityOuterClothing - - SecurityShoes + - UpperSecurityShoes - SurvivalSecurityCommand - Trinkets - SecurityStar @@ -366,7 +376,7 @@ - SecurityBackpack - SecurityBelt - WardenOuterClothing - - SecurityShoes + - UpperSecurityShoes - SurvivalSecurity - Trinkets - SecurityStar @@ -376,6 +386,7 @@ id: JobSecurityOfficer groups: - SecurityHead + - SecurityMask - SecurityJumpsuit - SecurityBackpack - SecurityOuterClothing @@ -392,6 +403,7 @@ groups: - GroupTankHarness - DetectiveHead + - SecurityMask - DetectiveNeck - DetectiveJumpsuit - SecurityBackpack @@ -435,12 +447,12 @@ groups: - GroupTankHarness - MedicalDoctorHead - - MedicalMask + - MedicalDoctorMask - MedicalDoctorJumpsuit - MedicalGloves - MedicalBackpack - MedicalDoctorOuterClothing - - MedicalShoes + - MedicalDoctorShoes - MedicalDoctorPDA - Glasses - SurvivalMedical @@ -467,7 +479,7 @@ - MedicalGloves - ChemistBackpack - ChemistOuterClothing - - MedicalShoes + - ChemistShoes - SurvivalMedical - Trinkets - GroupSpeciesBreathToolMedical @@ -503,8 +515,10 @@ id: JobReporter groups: - GroupTankHarness + - ReporterMask - ReporterJumpsuit - CommonBackpack + - ReporterShoes - Glasses - Survival - Trinkets diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 2d035ee3b458..2e55c0c5bb28 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -21,7 +21,6 @@ - type: startingGear id: BartenderGear equipment: - shoes: ClothingShoesColorBlack id: BartenderPDA ears: ClothingHeadsetService #storage: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index dd25a2abe2eb..7dc6232ba35a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -17,7 +17,6 @@ - type: startingGear id: BotanistGear equipment: - shoes: ClothingShoesColorBrown id: BotanistPDA ears: ClothingHeadsetService belt: ClothingBeltPlantFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 1ab77dbae58d..46cb3c5b03b2 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -17,7 +17,6 @@ - type: startingGear id: ChaplainGear equipment: - shoes: ClothingShoesColorBlack id: ChaplainPDA ears: ClothingHeadsetService storage: diff --git a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml new file mode 100644 index 000000000000..4e2ecef2165f --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml @@ -0,0 +1,12 @@ +- type: job + id: Roboticist + name: job-name-roboticist + description: job-description-roboticist + playTimeTracker: JobRoboticist + icon: JobIconRoboticist + setPreference: false + overrideConsoleVisibility: true + access: + - Research + - Medical + - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml new file mode 100644 index 000000000000..9a83df2c391e --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -0,0 +1,15 @@ +- type: job + id: Brigmedic + name: job-name-brigmedic + description: job-description-brigmedic + playTimeTracker: JobBrigmedic + canBeAntag: false + icon: JobIconBrigmedic + setPreference: false + overrideConsoleVisibility: true + access: + - Medical + - Security + - Brig + - Maintenance + - External diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index d0a35990d708..3cabc0afcaad 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -13,7 +13,6 @@ - type: startingGear id: ReporterGear equipment: - shoes: ClothingShoesColorWhite id: ReporterPDA ears: ClothingHeadsetService #storage: diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 26647e79ae07..d2379965c44c 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -16,6 +16,9 @@ - type: playTimeTracker id: JobBotanist +- type: playTimeTracker + id: JobBrigmedic + - type: playTimeTracker id: JobCaptain @@ -118,6 +121,9 @@ - type: playTimeTracker id: JobResearchDirector +- type: playTimeTracker + id: JobRoboticist + - type: playTimeTracker id: JobSalvageSpecialist diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..891c2722b8b9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..f58d98daa86a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..9b6fcbae0c95 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK.png new file mode 100644 index 000000000000..54015757eb35 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/icon.png new file mode 100644 index 000000000000..e6c00ab568c6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/inhand-left.png new file mode 100644 index 000000000000..a46655be4cf9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_captain.rsi/inhand-right.png new file mode 100644 index 000000000000..e0c11533f7df Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_captain.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_captain.rsi/meta.json new file mode 100644 index 000000000000..196a0d2b8700 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_captain.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified version of clown mask by GoldenCan(github) (Copyright for clown mask: Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..d645019ea393 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..80a649dda627 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..88652b9aa098 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK.png new file mode 100644 index 000000000000..ebbb8a622ba5 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/icon.png new file mode 100644 index 000000000000..cf424c396247 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/inhand-left.png new file mode 100644 index 000000000000..c3aaf9e57f26 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/inhand-right.png new file mode 100644 index 000000000000..8c7b7a5c968e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_cargo.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/meta.json new file mode 100644 index 000000000000..dfcb12b83d6b --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_cargo.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..89de9aac46e0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..062e6046b0c4 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..4c10191d208a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK.png new file mode 100644 index 000000000000..ecbda10cf24e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/icon.png new file mode 100644 index 000000000000..3810f71f9f53 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/inhand-left.png new file mode 100644 index 000000000000..177c797fdda1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/inhand-right.png new file mode 100644 index 000000000000..fb0dec3e7c8b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/meta.json new file mode 100644 index 000000000000..dfcb12b83d6b --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_chaplin.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..eab94bc7baf6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..7ae509154b78 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..7e811e09237c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK.png new file mode 100644 index 000000000000..936f1d137220 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/icon.png new file mode 100644 index 000000000000..488fa72ae103 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/inhand-left.png new file mode 100644 index 000000000000..e77491505c17 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/inhand-right.png new file mode 100644 index 000000000000..b07c3c21aba6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_engineer.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/meta.json new file mode 100644 index 000000000000..196a0d2b8700 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_engineer.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified version of clown mask by GoldenCan(github) (Copyright for clown mask: Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..86140c5aa07b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..63a0e1c86102 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..85d9cb60e5ed Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK.png new file mode 100644 index 000000000000..0c9af3e3d190 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/icon.png new file mode 100644 index 000000000000..8062974cdb46 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/inhand-left.png new file mode 100644 index 000000000000..ac4dd17ac15b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_medical.rsi/inhand-right.png new file mode 100644 index 000000000000..bb92fe7b7db3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_medical.rsi/meta.json new file mode 100644 index 000000000000..dfcb12b83d6b --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_medical.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..46c88c18b275 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..7441e0124dc7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..f4eeb36cae09 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK.png new file mode 100644 index 000000000000..f3696b7ce1f0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/icon.png new file mode 100644 index 000000000000..fe03bffbe995 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/inhand-left.png new file mode 100644 index 000000000000..ddeeaaeab2d2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/inhand-right.png new file mode 100644 index 000000000000..e75b1e22a3d7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_robotics.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/meta.json new file mode 100644 index 000000000000..dfcb12b83d6b --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_robotics.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..4d837350127f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..2b4f73044a2e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..e6921c316c6c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK.png new file mode 100644 index 000000000000..7bc30e21c45d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/icon.png new file mode 100644 index 000000000000..ac28299b3730 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/inhand-left.png new file mode 100644 index 000000000000..18fb712e6869 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_science.rsi/inhand-right.png new file mode 100644 index 000000000000..94902c72bc82 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_science.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_science.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_science.rsi/meta.json new file mode 100644 index 000000000000..dfcb12b83d6b --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_science.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-hamster.png new file mode 100644 index 000000000000..0ac6dde81584 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-reptilian.png new file mode 100644 index 000000000000..cb6328203c79 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-vox.png new file mode 100644 index 000000000000..27bb15f32cd1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK.png new file mode 100644 index 000000000000..36f3f5a74688 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/icon.png new file mode 100644 index 000000000000..c6cf39c975fa Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/inhand-left.png new file mode 100644 index 000000000000..8cd5af26f545 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_service.rsi/inhand-right.png new file mode 100644 index 000000000000..78a12104e3be Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_service.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_service.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_service.rsi/meta.json new file mode 100644 index 000000000000..dfcb12b83d6b --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_service.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy. Further modified and recolored by imada(github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index a9aeff633586..ea1e55b97187 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -136,6 +136,9 @@ { "name": "plushie_xeno" }, + { + "name": "plushie_gray" + }, { "name": "carpplush-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_gray.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_gray.png new file mode 100644 index 000000000000..3b4a755d13c6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_gray.png differ