Elf

Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml

@@ -210,3 +210,13 @@
     tags:
     - HamsterWearable
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatElfHat
+  name: elf hat
+  description: A green and red striped cap with pointy ears and a bell on the end.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/elfhat.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/elfhat.rsi

Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml

@@ -8,3 +8,17 @@
     sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi
+
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ClothingShoesMiscElf
+  name: elf shoes
+  description: Little elf shoes with jingly bells. Jingle, jingle, jingle!
+  components:
+    - type: Sprite
+      sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi
+    - type: Clothing
+      sprite: DeltaV/Clothing/Shoes/Misc/elfshoes.rsi
+    - type: FootstepModifier
+      footstepSoundCollection:
+        collection: FootstepJester

Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -233,13 +233,20 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
 
-- type: entity
-  parent: ClothingUniformBase
   id: ClothingUniformJumpsuitKilt
   name: kilt
   description: A fine bit o' garb for the lad an' lasses.
   components:
   - type: Sprite
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
+
+  id: ClothingUniformJumpsuitElf
+  name: elf jumpsuit
+  description: A sharp and professional jumpsuit worn by Santa's highest-trained little helpers.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/gingerbreadc4.yml

@@ -0,0 +1,23 @@
+- type: entity
+  name: ginger-bomb man
+  description: Used to put holes in walls for naughty children.
+  parent: C4
+  id: GingerBreadC4
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi
+    state: icon
+    scale: 0.7, 0.7
+    layers:
+    - state: icon
+      map: ["base"]
+  - type: Item
+    sprite: DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi
+    size: 5
+  - type: OnUseTimerTrigger
+    delay: 10
+    delayOptions: [10, 30, 60, 120, 300]
+    initialBeepDelay: 0
+    beepSound: /Audio/Machines/Nuke/general_beep.ogg
+    startOnStick: true
+    canToggleStartOnStick: true

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -45,3 +45,19 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
+
+- type: entity
+  name: CC-20 sub machine gun
+  parent: WeaponSubMachineGunC20r
+  id: WeaponSubMachineGunCandyCaneC20r
+  description: Spread some holiday cheer with the "Candy-Cane-20" sub machine gun. Uses .35 auto ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml

@@ -0,0 +1,26 @@
+- type: entity
+  name: bauble grenade
+  description: A nice little trinket to hang on the tree, or throw at your enemies.
+  parent: ExGrenade
+  id: BaubleGrenade
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi
+    layers:
+    - state: icon
+      map: ["base"]
+  - type: Item
+    sprite: DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi
+    size: 5
+  - type: OnUseTimerTrigger
+    delayOptions: [10, 30, 60, 120, 300]
+    initialBeepDelay: 0
+    beepSound: /Audio/Effects/Footsteps/jesterstep2.ogg
+    beepInterval: .5 # 2 beeps total (at 0 and 2)
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.Trigger.TriggerVisuals.VisualState:
+        base:
+          Primed: { state: primed }
+          Unprimed: { state: complete }

Resources/Textures/DeltaV/Clothing/Head/Hats/elfhat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ps3moira",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Clothing/Shoes/Misc/elfshoes.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified sprite by ps3moira and taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/elf.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified sprite by ps3moira and taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Weapons/Bombs/gingerbreadc4.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Made by ps3moira",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "primed",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+		},
+        {
+            "name": "inhand-right",
+            "directions": 4
+		}		
+    ]
+}

Resources/Textures/DeltaV/Objects/Weapons/Grenades/baublegrenade.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by ps3moira",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "primed",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/candycanec20.rsi/meta.json

@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified by ps3moira from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "suppressor"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}