From b2ffe70f8f9f0e35dcedef610d9639aea4763e9a Mon Sep 17 00:00:00 2001 From: mousesweater <55769023+Mousetrinity@users.noreply.github.com> Date: Sun, 14 Sep 2025 10:16:48 -0500 Subject: [PATCH] Moth Shrink-wrapping No More (#3396) * oh my god * minor typo * alright man what's up * cleaning * sweep sweep sweep * upstream attack * moffra fix, functional * fuck you said the fuck you guy * fuck you said the fuck you moth * for till cock * bingo! * i can see exactly how i typo'd each of these and i can tell you --------- Co-authored-by: mousesweater --- .../Mobs/Customization/Markings/moth.yml | 430 +++++++++++++++--- 1 file changed, 368 insertions(+), 62 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml index ee4c4f67fb..a50f433c4f 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml @@ -173,228 +173,534 @@ state: underwing_secondary # Wings + - type: marking id: MothWingsDefault bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + default_neck: TailBehindBackpack + default_primary_behind: TailBehind + default_primary_front: TailBehindBackpack + default_secondary_behind: TailBehind + default_secondary_front: TailBehindBackpack + colorLinks: + default_primary_behind: default_primary_front + default_secondary_behind: default_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: default + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: default_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: default_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: default_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: default_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: default_secondary_front # imp edit end - type: marking id: MothWingsCharred bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + charred_neck: TailBehindBackpack + charred_primary_behind: TailBehind + charred_primary_front: TailBehindBackpack + colorLinks: + charred_primary_behind: charred_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: charred + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: charred_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: charred_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: charred_primary_front # imp edit end - type: marking id: MothWingsDbushy bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + dbushy_neck: TailBehindBackpack + dbushy_primary_behind: TailBehind + dbushy_primary_front: TailBehindBackpack + dbushy_secondary_behind: TailBehind + dbushy_secondary_front: TailBehindBackpack + colorLinks: + dbushy_primary_behind: dbushy_primary_front + dbushy_secondary_behind: dbushy_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: dbushy_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: dbushy_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dbushy_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dbushy_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dbushy_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dbushy_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dbushy_secondary_front # imp edit end - type: marking id: MothWingsDeathhead bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + deathhead_neck: TailBehindBackpack + deathhead_primary_behind: TailBehind + deathhead_primary_front: TailBehindBackpack + deathhead_secondary_behind: TailBehind + deathhead_secondary_front: TailBehindBackpack + colorLinks: + deathhead_primary_behind: deathhead_primary_front + deathhead_secondary_behind: deathhead_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: deathhead_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: deathhead_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: deathhead_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: deathhead_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: deathhead_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: deathhead_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: deathhead_secondary_front # imp edit end - type: marking id: MothWingsFan bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + fan_neck: TailBehindBackpack + fan_primary_behind: TailBehind + fan_primary_front: TailBehindBackpack + fan_secondary_behind: TailBehind + fan_secondary_front: TailBehindBackpack + colorLinks: + fan_primary_behind: fan_primary_front + fan_secondary_behind: fan_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: fan + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: fan_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: fan_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: fan_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: fan_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: fan_secondary_front # imp edit end - type: marking id: MothWingsDfan bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + dfan_neck: TailBehindBackpack + dfan_primary_behind: TailBehind + dfan_primary_front: TailBehindBackpack + dfan_secondary_behind: TailBehind + dfan_secondary_front: TailBehindBackpack + colorLinks: + dfan_primary_behind: dfan_primary_front + dfan_secondary_behind: dfan_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: dfan + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dfan_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dfan_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dfan_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dfan_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: dfan_secondary_front # imp edit end - type: marking id: MothWingsFeathery bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + feathery_neck: TailBehindBackpack + feathery_primary_behind: TailBehind + feathery_primary_front: TailBehindBackpack + colorLinks: + feathery_primary_behind: feathery_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: feathery + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: feathery_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: feathery_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: feathery_primary_front # imp edit end - type: marking id: MothWingsFirewatch bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + firewatch_neck: TailBehindBackpack + firewatch_primary_behind: TailBehind + firewatch_primary_front: TailBehindBackpack + firewatch_secondary_behind: TailBehind + firewatch_secondary_front: TailBehindBackpack + colorLinks: + firewatch_primary_behind: firewatch_primary_front + firewatch_secondary_behind: firewatch_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: firewatch_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: firewatch_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: firewatch_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: firewatch_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: firewatch_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: firewatch_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: firewatch_secondary_front # imp edit end - type: marking id: MothWingsGothic bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + gothic_neck: TailBehindBackpack + gothic_primary_behind: TailBehind + gothic_primary_front: TailBehindBackpack + gothic_secondary_behind: TailBehind + gothic_secondary_front: TailBehindBackpack + colorLinks: + gothic_primary_behind: gothic_primary_front + gothic_secondary_behind: gothic_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: gothic + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: gothic_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: gothic_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: gothic_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: gothic_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: gothic_secondary_front # imp edit end - type: marking id: MothWingsJungle bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + jungle_neck: TailBehindBackpack + jungle_primary_behind: TailBehind + jungle_primary_front: TailBehindBackpack + colorLinks: + jungle_primary_behind: jungle_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: jungle + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: jungle_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: jungle_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: jungle_primary_front # imp edit end - type: marking id: MothWingsLadybug bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + ladybug_neck: TailBehindBackpack + ladybug_primary_behind: TailBehind + ladybug_primary_front: TailBehindBackpack + ladybug_secondary_front: TailBehindBackpack + colorLinks: + ladybug_primary_behind: ladybug_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: ladybug + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: ladybug_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: ladybug_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: ladybug_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: ladybug_secondary_front # imp edit end - type: marking id: MothWingsMaple bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + maple_neck: TailBehindBackpack + maple_primary_behind: TailBehind + maple_primary_front: TailBehindBackpack + maple_secondary_behind: TailBehind + maple_secondary_front: TailBehindBackpack + colorLinks: + maple_primary_behind: maple_primary_front + maple_secondary_behind: maple_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: maple_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: maple_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: maple_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: maple_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: maple_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: maple_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: maple_secondary_front # imp edit end - type: marking id: MothWingsMoffra bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + moffra_neck: TailBehindBackpack + moffra_neck_secondary: TailBehindBackpack + moffra_primary_behind: TailBehind + moffra_primary_front: TailBehindBackpack + moffra_secondary_behind: TailBehind + moffra_secondary_front: TailBehindBackpack + colorLinks: + moffra_primary_behind: moffra_primary_front + moffra_secondary_behind: moffra_secondary_front + moffra_neck_secondary: moffra_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: moffra_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: moffra_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: moffra_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: moffra_neck_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: moffra_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: moffra_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: moffra_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: moffra_secondary_front # imp edit end - type: marking id: MothWingsOakworm bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + oakworm_neck: TailBehindBackpack + oakworm_primary_behind: TailBehind + oakworm_primary_front: TailBehindBackpack + colorLinks: + oakworm_primary_behind: oakworm_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: oakworm + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: oakworm_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: oakworm_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: oakworm_primary_front # imp edit end - type: marking id: MothWingsPlasmafire bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + plasmafire_neck: TailBehindBackpack + plasmafire_primary_behind: TailBehind + plasmafire_primary_front: TailBehindBackpack + plasmafire_secondary_behind: TailBehind + plasmafire_secondary_front: TailBehindBackpack + colorLinks: + plasmafire_primary_behind: plasmafire_primary_front + plasmafire_secondary_behind: plasmafire_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: plasmafire_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: plasmafire_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: plasmafire_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: plasmafire_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: plasmafire_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: plasmafire_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: plasmafire_secondary_front # imp edit end - type: marking id: MothWingsPointy bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + pointy_neck: TailBehindBackpack + pointy_primary_behind: TailBehind + pointy_primary_front: TailBehindBackpack + colorLinks: + pointy_primary_behind: pointy_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: pointy + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: pointy_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: pointy_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: pointy_primary_front # imp edit end - type: marking id: MothWingsRoyal bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + royal_neck: TailBehindBackpack + royal_primary_behind: TailBehind + royal_primary_front: TailBehindBackpack + royal_secondary_behind: TailBehind + royal_secondary_front: TailBehindBackpack + colorLinks: + royal_primary_behind: royal_primary_front + royal_secondary_behind: royal_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: royal_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: royal_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: royal_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: royal_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: royal_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: royal_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: royal_secondary_front # imp edit end - type: marking id: MothWingsStellar bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + stellar_neck: TailBehindBackpack + stellar_primary_behind: TailBehind + stellar_primary_front: TailBehindBackpack + colorLinks: + stellar_primary_behind: stellar_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: stellar + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: stellar_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: stellar_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: stellar_primary_front # imp edit end - type: marking id: MothWingsStriped bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + striped_neck: TailBehindBackpack + striped_primary_behind: TailBehind + striped_primary_front: TailBehindBackpack + colorLinks: + striped_primary_behind: striped_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: striped + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: striped_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: striped_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: striped_primary_front # imp edit end - type: marking id: MothWingsSwirly bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + swirly_neck: TailBehindBackpack + swirly_primary_behind: TailBehind + swirly_primary_front: TailBehindBackpack + colorLinks: + swirly_primary_behind: swirly_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: swirly + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: swirly_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: swirly_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: swirly_primary_front # imp edit end - type: marking id: MothWingsWhitefly bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + whitefly_neck: TailBehindBackpack + whitefly_primary_behind: TailBehind + whitefly_primary_front: TailBehindBackpack + colorLinks: + whitefly_primary_behind: whitefly_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: whitefly + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: whitefly_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: whitefly_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: whitefly_primary_front # imp edit end - type: marking id: MothWingsWitchwing bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + witchwing_neck: TailBehindBackpack + witchwing_primary_behind: TailBehind + witchwing_primary_front: TailBehindBackpack + colorLinks: + witchwing_primary_behind: witchwing_primary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: witchwing + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: witchwing_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: witchwing_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: witchwing_primary_front # imp edit end - type: marking id: MothWingsUnderwing bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] + layering: # imp edit start + underwing_neck: TailBehindBackpack + underwing_primary_behind: TailBehind + underwing_primary_front: TailBehindBackpack + underwing_secondary_behind: TailBehind + underwing_secondary_front: TailBehindBackpack + colorLinks: + underwing_primary_behind: underwing_primary_front + underwing_secondary_behind: underwing_secondary_front sprites: - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: underwing_primary - - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: underwing_secondary + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: underwing_neck + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: underwing_primary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: underwing_primary_front + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: underwing_secondary_behind + - sprite: _Impstation/Mobs/Customization/Moth/taillayers.rsi + state: underwing_secondary_front # imp edit end # Body markings: # Charred