From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Mon, 25 Dec 2023 08:11:37 +0000 (-0600) Subject: Adds gingerbread men to the game (#22927) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=450414c8fcaf7535f59857176de84fd9a6a817b9;p=space-station-14.git Adds gingerbread men to the game (#22927) adds gingerbread men to the game --- diff --git a/Resources/Prototypes/Body/Parts/gingerbread.yml b/Resources/Prototypes/Body/Parts/gingerbread.yml new file mode 100644 index 0000000000..661835ab84 --- /dev/null +++ b/Resources/Prototypes/Body/Parts/gingerbread.yml @@ -0,0 +1,117 @@ +- type: entity + id: PartGingerbread + parent: [BaseItem, BasePart] + name: "gingerbead body part" + abstract: true + components: + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Sugar + Quantity: 10 + +- type: entity + id: TorsoGingerbread + name: "gingerbread torso" + parent: [PartGingerbread, BaseTorso] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "torso_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Sugar + Quantity: 20 + +- type: entity + id: HeadGingerbread + name: "gingerbread head" + parent: [PartGingerbread, BaseHead] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "head_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + +- type: entity + id: LeftArmGingerbread + name: "left gingerbread arm" + parent: [PartGingerbread, BaseLeftArm] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "l_arm" + +- type: entity + id: RightArmGingerbread + name: "right gingerbread arm" + parent: [PartGingerbread, BaseRightArm] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "r_arm" + +- type: entity + id: LeftHandGingerbread + name: "left gingerbread hand" + parent: [PartGingerbread, BaseLeftHand] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "l_hand" + +- type: entity + id: RightHandGingerbread + name: "right gingerbread hand" + parent: [PartGingerbread, BaseRightHand] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "r_hand" + +- type: entity + id: LeftLegGingerbread + name: "left gingerbread leg" + parent: [PartGingerbread, BaseLeftLeg] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "l_leg" + +- type: entity + id: RightLegGingerbread + name: "right gingerbread leg" + parent: [PartGingerbread, BaseRightLeg] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "r_leg" + +- type: entity + id: LeftFootGingerbread + name: "left gingerbread foot" + parent: [PartGingerbread, BaseLeftFoot] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "l_foot" + +- type: entity + id: RightFootGingerbread + name: "right gingerbread foot" + parent: [PartGingerbread, BaseRightFoot] + components: + - type: Sprite + sprite: Mobs/Species/Gingerbread/parts.rsi + state: "r_foot" diff --git a/Resources/Prototypes/Body/Prototypes/gingerbread.yml b/Resources/Prototypes/Body/Prototypes/gingerbread.yml new file mode 100644 index 0000000000..d5355be641 --- /dev/null +++ b/Resources/Prototypes/Body/Prototypes/gingerbread.yml @@ -0,0 +1,49 @@ +- type: body + id: Gingerbread + name: gingerbread + root: torso + slots: + head: + part: HeadGingerbread + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoGingerbread + connections: + - right arm + - left arm + - right leg + - left leg + organs: + heart: OrganHumanHeart + lungs: OrganHumanLungs + stomach: OrganHumanStomach + liver: OrganHumanLiver + kidneys: OrganHumanKidneys + right arm: + part: RightArmGingerbread + connections: + - right hand + left arm: + part: LeftArmGingerbread + connections: + - left hand + right hand: + part: RightHandGingerbread + left hand: + part: LeftHandGingerbread + right leg: + part: RightLegGingerbread + connections: + - right foot + left leg: + part: LeftLegGingerbread + connections: + - left foot + right foot: + part: RightFootGingerbread + left foot: + part: LeftFootGingerbread diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index c56d7326b1..bdfcae9e74 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -193,6 +193,17 @@ flatReductions: Blunt: 5 +# hurt a lot by blunt, immune to a good amount of other stuff because they're a cookie +- type: damageModifierSet + id: Gingerbread + coefficients: + Blunt: 1.5 + Cold: 0.0 + Radiation: 0.5 + Asphyxiation: 0.0 + Bloodloss: 0.0 + Cellular: 0.0 + # Represents which damage types should be modified # in relation to how they cause bleed rate. - type: damageModifierSet diff --git a/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml new file mode 100644 index 0000000000..18ff8381d4 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml @@ -0,0 +1,13 @@ +- type: entity + save: false + name: Urist McCookie + parent: BaseMobGingerbread + id: MobGingerbread + components: + - type: Respirator + damage: + types: + Asphyxiation: 0.5 + damageRecovery: + types: + Asphyxiation: -1.0 diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml new file mode 100644 index 0000000000..c514a6f1a0 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml @@ -0,0 +1,50 @@ +- type: entity + save: false + name: Urist McCookie + parent: BaseMobSpeciesOrganic + id: BaseMobGingerbread + abstract: true + components: + - type: HumanoidAppearance + species: Gingerbread + - type: Icon + sprite: Mobs/Species/Gingerbread/parts.rsi + state: full + - type: Body + prototype: Gingerbread + requiredLegs: 2 + - type: Damageable + damageContainer: Biological + damageModifierSet: Gingerbread + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#896e55" + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodBakedCookie #should be replaced with gingerbread sheets or something... provided you're willing to make a full spriteset of those. + amount: 5 + - type: Bloodstream + bloodReagent: Sugar + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 100 #fairly light + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + +- type: entity + parent: BaseSpeciesDummy + id: MobGingerbreadDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: Gingerbread diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml new file mode 100644 index 0000000000..e6fc0d20df --- /dev/null +++ b/Resources/Prototypes/Species/gingerbread.yml @@ -0,0 +1,117 @@ +- type: species + id: Gingerbread + name: species-name-human + roundStart: false + prototype: MobGingerbread + sprites: MobGingerbreadSprites + markingLimits: MobHumanMarkingLimits + dollPrototype: MobGingerbreadDummy + skinColoration: HumanToned + defaultSkinTone: "#9a7c5a" + +- type: speciesBaseSprites + id: MobGingerbreadSprites + sprites: + Head: MobGingerbreadHead + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Chest: MobGingerbreadTorso + Eyes: MobGingerbreadEyes + LArm: MobGingerbreadLArm + RArm: MobGingerbreadRArm + LHand: MobGingerbreadLHand + RHand: MobGingerbreadRHand + LLeg: MobGingerbreadLLeg + RLeg: MobGingerbreadRLeg + LFoot: MobGingerbreadLFoot + RFoot: MobGingerbreadRFoot + +- type: humanoidBaseSprite + id: MobGingerbreadEyes + baseSprite: + sprite: Mobs/Customization/eyes.rsi + state: no_eyes + +- type: humanoidBaseSprite + id: MobGingerbreadHead + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobGingerbreadHeadMale + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobGingerbreadHeadFemale + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobGingerbreadTorso + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobGingerbreadTorsoMale + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobGingerbreadTorsoFemale + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobGingerbreadLLeg + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobGingerbreadLHand + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobGingerbreadLArm + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobGingerbreadLFoot + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobGingerbreadRLeg + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobGingerbreadRHand + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobGingerbreadRArm + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobGingerbreadRFoot + baseSprite: + sprite: Mobs/Species/Gingerbread/parts.rsi + state: r_foot diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/full.png new file mode 100644 index 0000000000..5c24c2426a Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_f.png new file mode 100644 index 0000000000..5d0a951379 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_m.png new file mode 100644 index 0000000000..5d0a951379 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_arm.png new file mode 100644 index 0000000000..394273a83a Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_foot.png new file mode 100644 index 0000000000..310f122df5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_hand.png new file mode 100644 index 0000000000..6883f726e3 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_leg.png new file mode 100644 index 0000000000..532d9eb0a8 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json new file mode 100644 index 0000000000..fec31a494d --- /dev/null +++ b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites made by Aleksh for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_arm.png new file mode 100644 index 0000000000..58994ae718 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_foot.png new file mode 100644 index 0000000000..a084dcf945 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_hand.png new file mode 100644 index 0000000000..08b3a53bbe Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_leg.png new file mode 100644 index 0000000000..fd146e14b5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_f.png new file mode 100644 index 0000000000..bde0508ffd Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_m.png new file mode 100644 index 0000000000..bde0508ffd Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_m.png differ