Bulk fixes to markings and loadouts and misc

Resources/Locale/en-US/_NF/markings/goblin_markings.ftl

@@ -0,0 +1,58 @@
+# goblin ears
+marking-GoblinEarsBasic = Basic Ears
+marking-GoblinEarsBasic-goblin_ears_default = Basic Ears
+
+marking-GoblinEarsBasicAlt = Basic Ears (Alt)
+marking-GoblinEarsBasicAlt-goblin_ears_default_alt = Basic Ears (Alt)
+
+marking-GoblinEarsLong01 = Long Ears (Tips Down)
+marking-GoblinEarsLong01-goblin_ears_long_01 = Long Ears (Tips Down)
+
+marking-GoblinEarsLong02 = Long Ears (Tips Up)
+marking-GoblinEarsLong02-goblin_ears_long_02 = Long Ears (Tips Up)
+
+# goblin noses
+marking-GoblinNoseBasic = Basic Nose
+marking-GoblinNoseBasic-goblin_nose_default = Basic Nose
+
+marking-GoblinNoseLong = Long Nose
+marking-GoblinNoseLong-goblin_nose_long = Long Nose
+
+marking-GoblinNoseCrooked = Crooked Nose
+marking-GoblinNoseCrooked-goblin_nose_crooked = Crooked Nose
+
+# goblin tusks
+marking-GoblinTusksBasic = No Tusks
+marking-GoblinTusksBasic-goblin_tusks_none = No Tusks
+
+marking-GoblinTusksSmall = Small Tusks
+marking-GoblinTusksSmall-goblin_tusks_small = Small Tusks
+
+marking-GoblinTusksBig = Long Tusks
+marking-GoblinTusksBig-goblin_tusks_big = Long Tusks
+
+# goblin hair
+marking-GoblinHairA = A
+marking-GoblinHairA-goblin_hair_a = A
+
+marking-GoblinHairBald = Bald
+marking-GoblinHairBald-goblin_hair_bald = Bald
+
+marking-GoblinHairHalfshaved = Half Shaved
+marking-GoblinHairHalfshaved-goblin_hair_halfshaved = Half Shaved
+
+marking-GoblinHairPixie = Pixie
+marking-GoblinHairPixie-goblin_hair_pixie = Pixie
+
+marking-GoblinHairPompadour = Pompadour
+marking-GoblinHairPompadour-goblin_hair_pompadour = Pompadour
+
+# goblin tail
+marking-GoblinTailBasic = No Tail
+marking-GoblinTailBasic-goblin_tail_none = No Tail
+
+marking-GoblinTailShort = Short Tail
+marking-GoblinTailShort-goblin_tail_short = Short Tail
+
+marking-GoblinTailLong = Long Tail
+marking-GoblinTailLong-goblin_tail_long = Long Tail

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -224,7 +224,7 @@
     state: pda-internmed
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: BaseSecurityPDA
@@ -778,7 +778,7 @@
     state: pda-medical
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: MedicalPDA

Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml

@@ -39,7 +39,7 @@
       price: 30
     - type: GuideHelp
       guides:
-      - Medical Doctor
+      - MedicalDoctor
 
 - type: entity
   id: Defibrillator

Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml

@@ -40,7 +40,7 @@
           False: { visible: false }
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   id: HandheldHealthAnalyzer

Resources/Prototypes/Entities/Structures/Furniture/beds.yml

@@ -83,7 +83,7 @@
     node: medicalbed
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: Bed

Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml

@@ -58,5 +58,5 @@
         - LowImpassable
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
   - type: PowerSwitch

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -872,7 +872,7 @@
     color: "#9dc5c9"
   - type: GuideHelp
     guides:
-    - Medical Doctor
+    - MedicalDoctor
 
 - type: entity
   parent: VendingMachine

Resources/Prototypes/Guidebook/medical.yml

@@ -3,14 +3,14 @@
   name: guide-entry-medical
   text: "/ServerInfo/Guidebook/Medical/Medical.xml"
   children:
-  - Medical Doctor
+  - MedicalDoctor
   - Chemist
   - Cloning
   - Cryogenics
   - Surgery # Shitmed Change
 
 - type: guideEntry
-  id: Medical Doctor
+  id: MedicalDoctor
   name: guide-entry-medicaldoctor
   text: "/ServerInfo/Guidebook/Medical/MedicalDoctor.xml"
 

Resources/Prototypes/_DV/Catalog/Uplink/allies.yml

@@ -1,5 +1,5 @@
 - type: listing
-  id: Mouse Operative Reinforcement
+  id: MouseOperativeReinforcement
   name: uplink-reinforcement-radio-nukie-mouse-name
   description: uplink-reinforcement-radio-nukie-mouse-desc
   productEntity: ReinforcementRadioSyndicateNukieMouse

Resources/Prototypes/_DV/whitelist_tiers.yml

@@ -47,7 +47,7 @@
     - HeadOfSecurity
 
 - type: whitelistTier
-  id: Gold Tier
+  id: GoldTier
   name: Gold Tier
   color: "#e6c200"
   jobs:

Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/specific.yml

@@ -30,7 +30,7 @@
           - RadioSpeaker
     - type: ActiveListener
       range: 10
-    - type: ClothingGrantComponent
+    - type: ClothingGrant
       component:
       - type: StationAiVision
         range: 4

Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slimeperson.yml

@@ -128,6 +128,20 @@
 
 # Eyes
 
+- type: marking
+  id: SlimeEyesDefault
+  bodyPart: Eyes
+  markingCategory: Eyes
+  speciesRestriction: [ SlimePerson ]
+  forcedColoring: true
+  coloring:
+    default:
+      type:
+        !type:EyeColoring
+  sprites:
+  - sprite: _Impstation/Mobs/Species/Slime/parts.rsi
+    state: eyes
+
 - type: marking
   id: SlimeEyeglow
   bodyPart: Eyes

Resources/Prototypes/_Impstation/Loadouts/Miscellaneous/trinkets.yml

@@ -1,65 +1,66 @@
-- type: loadout
-  id: CigPackNewport
-  storage:
-    back:
-    - CigPackNewport
+# QB: Commenting out cause I'd have to port more than I'd like right now <:3 - Sage
+#- type: loadout
+#  id: CigPackNewport
+#  storage:
+#    back:
+#    - CigPackNewport
 
-- type: loadout
-  id: CigPackSpirits
-  storage:
-    back:
-    - CigPackSpirits
+#- type: loadout
+#  id: CigPackSpirits
+#  storage:
+#    back:
+#    - CigPackSpirits
 
 - type: loadout
   id: PersonalAI
   storage:
     back:
     - PersonalAI
 
-- type: loadout
-  id: GoldPersonalAI
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: PrestigeGold
-  storage:
-    back:
-    - GoldPersonalAI
+#- type: loadout
+#  id: GoldPersonalAI
+#  effects:
+#  - !type:GroupLoadoutEffect
+#    proto: PrestigeGold
+#  storage:
+#    back:
+#    - GoldPersonalAI
 
-- type: loadout
-  id: FolderHamster
-  storage:
-    back:
-    - BoxFolderHamster
+#- type: loadout
+#  id: FolderHamster
+#  storage:
+#    back:
+#    - BoxFolderHamster
 
-- type: loadout
-  id: FolderMime
-  storage:
-    back:
-    - BoxFolderMime
+#- type: loadout
+#  id: FolderMime
+#  storage:
+#    back:
+#    - BoxFolderMime
 
-- type: loadout
-  id: FolderPun
-  storage:
-    back:
-    - BoxFolderPun
+#- type: loadout
+#  id: FolderPun
+#  storage:
+#    back:
+#    - BoxFolderPun
 
-- type: loadout
-  id: HarmonicaInstrument
-  storage:
-    back:
-    - HarmonicaInstrument
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: MusicallyTalented
+#- type: loadout
+#  id: HarmonicaInstrument
+#  storage:
+#    back:
+#    - HarmonicaInstrument
+#  effects:
+#  - !type:GroupLoadoutEffect
+#    proto: MusicallyTalented
 
 - type: loadout
   id: FlippoLighter
   storage:
     back:
     - FlippoLighter
 
-- type: loadout
-  id: WalkingCane
-  storage:
-    back:
-    - WalkingCane
+#- type: loadout
+#  id: WalkingCane
+#  storage:
+#    back:
+#    - WalkingCane

Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_tusks_small",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_big",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_none",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_Impstation/Mobs/Species/Arachnid/parts.rsi/meta.json

@@ -0,0 +1,70 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts.dmi for acting as a base, modified by PixelTheKermit (github) for SS14, and then modified again by crocodilecarousel (github) for Impstation, fuzz removed and made a marking by Sha-Seng (Github) for Impstation",
+    "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
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        },
+        {
+            "name": "template",
+            "directions": 4
+        }
+    ]
+}