diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 3cd48c4d6b..cc54a61173 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -53,6 +53,60 @@ heatDamage: types: Heat : 0.2 #per second, scales with temperature & other constants + - type: Sprite # sprite again because we want different layer ordering + noRot: true + drawdepth: Mobs + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 + # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. + # sprite refactor when + state: l_leg + - shader: StencilMask + map: [ "enum.HumanoidVisualLayers.StencilMask" ] + sprite: Mobs/Customization/masking_helpers.rsi + state: unisex_full + visible: false + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_moth" + visible: false - type: entity save: false diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_moth.png b/Resources/Textures/Effects/creampie.rsi/creampie_moth.png new file mode 100644 index 0000000000..6aa6f5a3a5 Binary files /dev/null and b/Resources/Textures/Effects/creampie.rsi/creampie_moth.png differ diff --git a/Resources/Textures/Effects/creampie.rsi/meta.json b/Resources/Textures/Effects/creampie.rsi/meta.json index 6147b526aa..f5fe20f5d7 100644 --- a/Resources/Textures/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/Effects/creampie.rsi/meta.json @@ -1 +1,80 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "creampie_ai"}, {"name": "creampie_corgi", "directions": 4}, {"name": "creampie_drone", "directions": 4}, {"name": "creampie_engborg", "directions": 4}, {"name": "creampie_hardsuit", "directions": 4}, {"name": "creampie_helmet", "directions": 4}, {"name": "creampie_human", "directions": 4}, {"name": "creampie_janborg", "directions": 4}, {"name": "creampie_lizard", "directions": 4}, {"name": "creampie_medborg", "directions": 4}, {"name": "creampie_monkey", "directions": 4}, {"name": "creampie_secborg", "directions": 4}, {"name": "creampie_standborg", "directions": 4}, {"name": "creampie_xeno_crit"}, {"name": "creampie_xeno_dead"}, {"name": "creampie_xeno_sleep", "directions": 4}, {"name": "creampie_xenomorph", "directions": 4}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "creampie_ai" + }, + { + "name": "creampie_corgi", + "directions": 4 + }, + { + "name": "creampie_drone", + "directions": 4 + }, + { + "name": "creampie_engborg", + "directions": 4 + }, + { + "name": "creampie_hardsuit", + "directions": 4 + }, + { + "name": "creampie_helmet", + "directions": 4 + }, + { + "name": "creampie_human", + "directions": 4 + }, + { + "name": "creampie_janborg", + "directions": 4 + }, + { + "name": "creampie_lizard", + "directions": 4 + }, + { + "name": "creampie_moth", + "directions": 4 + }, + { + "name": "creampie_medborg", + "directions": 4 + }, + { + "name": "creampie_monkey", + "directions": 4 + }, + { + "name": "creampie_secborg", + "directions": 4 + }, + { + "name": "creampie_standborg", + "directions": 4 + }, + { + "name": "creampie_xeno_crit" + }, + { + "name": "creampie_xeno_dead" + }, + { + "name": "creampie_xeno_sleep", + "directions": 4 + }, + { + "name": "creampie_xenomorph", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/moth_parts.rsi/antenna_default.png b/Resources/Textures/Mobs/Customization/moth_parts.rsi/antenna_default.png index 915cf0e317..4c238cc381 100644 Binary files a/Resources/Textures/Mobs/Customization/moth_parts.rsi/antenna_default.png and b/Resources/Textures/Mobs/Customization/moth_parts.rsi/antenna_default.png differ diff --git a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_default.png b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_default.png index 8124b7e689..07f87e092e 100644 Binary files a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_default.png and b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_default.png differ diff --git a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look1.png b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look1.png index c56078f81d..e8e25bb0dd 100644 Binary files a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look1.png and b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look1.png differ diff --git a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look2.png b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look2.png index 8b28d21a68..c7b96ae8b5 100644 Binary files a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look2.png and b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look2.png differ diff --git a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look3.png b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look3.png index f46115c604..71baa2b1b9 100644 Binary files a/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look3.png and b/Resources/Textures/Mobs/Customization/moth_parts.rsi/wings_look3.png differ diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/eyes.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/eyes.png index 4da4429f65..e35b5717d2 100644 Binary files a/Resources/Textures/Mobs/Species/Moth/parts.rsi/eyes.png and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/eyes.png differ diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/l_leg.png index be5690b15f..54efa6db78 100644 Binary files a/Resources/Textures/Mobs/Species/Moth/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/r_leg.png index 9ab0c87284..6f45ae1895 100644 Binary files a/Resources/Textures/Mobs/Species/Moth/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/r_leg.png differ