diff --git a/Resources/Maps/Shuttles/mothership.yml b/Resources/Maps/Shuttles/mothership.yml index 41ca3d89d8..e515787629 100644 --- a/Resources/Maps/Shuttles/mothership.yml +++ b/Resources/Maps/Shuttles/mothership.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Grid - engineVersion: 266.0.0 + engineVersion: 268.0.0 forkId: "" forkVersion: "" - time: 08/21/2025 13:34:57 - entityCount: 440 + time: 11/16/2025 15:37:41 + entityCount: 441 maps: [] grids: - 1 @@ -1100,10 +1100,11 @@ entities: parent: 1 - proto: ComputerIFFSyndicate entities: - - uid: 278 + - uid: 437 components: - type: Transform - pos: 2.5,5.5 + rot: -1.5707963267948966 rad + pos: 2.5,1.5 parent: 1 - proto: ComputerPowerMonitoring entities: @@ -1132,6 +1133,11 @@ entities: parent: 1 - proto: ComputerSurveillanceCameraMonitor entities: + - uid: 278 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 - uid: 426 components: - type: Transform @@ -1579,22 +1585,18 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-0.5 parent: 1 -- proto: MachineArtifactCrusher +- proto: MachineArtifactCrusherXenoborg entities: - - uid: 372 + - uid: 111 components: - - type: MetaData - name: body crusher - - type: Transform - pos: 3.5,-4.5 - parent: 1 - - uid: 373 - components: - - type: MetaData - name: body crusher - type: Transform pos: 2.5,-4.5 parent: 1 + - uid: 112 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 - proto: PlasticFlapsAirtightClear entities: - uid: 252 @@ -1760,22 +1762,22 @@ entities: - uid: 438 components: - type: Transform - pos: -0.5,4.5 + pos: 1.5,-0.5 parent: 1 - uid: 439 components: - type: Transform - pos: 1.5,4.5 + pos: 1.5,1.5 parent: 1 - uid: 440 components: - type: Transform - pos: 2.5,4.5 + pos: -0.5,1.5 parent: 1 - - uid: 437 + - uid: 441 components: - type: Transform - pos: -1.5,4.5 + pos: -0.5,-0.5 parent: 1 - proto: SubstationBasic entities: @@ -1875,100 +1877,6 @@ entities: - type: Transform pos: -2.5,5.5 parent: 1 -- proto: Thruster - entities: - - uid: 111 - components: - - type: Transform - pos: -10.5,3.5 - parent: 1 - - uid: 112 - components: - - type: Transform - pos: -9.5,3.5 - parent: 1 - - uid: 113 - components: - - type: Transform - pos: -7.5,3.5 - parent: 1 - - uid: 114 - components: - - type: Transform - pos: -6.5,3.5 - parent: 1 - - uid: 115 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-2.5 - parent: 1 - - uid: 116 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-2.5 - parent: 1 - - uid: 117 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-2.5 - parent: 1 - - uid: 118 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-2.5 - parent: 1 - - uid: 119 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-0.5 - parent: 1 - - uid: 120 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,0.5 - parent: 1 - - uid: 121 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,1.5 - parent: 1 - - uid: 122 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,1.5 - parent: 1 - - uid: 123 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,0.5 - parent: 1 - - uid: 124 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-0.5 - parent: 1 - - uid: 125 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-6.5 - parent: 1 - - uid: 126 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-6.5 - parent: 1 - proto: TwoWayLever entities: - uid: 5 @@ -2567,6 +2475,100 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,2.5 parent: 1 +- proto: ThrusterXenoborg + entities: + - uid: 113 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 115 + components: + - type: Transform + pos: -9.5,3.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: -10.5,3.5 + parent: 1 + - uid: 117 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-2.5 + parent: 1 + - uid: 118 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-2.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-2.5 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-2.5 + parent: 1 + - uid: 121 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-0.5 + parent: 1 + - uid: 122 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,0.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,1.5 + parent: 1 + - uid: 124 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-0.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,0.5 + parent: 1 + - uid: 126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 + - uid: 372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-6.5 + parent: 1 + - uid: 373 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-6.5 + parent: 1 - proto: XenoborgWindow entities: - uid: 3 diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml index 95684e7520..a80456583a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml @@ -157,3 +157,13 @@ machine_parts: !type:Container entity_storage: !type:Container output_container: !type:Container + +# just a resprite +- type: entity + parent: MachineArtifactCrusher + id: MachineArtifactCrusherXenoborg + name: body crusher + description: Best not to let your head get stuck... + components: + - type: Sprite + sprite: Structures/Machines/body_crusher.rsi diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index c80ff8eb70..bb43cb3b2c 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -102,6 +102,13 @@ visible: false offset: 0, 1 +- type: entity + parent: Thruster + id: ThrusterXenoborg + components: + - type: Sprite + sprite: Structures/Shuttles/xenoborg_thruster.rsi + - type: entity id: ThrusterLarge name: large thruster diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/base.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/base.png new file mode 100644 index 0000000000..a1c8292bbd Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/base.png differ diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/door-closed.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/door-closed.png new file mode 100644 index 0000000000..0ec5755f0f Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/door-closed.png differ diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/glass.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/glass.png new file mode 100644 index 0000000000..071e8a0db5 Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/glass.png differ diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/icon.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/icon.png new file mode 100644 index 0000000000..a33ed0bd49 Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/lights.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/lights.png new file mode 100644 index 0000000000..ce30eb3c32 Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/lights.png differ diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/meta.json b/Resources/Textures/Structures/Machines/body_crusher.rsi/meta.json new file mode 100644 index 0000000000..57d0567ab6 --- /dev/null +++ b/Resources/Textures/Structures/Machines/body_crusher.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by brainfood1183 (github) for ss14. modified by Samuka-C (github)", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "glass" + }, + { + "name": "door-closed" + }, + { + "name": "piston" + }, + { + "name": "base" + }, + { + "name": "lights" + }, + { + "name": "piston-push", + "delays": [ + [ + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 0.66, + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/piston-push.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/piston-push.png new file mode 100644 index 0000000000..020d3b2902 Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/piston-push.png differ diff --git a/Resources/Textures/Structures/Machines/body_crusher.rsi/piston.png b/Resources/Textures/Structures/Machines/body_crusher.rsi/piston.png new file mode 100644 index 0000000000..b3ad39439b Binary files /dev/null and b/Resources/Textures/Structures/Machines/body_crusher.rsi/piston.png differ diff --git a/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/base.png b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/base.png new file mode 100644 index 0000000000..36006e74a2 Binary files /dev/null and b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/base.png differ diff --git a/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/meta.json b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/meta.json new file mode 100644 index 0000000000..64118c3f59 --- /dev/null +++ b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Created by Samuka-C (github)", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "thrust", + "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": "thrust_burn_unshaded", + "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 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/thrust.png b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/thrust.png new file mode 100644 index 0000000000..96527263fe Binary files /dev/null and b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/thrust.png differ diff --git a/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/thrust_burn_unshaded.png b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/thrust_burn_unshaded.png new file mode 100644 index 0000000000..c2678a4033 Binary files /dev/null and b/Resources/Textures/Structures/Shuttles/xenoborg_thruster.rsi/thrust_burn_unshaded.png differ