Merge branch 'master' into command-prestige-gear

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<ThiefUndeterminedBackpackComponent> 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<ItemComponent>(ent, out var itemComponent))
-                    _transform.DropNextTo(ent, backpack.Owner);
+                if (HasComp<ItemComponent>(ent))
+                    _container.InsertOrDrop(ent, bagContainer);
             }
         }
         _audio.PlayPvs(backpack.Comp.ApproveSound, backpack.Owner);

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

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]

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.
+ghostrole-ghoul-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the one who summoned you and other eldritch beings.

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.

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,14 +226,17 @@ 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
 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
 

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
+        amount: 1

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

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

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