diff --git a/Resources/Maps/ss220-box.yml b/Resources/Maps/ss220-box.yml index a6f82ea27e28db..076b975239c420 100644 --- a/Resources/Maps/ss220-box.yml +++ b/Resources/Maps/ss220-box.yml @@ -12630,7 +12630,7 @@ entities: - dockJointId: docking46345 dockedWith: 21828 type: Docking - - SecondsUntilStateChange: -321279.1 + - SecondsUntilStateChange: -321712.94 changeAirtight: False state: Opening type: Door @@ -12672,7 +12672,7 @@ entities: - dockJointId: docking46345 dockedWith: 562 type: Docking - - SecondsUntilStateChange: -321279.1 + - SecondsUntilStateChange: -321712.94 changeAirtight: False state: Opening type: Door @@ -19140,7 +19140,8 @@ entities: type: Transform - uid: 11618 components: - - pos: 17.038202,29.558767 + - rot: -0.17453292519943295 rad + pos: 17.038202,29.558767 parent: 8364 type: Transform - uid: 20894 @@ -145287,12 +145288,14 @@ entities: type: Transform - uid: 7792 components: - - pos: 9.007783,20.108465 + - rot: 1.5184364492350666 rad + pos: 9.007783,20.258465 parent: 8364 type: Transform - uid: 7801 components: - - pos: 8.125072,20.360777 + - rot: 0.2094395102393196 rad + pos: 8.125072,20.360777 parent: 8364 type: Transform - uid: 7941 @@ -192047,16 +192050,26 @@ entities: entities: - uid: 28778 components: - - rot: 1.5707963267948966 rad - pos: 1.5,44.5 + - pos: 4.5,47.5 parent: 8364 type: Transform + - canCollide: False + type: Physics + - fixtures: {} + type: Fixtures + - range: 2.5 + type: InteractionRange - uid: 28779 components: - - rot: 1.5707963267948966 rad - pos: 1.5,46.5 + - pos: 5.5,47.5 parent: 8364 type: Transform + - canCollide: False + type: Physics + - fixtures: {} + type: Fixtures + - range: 2.5 + type: InteractionRange - proto: WardrobeAtmospherics entities: - uid: 10313 diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index e54b3286fddfdb..98785b816d7cac 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -103,9 +103,10 @@ mode: SnapgridCenter components: - type: Sprite - sprite: Structures/Power/wall_recharger.rsi + sprite: SS220/Structures/Wallmounts/wall_recharger.rsi # SS220/Directionl wall charger drawdepth: SmallObjects - snapCardinals: true + snapCardinals: false # SS220/Directionl wall charger + noRot: true # SS220/Directionl wall charger layers: - map: ["enum.PowerChargerVisualLayers.Base"] state: "empty" @@ -149,15 +150,6 @@ path: /Audio/Effects/metalbreak.ogg - type: Physics bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.10,-0.10,0.10,0.10" - density: 500 - mask: - - TabletopMachineMask - type: ItemSlots slots: charger_slot: diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/empty.png b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/empty.png new file mode 100644 index 00000000000000..38e110f8418da6 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/empty.png differ diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/full.png b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/full.png new file mode 100644 index 00000000000000..38e110f8418da6 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/full.png differ diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-charged.png b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-charged.png new file mode 100644 index 00000000000000..56d434e3290613 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-charged.png differ diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-charging.png b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-charging.png new file mode 100644 index 00000000000000..4b17d8009909e5 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-charging.png differ diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-empty.png b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-empty.png new file mode 100644 index 00000000000000..233f9deb3731ff Binary files /dev/null and b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-empty.png differ diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-off.png b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-off.png new file mode 100644 index 00000000000000..b69329e5b05aac Binary files /dev/null and b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/light-off.png differ diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/meta.json b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/meta.json new file mode 100644 index 00000000000000..e45aeec32012af --- /dev/null +++ b/Resources/Textures/SS220/Structures/Wallmounts/wall_recharger.rsi/meta.json @@ -0,0 +1,115 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9ea3eccbe22e18d24653949067f3d7dd12194ea9/icons/obj/stationobjs.dmi", + "states": [ + { + "name": "empty", + "directions": 4 + }, + { + "name": "full", + "directions": 4 + }, + { + "name": "light-off", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "light-empty", + "directions": 4, + "delays": [ + [ + 1, + 0.2 + ], + [ + 1, + 0.2 + ], + [ + 1, + 0.2 + ], + [ + 1, + 0.2 + ] + ] + }, + { + "name": "light-charging", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "light-charged", + "directions": 4, + "delays": [ + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ], + [ + 0.2, + 0.1 + ] + ] + } + ] +}