diff --git a/Resources/Changelog/Parts/insulated.yml b/Resources/Changelog/Parts/insulated.yml new file mode 100644 index 0000000000..8e05f902d4 --- /dev/null +++ b/Resources/Changelog/Parts/insulated.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Add # One of the following: Add, Remove, Tweak, Fix + message: Added insulated gloves (and their cheap knockoffs) to the station. diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 53ce3deb4d..f32d22273f 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -16913,6 +16913,14 @@ entities: pos: -7.5,2.5 parent: 853 type: Transform +- uid: 1000 + type: CableApcExtension + components: + - pos: 6.5,18.5 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 1001 type: CableApcExtension components: @@ -19932,6 +19940,16 @@ entities: pos: -31.5,0.5 parent: 853 type: Transform +- uid: 1351 + type: CableApcExtension + components: + - pos: -12.5,8.5 + parent: 853 + type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics - uid: 1352 type: WallSolid components: @@ -25253,6 +25271,16 @@ entities: pos: 0.5,-23.5 parent: 853 type: Transform +- uid: 2085 + type: CableApcExtension + components: + - pos: -10.5,7.5 + parent: 853 + type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics - uid: 2086 type: WallSolid components: @@ -27459,11 +27487,13 @@ entities: parent: 853 type: Transform - uid: 2395 - type: Crowbar + type: CableApcExtension components: - - pos: -15.459177,-11.244378 + - pos: -10.5,8.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 2396 @@ -28442,6 +28472,14 @@ entities: type: Transform - startingCharge: 11999.75 type: Battery +- uid: 2523 + type: ParchisBoard + components: + - pos: -23.526257,-2.4008582 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2524 type: WallSolid components: @@ -28571,6 +28609,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2537 + type: ClothingHandsGlovesColorYellow + components: + - pos: 49.76104,4.706455 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2538 type: CableApcExtension components: @@ -28648,6 +28694,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2545 + type: ClothingHandsGlovesColorYellowBudget + components: + - pos: -29.511574,7.569112 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2546 type: CableApcExtension components: @@ -29005,25 +29059,19 @@ entities: - canCollide: False type: Physics - uid: 2581 - type: CableApcExtension + type: ClothingHandsGlovesColorYellowBudget components: - - rot: 1.5707963267948966 rad - pos: -12.5,8.5 + - pos: -15.522014,-11.394222 parent: 853 type: Transform - - visible: False - type: Sprite - canCollide: False type: Physics - uid: 2582 type: CableApcExtension components: - - rot: 1.5707963267948966 rad - pos: -11.5,8.5 + - pos: 6.5,19.5 parent: 853 type: Transform - - visible: False - type: Sprite - canCollide: False type: Physics - uid: 2583 @@ -29252,10 +29300,11 @@ entities: - uid: 2603 type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad - pos: 0.5,6.5 + - pos: -1.5,13.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 2604 @@ -29269,10 +29318,11 @@ entities: - uid: 2605 type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad - pos: -0.5,6.5 + - pos: -1.5,12.5 parent: 853 type: Transform + - visible: False + type: Sprite - canCollide: False type: Physics - uid: 2606 @@ -29350,6 +29400,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2613 + type: CableApcExtension + components: + - pos: -0.5,9.5 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2614 type: CableApcExtension components: @@ -29667,6 +29725,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2643 + type: CableApcExtension + components: + - pos: -1.5,9.5 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2644 type: CableApcExtension components: @@ -30357,6 +30423,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2708 + type: CableApcExtension + components: + - pos: 0.5,6.5 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2709 type: CableApcExtension components: @@ -30481,6 +30555,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2721 + type: CableApcExtension + components: + - pos: -0.5,6.5 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2722 type: CableApcExtension components: @@ -30607,6 +30689,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2734 + type: CableApcExtension + components: + - pos: -10.5,6.5 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2735 type: CableApcExtension components: @@ -30673,6 +30763,16 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 2741 + type: CableApcExtension + components: + - pos: -11.5,8.5 + parent: 853 + type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics - uid: 2742 type: CableApcExtension components: @@ -44451,6 +44551,8 @@ entities: - pos: -11.5,5.5 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -51975,15 +52077,6 @@ entities: - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer -- uid: 5032 - type: ChessBoard - components: - - rot: 1.5707963267948966 rad - pos: -23.505022,-2.3849773 - parent: 853 - type: Transform - - canCollide: False - type: Physics - uid: 5033 type: CigaretteFilter components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index ed6ab1f72e..22be9d79d3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -87,6 +87,7 @@ contents: - id: ClothingHeadHelmetHardsuitEngineering - id: ClothingOuterHardsuitEngineering + - id: ClothingHandsGlovesColorYellow - id: ClothingMaskBreath - id: OxygenTankFilled - id: ClothingShoesBootsMag diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 8536743b09..f21a34b141 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -105,6 +105,7 @@ - id: ClothingBeltChiefEngineerFilled - id: ClothingHeadHatBeretEngineering - id: ClothingShoesBootsMag + - id: ClothingHandsGlovesColorYellow - id: CigarCase prob: 0.15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index e9cf436a99..5de717fcde 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -10,3 +10,4 @@ Wirecutter: 5 Wrench: 5 Screwdriver: 5 + ClothingHandsGlovesColorYellowBudget: 5 diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index 6a06adce03..4b4f6c91e5 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -124,7 +124,7 @@ - type: entity parent: ClothingHandsGlovesColorYellow - id: ClothingHandsGlovesColorYellowCheap + id: ClothingHandsGlovesColorYellowBudget name: budget insulated gloves description: These gloves are cheap knockoffs of the coveted ones - no way this can end badly. components: