From 601a3027610e245b2baa587064584d2e4b26214c Mon Sep 17 00:00:00 2001
From: Den109G <87372121+Den109G@users.noreply.github.com>
Date: Tue, 2 Apr 2024 18:32:40 +0600
Subject: [PATCH] refractor: Species defines in masses (#4771)
* hos
* species
* get the d
---
.../gamemodes/clockwork/clockwork_items.dm | 26 +-
code/game/gamemodes/cult/cult_items.dm | 46 +--
code/game/gamemodes/steal_items.dm | 2 +-
code/game/jobs/job/security.dm | 10 +-
code/game/objects/items.dm | 2 +-
.../objects/items/devices/radio/headset.dm | 14 +-
code/game/objects/items/trash.dm | 16 +-
code/game/objects/items/weapons/cigs.dm | 26 +-
code/game/objects/items/weapons/defib.dm | 2 +-
.../objects/items/weapons/storage/backpack.dm | 22 +-
.../objects/items/weapons/tanks/tank_types.dm | 4 +-
code/game/objects/structures/bedsheet_bin.dm | 10 +-
code/game/objects/structures/mirror.dm | 2 +-
.../changeling/powers/mutations.dm | 28 +-
.../vampire_powers/hemomancer_powers.dm | 2 +-
code/modules/awaymissions/corpse.dm | 2 +-
.../mission_code/ruins/graveyard.dm | 4 +-
code/modules/clothing/chameleon.dm | 70 ++--
code/modules/clothing/clothing.dm | 126 ++++----
code/modules/clothing/glasses/glasses.dm | 286 ++++++++---------
code/modules/clothing/glasses/hud.dm | 156 ++++-----
code/modules/clothing/gloves/miscellaneous.dm | 4 +-
code/modules/clothing/head/beanie.dm | 12 +-
code/modules/clothing/head/collectable.dm | 36 +--
code/modules/clothing/head/hardhat.dm | 26 +-
code/modules/clothing/head/helmet.dm | 136 ++++----
code/modules/clothing/head/jobs.dm | 24 +-
code/modules/clothing/head/misc.dm | 174 +++++-----
code/modules/clothing/head/misc_special.dm | 82 ++---
code/modules/clothing/head/soft_caps.dm | 12 +-
code/modules/clothing/masks/boxing.dm | 56 ++--
code/modules/clothing/masks/breath.dm | 34 +-
code/modules/clothing/masks/gasmask.dm | 60 ++--
code/modules/clothing/masks/miscellaneous.dm | 224 ++++++-------
code/modules/clothing/neck/ponchos.dm | 30 +-
code/modules/clothing/patreon/glasses.dm | 12 +-
code/modules/clothing/patreon/hats.dm | 48 +--
code/modules/clothing/spacesuits/alien.dm | 60 ++--
code/modules/clothing/spacesuits/ert.dm | 64 ++--
code/modules/clothing/spacesuits/hardsuit.dm | 66 ++--
.../clothing/spacesuits/miscellaneous.dm | 252 +++++++--------
code/modules/clothing/spacesuits/plasmamen.dm | 4 +-
code/modules/clothing/spacesuits/syndi.dm | 30 +-
code/modules/clothing/spacesuits/void.dm | 30 +-
code/modules/clothing/suits/alien.dm | 26 +-
code/modules/clothing/suits/armor.dm | 126 ++++----
code/modules/clothing/suits/bio.dm | 78 ++---
code/modules/clothing/suits/jobs.dm | 264 +++++++--------
code/modules/clothing/suits/labcoat.dm | 16 +-
code/modules/clothing/suits/miscellaneous.dm | 302 +++++++++---------
code/modules/clothing/suits/utility.dm | 122 +++----
code/modules/clothing/suits/wiz_robe.dm | 112 +++----
.../clothing/under/accessories/accessory.dm | 162 +++++-----
.../clothing/under/accessories/storage.dm | 12 +-
code/modules/clothing/under/color.dm | 12 +-
code/modules/clothing/under/jobs/civilian.dm | 16 +-
.../clothing/under/jobs/engineering.dm | 36 +--
.../under/jobs/plasmamen/_plasmamen.dm | 4 +-
code/modules/clothing/under/jobs/security.dm | 128 ++++----
code/modules/clothing/under/miscellaneous.dm | 56 ++--
code/modules/customitems/item_defines.dm | 40 +--
code/modules/holiday/new_year.dm | 30 +-
.../modules/mining/equipment/explorer_gear.dm | 126 ++++----
.../mob/living/carbon/human/interactions.dm | 2 +-
code/modules/mob/living/carbon/human/npcs.dm | 2 +-
.../human/human_body_markings.dm | 2 +-
code/modules/projectiles/guns/alien.dm | 2 +-
code/modules/ruins/syndicate_space_base.dm | 21 +-
code/modules/ruins/ussp_base.dm | 71 +---
69 files changed, 2024 insertions(+), 2076 deletions(-)
diff --git a/code/game/gamemodes/clockwork/clockwork_items.dm b/code/game/gamemodes/clockwork/clockwork_items.dm
index 8482a5b8662..313d2d3b8c2 100644
--- a/code/game/gamemodes/clockwork/clockwork_items.dm
+++ b/code/game/gamemodes/clockwork/clockwork_items.dm
@@ -657,10 +657,10 @@
flags_inv = HIDEJUMPSUIT
magical = TRUE
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/hooded/clockrobe_fake
@@ -676,7 +676,7 @@
flags_inv = HIDEJUMPSUIT
magical = TRUE
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/hooded/clockrobe/can_store_weighted()
@@ -786,13 +786,13 @@
flags_inv = HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/clockwork, /obj/item/twohanded/ratvarian_spear, /obj/item/twohanded/clock_hammer, /obj/item/melee/clock_sword)
- hide_tail_by_species = list("Vulpkanin")
+ hide_tail_by_species = list(SPECIES_VULPKANIN)
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
var/reflect_uses = 4
var/normal_armor
@@ -811,7 +811,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/clockwork, /obj/item/twohanded/ratvarian_spear, /obj/item/twohanded/clock_hammer, /obj/item/melee/clock_sword)
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/armor/clockwork/can_store_weighted()
@@ -1072,7 +1072,7 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
armor = list(melee = 45, bullet = 65, laser = 10, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/clockwork_fake
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 1e7c55e79fd..21d3bbefe20 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -31,7 +31,7 @@
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sprite_sheets_inhand = list("Skrell" = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head
+ sprite_sheets_inhand = list(SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head
/obj/item/melee/cultblade/Initialize(mapload)
@@ -119,10 +119,10 @@
flags_inv = HIDEJUMPSUIT
magical = TRUE
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/hooded/cultrobes/alt
@@ -139,7 +139,7 @@
magical = TRUE
species_restricted = null
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/space/cult
@@ -155,7 +155,7 @@
magical = TRUE
species_restricted = null
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/hooded/cultrobes/cult_shield
@@ -173,7 +173,7 @@
var/shield_on = "shield-cult"
species_restricted = null
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/head/hooded/cult_hoodie
@@ -223,13 +223,13 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list("melee" = -50, "bullet" = -50, "laser" = -50,"energy" = -50, "bomb" = -50, "bio" = -50, "rad" = -50, "fire" = 0, "acid" = 0)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi'
)
hoodtype = /obj/item/clothing/head/hooded/flagellant_hood
@@ -262,14 +262,14 @@
flags_cover = HEADCOVERSEYES
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/whetstone/cult
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index a716392eac3..9c66b6cdc66 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(ungibbable_items_types, get_ungibbable_items_types())
id = "hos_laser"
name = "the head of security's X-01 multiphase energy gun"
typepath = /obj/item/gun/energy/gun/hos
- protected_jobs = list("Head Of Security")
+ protected_jobs = list(JOB_TITLE_HOS)
/datum/theft_objective/highrisk/hand_tele
id = "hand_tele"
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index e426780fed1..bd1eec713a4 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -64,7 +64,7 @@
spawn_positions = 1
is_security = 1
supervisors = "the head of security"
- department_head = list("Head of Security")
+ department_head = list(JOB_TITLE_HOS)
selection_color = "#edcdcd"
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
@@ -114,7 +114,7 @@
spawn_positions = 1
is_security = 1
supervisors = "the head of security"
- department_head = list("Head of Security")
+ department_head = list(JOB_TITLE_HOS)
selection_color = "#edcdcd"
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS)
@@ -175,7 +175,7 @@
spawn_positions = 7
is_security = 1
supervisors = "the head of security"
- department_head = list("Head of Security")
+ department_head = list(JOB_TITLE_HOS)
selection_color = "#edcdcd"
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
@@ -240,7 +240,7 @@
spawn_positions = 1
is_security = 1
supervisors = "the head of security"
- department_head = list("Head of Security")
+ department_head = list(JOB_TITLE_HOS)
selection_color = "#edcdcd"
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS)
@@ -277,7 +277,7 @@
spawn_positions = 1
is_security = 1
supervisors = "the head of security"
- department_head = list("Head of Security")
+ department_head = list(JOB_TITLE_HOS)
selection_color = "#edcdcd"
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 35ddb7b30b2..a2edf741d52 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -132,7 +132,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
/* Species-specific sprites, concept stolen from Paradise//vg/.
ex:
sprite_sheets = list(
- "Tajaran" = 'icons/cat/are/bad'
+ SPECIES_TAJARAN = 'icons/cat/are/bad'
)
If index term exists and icon_override is not set, this sprite sheet will be used.
*/
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 0b9eca3f218..6bb441b021b 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -6,13 +6,13 @@
item_state = "headset"
equip_sound = 'sound/items/handling/generic_equip4.ogg'
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/ears.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/ears.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/ears.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/ears.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/ears.dmi'
) //We read you loud and skree-er.
materials = list(MAT_METAL=75)
canhear_range = 0 // can't hear headsets from very far away
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 0aae28e9a78..760eb80ac4d 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -67,14 +67,14 @@
slot_flags = SLOT_FLAG_HEAD
dog_fashion = /datum/dog_fashion/head/fried_vox_empty
sprite_sheets = list(
- "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/trash/pistachios
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 0f454d9c879..ae3b7e30087 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -37,19 +37,19 @@ LIGHTERS ARE IN LIGHTERS.DM
drop_sound = 'sound/items/handling/generic_small_drop.ogg'
equip_sound = 'sound/items/handling/generic_equip5.ogg'
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index fdb7f53ec62..4d4445e7a9d 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -13,7 +13,7 @@
actions_types = list(/datum/action/item_action/toggle_paddles)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/back.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/back.dmi'
)
/// If the paddles are currently attached to the unit.
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 5714e50537d..12c29df5e88 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,9 +18,9 @@
resistance_flags = NONE
max_integrity = 300
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/back.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/back.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/back.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/back.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/back.dmi'
) //For Armalis anything but this and the nitrogen tank will use the default backpack icon.
equip_sound = 'sound/items/handling/backpack_equip.ogg'
pickup_sound = 'sound/items/handling/backpack_pickup.ogg'
@@ -747,14 +747,14 @@
max_combined_w_class = 4
storage_slots = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/back.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/back.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/back.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/back.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/back.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/back.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/back.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/back.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/back.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/back.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/back.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/back.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/back.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/back.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/back.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/back.dmi'
)
can_hold = list(/obj/item/instrument, /obj/item/gun)
cant_hold = list(/obj/item/instrument/accordion, /obj/item/instrument/harmonica)
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index a05d14095ab..d0bde2a48e6 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -172,7 +172,7 @@
name = "nitrogen tank"
desc = "A tank of nitrogen."
icon_state = "oxygen_fr"
- sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi') //Do it for Big Bird.
+ sprite_sheets = list(SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/back.dmi') //Do it for Big Bird.
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
/obj/item/tank/internals/nitrogen/populate_gas()
@@ -190,7 +190,7 @@
name = "vox specialized nitrogen tank"
desc = "A high-tech nitrogen tank designed specifically for Vox."
icon_state = "emergency_vox"
- sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/belt.dmi') //Do it for Big Bird.
+ sprite_sheets = list(SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/belt.dmi') //Do it for Big Bird.
volume = 35
/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas()
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 0f1cdbbe020..c3a2a852997 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -28,11 +28,11 @@ LINEN BINS
var/comfort = 0.5
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/neck.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/neck.dmi'
)
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index d60b3ab5c1e..5b60b2d9609 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -144,7 +144,7 @@
curse(user)
if("Body")
- var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian")
+ var/list/race_list = list(SPECIES_HUMAN, SPECIES_TAJARAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_VULPKANIN, SPECIES_MOTH)
if(CONFIG_GET(flag/usealienwhitelist))
for(var/Spec in GLOB.whitelisted_species)
if(is_alien_whitelisted(H, Spec))
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 690d55670c7..403ad52842f 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -644,10 +644,10 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) //No armor at all
species_restricted = null
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
@@ -674,10 +674,10 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
species_restricted = null
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi'
)
@@ -711,13 +711,13 @@
flags_inv = HIDEJUMPSUIT
cold_protection = 0
heat_protection = 0
- hide_tail_by_species = list("Vulpkanin", "Unathi", "Ash Walker", "Ash Walker Shaman", "Draconid",)
+ hide_tail_by_species = list(SPECIES_VULPKANIN, SPECIES_UNATHI, SPECIES_ASHWALKER_BASIC, SPECIES_ASHWALKER_SHAMAN, SPECIES_DRACONOID)
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
diff --git a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
index 150f50440ac..6c39201989f 100644
--- a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
@@ -59,7 +59,7 @@
attack_effect_override = ATTACK_EFFECT_CLAW
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut", "savaged", "clawed")
- sprite_sheets_inhand = list("Vox" = 'icons/mob/clothing/species/vox/held.dmi', "Drask" = 'icons/mob/clothing/species/drask/held.dmi')
+ sprite_sheets_inhand = list(SPECIES_VOX = 'icons/mob/clothing/species/vox/held.dmi', SPECIES_DRASK = 'icons/mob/clothing/species/drask/held.dmi')
var/durability = 15
var/blood_drain_amount = 15
var/blood_absorbed_amount = 5
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index b6efd4c3cc8..083d056995f 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -213,7 +213,7 @@
allow_gender_pick = FALSE
allow_name_pick = FALSE
allow_tts_pick = TRUE
- var/list/pickable_species = list("Human", "Vulpkanin", "Tajaran", "Unathi", "Skrell", "Diona")
+ var/list/pickable_species = list(SPECIES_HUMAN, SPECIES_VULPKANIN, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_DIONA)
var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize()
var/disable_pda = TRUE
var/disable_sensors = TRUE
diff --git a/code/modules/awaymissions/mission_code/ruins/graveyard.dm b/code/modules/awaymissions/mission_code/ruins/graveyard.dm
index f6da0b0e414..19eae35ae20 100644
--- a/code/modules/awaymissions/mission_code/ruins/graveyard.dm
+++ b/code/modules/awaymissions/mission_code/ruins/graveyard.dm
@@ -114,9 +114,9 @@
/obj/item/storage/funeral_urn/random/Initialize(mapload)
var/pick_race
if(prob(80))
- pick_race = "Human"
+ pick_race = SPECIES_HUMAN
else
- pick_race = pick("Vulpkanin", "Tajaran", "Unathi", "Skrell", "Diona", "Kidan", "Nian")
+ pick_race = pick(SPECIES_VULPKANIN, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_DIONA, SPECIES_KIDAN, SPECIES_MOTH)
var/pick_sex
pick_sex = pick(FEMALE, MALE)
var/nam = random_name(gender = pick_sex, species = pick_race)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 8820ef24dd6..cf4f4068291 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -238,12 +238,12 @@
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -277,14 +277,14 @@
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -386,12 +386,12 @@
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -430,20 +430,20 @@
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
var/obj/item/voice_changer/voice_changer
@@ -516,7 +516,7 @@
name = "backpack"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/back.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/back.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index fa9913273f9..c6a68f38f06 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -106,8 +106,8 @@
/obj/item/clothing/proc/refit_for_species(target_species)
//Set species_restricted list
switch(target_species)
- if("Human", "Skrell") //humanoid bodytypes
- species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox","Wryn","Drask")
+ if(SPECIES_HUMAN, SPECIES_SKRELL) //humanoid bodytypes
+ species_restricted = list("exclude",SPECIES_UNATHI,SPECIES_TAJARAN,SPECIES_DIONA,SPECIES_VOX,SPECIES_WRYN,SPECIES_DRASK)
else
species_restricted = list(target_species)
@@ -137,13 +137,13 @@
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/ears.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/ears.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/ears.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/ears.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/ears.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/ears.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/ears.dmi'
) //We read you loud and skree-er.
@@ -173,11 +173,11 @@
resistance_flags = NONE
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/*
SEE_SELF // can see self, no matter what
@@ -236,8 +236,8 @@ BLIND // can't see anything
put_on_delay = 40
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/gloves.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/gloves.dmi'
)
// Called just before an attack_hand(), in mob/UnarmedAttack()
@@ -357,11 +357,11 @@ BLIND // can't see anything
var/lighting_alpha
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
@@ -421,11 +421,11 @@ BLIND // can't see anything
put_on_delay = 40
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
//Proc that moves gas/breath masks out of the way
@@ -505,17 +505,17 @@ BLIND // can't see anything
slowdown = SHOES_SLOWDOWN
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/shoes.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/shoes.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/shoes.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/shoes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/shoes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/shoes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/shoes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/shoes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/shoes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/shoes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/shoes.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/shoes.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/shoes.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/shoes.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/shoes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/shoes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/shoes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/shoes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/shoes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/shoes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/shoes.dmi'
)
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
@@ -587,12 +587,12 @@ BLIND // can't see anything
integrity_failure = 160
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Proc that opens and closes jackets.
@@ -690,7 +690,7 @@ BLIND // can't see anything
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
- species_restricted = list("exclude","Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
flash_protect = 2
strip_delay = 50
put_on_delay = 50
@@ -720,7 +720,7 @@ BLIND // can't see anything
put_on_delay = 80
resistance_flags = NONE
hide_tail_by_species = null
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
faction_restricted = list("ashwalker")
var/obj/item/tank/jetpack/suit/jetpack = null
@@ -790,18 +790,18 @@ BLIND // can't see anything
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
var/has_sensor = TRUE//For the crew computer 2 = unable to change mode
@@ -994,12 +994,12 @@ BLIND // can't see anything
slot_flags = SLOT_FLAG_NECK
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/neck.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/neck.dmi'
)
/obj/item/clothing/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 7a98d3d89b0..566d430ec46 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -92,15 +92,15 @@
prescription_upgradable = TRUE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/meson/sunglasses
@@ -156,14 +156,14 @@
resistance_flags = ACID_PROOF
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
actions_types = list(/datum/action/item_action/toggle_research_scanner)
@@ -186,12 +186,12 @@
item_state = "glasses"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/night
@@ -204,14 +204,14 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/eyepatch
@@ -221,14 +221,14 @@
item_state = "eyepatch"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/monocle
@@ -239,14 +239,14 @@
prescription_upgradable = TRUE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/material
@@ -258,14 +258,14 @@
vision_flags = SEE_OBJS
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/material/cyber
@@ -293,14 +293,14 @@
prescription = TRUE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/regular/hipster
@@ -316,14 +316,14 @@
item_state = "3d"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/gglasses
@@ -333,14 +333,14 @@
item_state = "gglasses"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
prescription_upgradable = TRUE
@@ -355,14 +355,14 @@
prescription_upgradable = TRUE
dog_fashion = /datum/dog_fashion/head
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses_fake
@@ -371,14 +371,14 @@
icon_state = "sun"
item_state = "sunglasses"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses_fake/holo
@@ -440,14 +440,14 @@
tint = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses/lasers
@@ -472,14 +472,14 @@
can_toggle = TRUE
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi',
)
/obj/item/clothing/glasses/welding/attack_self(mob/user)
@@ -520,14 +520,14 @@
flash_protect = -1
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/thermal/emp_act(severity)
@@ -591,14 +591,14 @@
HUDType = DATA_HUD_MEDICAL_ADVANCED
var/double_eye = FALSE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
@@ -638,14 +638,14 @@
tint = 3
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/tajblind/eng
@@ -724,14 +724,14 @@
icon_state = "heart"
item_state = "heart"
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
)
/obj/item/clothing/glasses/heart/Initialize(mapload)
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index ed3474b3aaa..f18f05fb3c3 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -62,14 +62,14 @@ MEDICAL
examine_extensions = EXAMINE_HUD_MEDICAL
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/health/night
@@ -100,14 +100,14 @@ MEDICAL
actions_types = list(/datum/action/item_action/toggle)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/health/tajblind/sunglasses
@@ -137,14 +137,14 @@ DIAGNOSTIC
HUDType = DATA_HUD_DIAGNOSTIC
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/diagnostic/night
@@ -196,14 +196,14 @@ SECURITY
examine_extensions = EXAMINE_HUD_SECURITY_READ | EXAMINE_HUD_SECURITY_WRITE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/read_only
@@ -228,14 +228,14 @@ SECURITY
tint = 1
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/sunglasses/tacticool
@@ -250,14 +250,14 @@ SECURITY
actions_types = list(/datum/action/item_action/toggle)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/sunglasses/tacticool/attack_self(mob/user)
@@ -293,12 +293,12 @@ SECURITY
actions_types = list(/datum/action/item_action/toggle)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/sunglasses/tajblind/attack_self(mob/user)
@@ -318,14 +318,14 @@ HYDROPONIC
HUDType = DATA_HUD_HYDROPONIC
examine_extensions = EXAMINE_HUD_BOTANY
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/hydroponic/night
@@ -374,14 +374,14 @@ SKILLS
HUDType = DATA_HUD_SECURITY_BASIC
examine_extensions = EXAMINE_HUD_SKILLS
sprite_sheets = list(
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/skills/sunglasses
@@ -393,14 +393,14 @@ SKILLS
tint = 1
prescription_upgradable = TRUE
sprite_sheets = list(
- "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/eyes.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/eyes.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
/obj/item/clothing/glasses/hud/skills/tajblind
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 72d1a274529..ce8e3bf1158 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -299,8 +299,8 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 0)
species_exception = list(/datum/species/monkey)
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/gloves.dmi',)
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/gloves.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/gloves.dmi')
/obj/item/clothing/gloves/knuckles/Touch(atom/A, proximity)
. = FALSE
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 2a47b4a57a3..9e7cf6eb983 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -9,12 +9,12 @@
icon_state = "beanie" //Default white
item_color = "beanie"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
dyeable = TRUE
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 14be24f78b7..504ee55f6b1 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -67,18 +67,18 @@
item_state = "welding"
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/head/collectable/slime
@@ -151,10 +151,10 @@
item_state = "swat"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index c91a83907f3..45241e775ca 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -16,12 +16,12 @@
resistance_flags = FIRE_PROOF
dog_fashion = /datum/dog_fashion/head/hardhat
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/hardhat/attack_self()
@@ -110,11 +110,11 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = null
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 5323bc59fbf..2c233009d80 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -17,15 +17,15 @@
pickup_sound = 'sound/items/handling/helmet_pickup.ogg'
drop_sound = 'sound/items/handling/helmet_drop.ogg'
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
@@ -74,8 +74,8 @@
armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
dog_fashion = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot
@@ -89,8 +89,8 @@
strip_delay = 80
dog_fashion = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot/knight
@@ -102,7 +102,7 @@
flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES|HIDENAME
dog_fashion = null
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/justice
@@ -140,13 +140,13 @@
strip_delay = 80
dog_fashion = null
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/helmet/swat/syndicate
@@ -240,33 +240,33 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/helmet/riot/knight/blue
icon_state = "knight_blue"
item_state = "knight_blue"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot/knight/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot/knight/red
icon_state = "knight_red"
item_state = "knight_red"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot/knight/templar
@@ -276,7 +276,7 @@
item_state = "knight_templar"
armor = list(melee = 20, bullet = 7, laser = 2, energy = 2, bomb = 2, bio = 2, rad = 0, fire = 80, acid = 80)
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/skull
@@ -289,16 +289,16 @@
item_state = "skull"
strip_delay = 100
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/skull/Yorick
name = "Йорик"
desc = "Бедный Йорик..."
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/durathread
@@ -317,7 +317,7 @@
desc = "An in-atmosphere helmet worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights."
icon_state = "erthelmet_cmd"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
//Security
@@ -327,7 +327,7 @@
desc = "An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights."
icon_state = "erthelmet_sec"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/head/helmet/ert/security/paranormal
@@ -337,7 +337,7 @@
icon_state = "knight_templar"
item_state = "knight_templar"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
//Engineer
@@ -347,7 +347,7 @@
desc = "An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
icon_state = "erthelmet_eng"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
//Medical
@@ -357,7 +357,7 @@
desc = "A set of armor worn by medical members of the Nanotrasen Emergency Response Team. Has red and white highlights."
icon_state = "erthelmet_med"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
//Janitorial
@@ -367,7 +367,7 @@
desc = "A set of armor worn by janitorial members of the Nanotrasen Emergency Response Team. Has red and white highlights."
icon_state = "erthelmet_jan"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/head/helmet/buckhelm
@@ -380,24 +380,24 @@
armor = list("melee" = 8, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
strip_delay = 7 SECONDS
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
- "Nian" = 'icons/mob/clothing/species/nian/helmet.dmi',
- "Machine" = 'icons/mob/clothing/species/machine/helmet.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/head.dmi',
+ SPECIES_MOTH = 'icons/mob/clothing/species/nian/helmet.dmi',
+ SPECIES_MACNINEPERSON = 'icons/mob/clothing/species/machine/helmet.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
//Dredd
@@ -407,7 +407,7 @@
icon_state = "streetjudge_helmet"
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- species_restricted = list("Human", "Slime People", "Skeleton", "Nucleation", "Machine")
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_NUCLEATION, SPECIES_MACNINEPERSON)
/obj/item/clothing/head/helmet/lightweighthelmet
name = "lightweight helmet"
@@ -420,12 +420,12 @@
flags_cover = null
dog_fashion = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 2e81b88a59e..06cd020cd46 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -129,12 +129,12 @@
muhtar_fashion = /datum/muhtar_fashion/head/detective
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/det_hat/black
@@ -254,12 +254,12 @@
icon_state = "surgcap_blue"
flags = BLOCKHEADHAIR
sprite_sheets = list(
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/surgery/purple
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index cbc1acd040e..4cee1e2d983 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -80,12 +80,12 @@
flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES|HIDENAME
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
@@ -99,12 +99,12 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/snowman
@@ -117,13 +117,13 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/that
@@ -288,13 +288,13 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/corgi
@@ -343,12 +343,12 @@
icon_state = "fedora"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/fedora/whitefedora
@@ -356,12 +356,12 @@
icon_state = "wfedora"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/fedora/brownfedora
@@ -369,12 +369,12 @@
icon_state = "bfedora"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/stalhelm
@@ -479,12 +479,12 @@
icon_state = "rocksohat"
item_state = "rocksohat"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi',
- "Wryn" = 'icons/mob/clothing/species/wryn/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/head.dmi',
+ SPECIES_WRYN = 'icons/mob/clothing/species/wryn/head.dmi'
)
/obj/item/clothing/head/rice_hat
@@ -502,13 +502,13 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
actions_types = list(/datum/action/item_action/caw)
@@ -542,13 +542,13 @@
flags_inv = HIDENAME|HIDEHEADSETS
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/papersack/smiley
@@ -559,13 +559,13 @@
flags_inv = HIDENAME|HIDEHEADSETS
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/crown
@@ -596,7 +596,7 @@
name = "shaman skull"
desc = "The skull of a long dead animal bolted to the front of a repurposed pan."
icon_state = "shamskull"
- species_restricted = list("Unathi", "Ash Walker", "Ash Walker Shaman", "Draconid")
+ species_restricted = list(SPECIES_UNATHI, SPECIES_ASHWALKER_BASIC, SPECIES_ASHWALKER_SHAMAN, SPECIES_DRACONOID)
/obj/item/clothing/head/mr_chang_band
name = "Tight headband"
@@ -618,9 +618,9 @@
icon_state = "flower_crown"
item_state = "flower_crown"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/sunflower_crown
@@ -629,9 +629,9 @@
icon_state = "sunflower_crown"
item_state = "sunflower_crown"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/poppy_crown
@@ -640,9 +640,9 @@
icon_state = "poppy_crown"
item_state = "poppy_crown"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/lily_crown
@@ -651,9 +651,9 @@
icon_state = "lily_crown"
item_state = "lily_crown"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/geranium_crown
@@ -662,7 +662,7 @@
icon_state = "geranium_crown"
item_state = "geranium_crown"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 601e5701b3c..37180c7468e 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -30,19 +30,19 @@
var/paint = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/welding/flamedecal
@@ -176,12 +176,12 @@
toggle_on_message = "You raise the ear flaps on"
toggle_off_message = "You lower the ear flaps on"
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/sovietsidecap
@@ -226,13 +226,13 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -305,13 +305,13 @@
species_disguise = "High-tech robot"
dog_fashion = /datum/dog_fashion/head/cardborg
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
@@ -337,13 +337,13 @@
item_state = "head_mirror"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 2cf395d7c33..96b84765cc6 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -8,12 +8,12 @@
actions_types = list(/datum/action/item_action/flip_cap)
dog_fashion = /datum/dog_fashion/head/cargo_tech
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
dyeable = TRUE
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 5cb6065d793..84b0bcb5256 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -11,20 +11,20 @@
adjusted_flags = SLOT_FLAG_HEAD
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
@@ -56,20 +56,20 @@
w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/luchador/tecnicos
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 9712a8cdc10..9328eb94c32 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -12,22 +12,22 @@
resistance_flags = NONE
can_toggle = TRUE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/breath/attack_self(mob/user)
@@ -55,7 +55,7 @@
icon_state = "voxmask"
item_state = "voxmask"
permeability_coefficient = 0.01
- species_restricted = list("Vox", "Vox Armalis") //These should fit the "Mega Vox" just fine.
+ species_restricted = list(SPECIES_VOX, SPECIES_VOX_ARMALIS) //These should fit the "Mega Vox" just fine.
actions_types = null
/obj/item/clothing/mask/breath/vox/attack_self(mob/user)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 50a4fc26c2d..4cfe7a7f3fa 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -11,21 +11,21 @@
permeability_coefficient = 0.01
resistance_flags = NONE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
// **** Welding gas mask ****
@@ -66,20 +66,20 @@
can_toggle = TRUE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
@@ -192,7 +192,7 @@
icon_state = "rainbow"
item_state = "rainbow"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/gas/clownwiz
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 0678aa65b3d..3d4a0c4eff7 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -14,12 +14,12 @@
var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
// Clumsy folks can't take the mask off themselves.
@@ -98,19 +98,19 @@
var/trashtype = /obj/item/trash/tapetrash
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user, silent = FALSE)
@@ -143,20 +143,20 @@
materials = list(MAT_METAL=500, MAT_GLASS=50)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/muzzle/safety/shock
@@ -248,20 +248,20 @@
actions_types = list(/datum/action/item_action/adjust)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
@@ -277,20 +277,20 @@
dog_fashion = /datum/dog_fashion/head/not_ian
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/fakemoustache/attack_self(mob/user)
@@ -357,13 +357,13 @@
var/originalname = ""
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/horsehead/equipped(mob/user, slot, initial)
@@ -406,7 +406,7 @@
icon_state = "rat"
item_state = "rat"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/fox
@@ -415,7 +415,7 @@
icon_state = "fox"
item_state = "fox"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/bee
@@ -424,7 +424,7 @@
icon_state = "bee"
item_state = "bee"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/bear
@@ -433,7 +433,7 @@
icon_state = "bear"
item_state = "bear"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/bat
@@ -442,7 +442,7 @@
icon_state = "bat"
item_state = "bat"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/raven
@@ -451,7 +451,7 @@
icon_state = "raven"
item_state = "raven"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/jackal
@@ -460,7 +460,7 @@
icon_state = "jackal"
item_state = "jackal"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/tribal
@@ -469,7 +469,7 @@
icon_state = "bumba"
item_state = "bumba"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/face/fawkes
@@ -479,7 +479,7 @@
item_state = "fawkes"
w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/mask/gas/pennywise
@@ -488,7 +488,7 @@
icon_state = "pennywise_mask"
item_state = "pennywise_mask"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
@@ -499,15 +499,15 @@
icon_state = "rocksomask"
item_state = "rocksomask"
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Kidan" = 'icons/mob/clothing/species/kidan/mask.dmi',
- "Wryn" = 'icons/mob/clothing/species/wryn/mask.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/mask.dmi',
+ SPECIES_WRYN = 'icons/mob/clothing/species/wryn/mask.dmi'
)
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
@@ -524,20 +524,20 @@
dyeable = TRUE
can_toggle = TRUE
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
actions_types = list(/datum/action/item_action/adjust)
@@ -681,17 +681,17 @@
actions_types = list(/datum/action/item_action/adjust)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/mask.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/mask.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/mask.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/mask.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
/obj/item/clothing/mask/secscarf/attack_self(mob/user)
diff --git a/code/modules/clothing/neck/ponchos.dm b/code/modules/clothing/neck/ponchos.dm
index be819ebe42a..51559689e53 100644
--- a/code/modules/clothing/neck/ponchos.dm
+++ b/code/modules/clothing/neck/ponchos.dm
@@ -8,21 +8,21 @@
dyeable = TRUE
item_color = "classic"
sprite_sheets = list(
- "Drask" = 'icons/mob/clothing/species/drask/neck.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/neck.dmi',
- "Kidan" = 'icons/mob/clothing/species/kidan/neck.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/neck.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/neck.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/neck.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/neck.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/neck.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
- "Wryn" = 'icons/mob/clothing/species/wryn/neck.dmi'
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/neck.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/neck.dmi',
+ SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/neck.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/neck.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/neck.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/neck.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/neck.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/neck.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/neck.dmi',
+ SPECIES_WRYN = 'icons/mob/clothing/species/wryn/neck.dmi'
)
/obj/item/clothing/neck/poncho/update_icon_state()
diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm
index 805cf72c619..7b172f415e6 100644
--- a/code/modules/clothing/patreon/glasses.dm
+++ b/code/modules/clothing/patreon/glasses.dm
@@ -9,12 +9,12 @@
item_state = "gar"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/eyes.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/eyes.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/eyes.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/eyes.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
)
diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm
index 8a28d6cffb5..87fb4bfbc51 100644
--- a/code/modules/clothing/patreon/hats.dm
+++ b/code/modules/clothing/patreon/hats.dm
@@ -11,12 +11,12 @@
flags = BLOCKHAIR
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
//gold top hat and recolours
@@ -27,12 +27,12 @@
item_state = "goldtophat"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
@@ -57,12 +57,12 @@
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
//black sombrero
@@ -74,10 +74,10 @@
flags = BLOCKHAIR
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index b4ccde8d237..1ff0faa3eaa 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -2,7 +2,7 @@
/obj/item/clothing/head/helmet/space/skrell
name = "Skrellian helmet"
desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
- species_restricted = list("Skrell","Human")
+ species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)
/obj/item/clothing/head/helmet/space/skrell/white
icon_state = "skrell_helmet_white"
@@ -17,7 +17,7 @@
/obj/item/clothing/suit/space/skrell
name = "Skrellian hardsuit"
desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
- species_restricted = list("Skrell","Human")
+ species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)
/obj/item/clothing/suit/space/skrell/white
icon_state = "skrell_suit_white"
@@ -32,12 +32,12 @@
//Unathi space gear. Huge and restrictive.
/obj/item/clothing/head/helmet/space/unathi
icon = 'icons/obj/clothing/species/unathi/hats.dmi'
- species_restricted = list("Unathi")
+ species_restricted = list(SPECIES_UNATHI)
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/unathi/helmet_cheap
@@ -49,12 +49,12 @@
/obj/item/clothing/suit/space/unathi
icon = 'icons/obj/clothing/species/unathi/suits.dmi'
- species_restricted = list("Unathi")
+ species_restricted = list(SPECIES_UNATHI)
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/space/unathi/rig_cheap
@@ -86,10 +86,10 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
icon = 'icons/obj/clothing/species/vox/suits.dmi'
- species_restricted = list("Vox", "Vox Armalis")
+ species_restricted = list(SPECIES_VOX, SPECIES_VOX_ARMALIS)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/suit.dmi',
)
/obj/item/clothing/head/helmet/space/vox
@@ -97,10 +97,10 @@
flags = STOPSPRESSUREDMAGE
flags_cover = HEADCOVERSEYES
icon = 'icons/obj/clothing/species/vox/hats.dmi'
- species_restricted = list("Vox","Vox Armalis")
+ species_restricted = list(SPECIES_VOX,SPECIES_VOX_ARMALIS)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/head.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/head.dmi',
)
/obj/item/clothing/head/helmet/space/vox/pressure
@@ -155,9 +155,9 @@
/obj/item/clothing/under/vox
has_sensor = 0
icon = 'icons/obj/clothing/species/vox/uniforms.dmi'
- species_restricted = list("Vox")
+ species_restricted = list(SPECIES_VOX)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/obj/item/clothing/under/vox/vox_casual
@@ -174,10 +174,10 @@
icon_state = "vox-casual-2"
item_color = "vox-casual-2"
item_state = "vox-casual-2"
- species_restricted = list("Vox","Vox Armalis")
+ species_restricted = list(SPECIES_VOX,SPECIES_VOX_ARMALIS)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/suit.dmi'
)
/obj/item/clothing/gloves/color/yellow/vox
@@ -189,10 +189,10 @@
permeability_coefficient = 0.05
item_color = "gloves-vox"
icon = 'icons/obj/clothing/species/vox/gloves.dmi'
- species_restricted = list("Vox","Vox Armalis")
+ species_restricted = list(SPECIES_VOX,SPECIES_VOX_ARMALIS)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/gloves.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/gloves.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/gloves.dmi',
)
/obj/item/clothing/shoes/magboots/vox
@@ -201,10 +201,10 @@
item_state = "boots-vox"
icon_state = "boots-vox"
icon = 'icons/obj/clothing/species/vox/shoes.dmi'
- species_restricted = list("Vox","Vox Armalis")
+ species_restricted = list(SPECIES_VOX,SPECIES_VOX_ARMALIS)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/feet.dmi',
- "Vox Armalis" = 'icons/mob/clothing/species/armalis/feet.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/feet.dmi',
+ SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/feet.dmi'
)
@@ -256,7 +256,7 @@
desc = "Alien backpack, made from synthetic fiber."
icon_state = "backpack_gold_vox"
item_state = "backpack_gold_vox"
- var/list/species_restricted = list("Vox")
+ var/list/species_restricted = list(SPECIES_VOX)
/obj/item/storage/backpack/alien/satchel
name = "alien satchel"
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 47c0e306c85..1c7b7229b83 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -12,9 +12,9 @@
strip_delay = 130
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize()
@@ -66,9 +66,9 @@
slowdown = 0
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/space/hardsuit/ert/gamma
@@ -83,7 +83,7 @@
item_state = "helm-command"
item_color = "ert_commander"
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/ert/gamma/commander
@@ -211,14 +211,14 @@
resistance_flags = FIRE_PROOF
has_camera = FALSE
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/space/hardsuit/ert/paranormal
@@ -230,13 +230,13 @@
jetpack = null
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
allowed = list(/obj/item/nullrod/claymore, /obj/item/storage/belt/claymore, /obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat)
hide_tail_by_species = list("Unathi, Ash Walker, Ash Walker Shaman, Draconid, Tajaran, Vox, Vulpkanin")
@@ -277,7 +277,7 @@
item_state = "ert_solgov_marine"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
slowdown = 0
- species_restricted = list("Human", "Slime People", "Skeleton", "Nucleation", "Machine")
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_NUCLEATION, SPECIES_MACNINEPERSON)
armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 100, acid = 50)
resistance_flags = FIRE_PROOF
@@ -311,7 +311,7 @@
HUDType = MEDHUD
strip_delay = 130
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
@@ -336,12 +336,12 @@
dog_fashion = /datum/dog_fashion/back/deathsquad
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
@@ -361,7 +361,7 @@
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
/obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
strip_delay = 130
- species_restricted = list("exclude", "Wryn", "lesser form", "Vox")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form", SPECIES_VOX)
/obj/item/clothing/head/helmet/space/ert_eva_amber
name = "ERT Amber Space helmet"
@@ -374,7 +374,7 @@
flash_protect = 0
var/obj/machinery/camera/camera
var/has_camera = TRUE
- species_restricted = list("exclude", "Wryn", "lesser form", "Vox")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form", SPECIES_VOX)
/obj/item/clothing/head/helmet/space/ert_eva_amber/Initialize()
if(loc)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 8ffe9a162dd..1768cfbf516 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -18,25 +18,25 @@
actions_types = list(/datum/action/item_action/toggle_helmet_light)
//Species-specific stuff.
- species_restricted = list("exclude","Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi'
)
sprite_sheets_obj = list(
- "Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
- "Tajaran" = 'icons/obj/clothing/species/tajaran/hats.dmi',
- "Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
- "Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
- "Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi'
+ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi',
+ SPECIES_TAJARAN = 'icons/obj/clothing/species/tajaran/hats.dmi',
+ SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi',
+ SPECIES_VOX = 'icons/obj/clothing/species/vox/hats.dmi',
+ SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/hats.dmi'
)
@@ -121,25 +121,25 @@
actions_types = list(/datum/action/item_action/toggle_helmet)
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
light_on = FALSE
- hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi", "Ash Walker", "Ash Walker Shaman", "Draconid", "Tajaran")
- species_restricted = list("exclude", "Wryn", "lesser form")
+ hide_tail_by_species = list(SPECIES_VOX , SPECIES_VULPKANIN , SPECIES_UNATHI, SPECIES_ASHWALKER_BASIC, SPECIES_ASHWALKER_SHAMAN, SPECIES_DRACONOID, SPECIES_TAJARAN)
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
sprite_sheets_obj = list(
- "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
- "Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
- "Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
- "Vox" = 'icons/obj/clothing/species/vox/suits.dmi',
- "Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
+ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi',
+ SPECIES_TAJARAN = 'icons/obj/clothing/species/tajaran/suits.dmi',
+ SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi',
+ SPECIES_VOX = 'icons/obj/clothing/species/vox/suits.dmi',
+ SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
)
@@ -571,7 +571,7 @@
desc = "A soviet military hardsuit designed for maximum speed and mobility. Proudly displays the U.S.S.P flag on the chest."
icon_state = "hardsuit-soviet"
item_state = "hardsuit-soviet"
- species_restricted = list("Human", "Slime People", "Skeleton", "Nucleation", "Machine", "Kidan", "Plasmaman") // Until the xenos textures are created
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_NUCLEATION, SPECIES_MACNINEPERSON, SPECIES_KIDAN, SPECIES_PLASMAMAN) // Until the xenos textures are created
slowdown = 0.5
armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank/internals,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 92721fb2dab..a3c532b9859 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -8,16 +8,16 @@
permeability_coefficient = 0.01
resistance_flags = ACID_PROOF
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot, initial)
@@ -41,15 +41,15 @@
allowed = list(/obj/item/tank/internals, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs)
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETAIL
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
//Deathsquad space suit, not hardsuits because no flashlight!
@@ -81,11 +81,11 @@
dog_fashion = /datum/dog_fashion/back/deathsquad
species_restricted = null
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//NEW SWAT suit
@@ -98,11 +98,11 @@
armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/helmet/space/deathsquad/beret
@@ -114,11 +114,11 @@
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
flags_cover = null
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/head/helmet/space/deathsquad/beret/supreme
@@ -182,13 +182,13 @@
icon_state = "santahat"
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/Grey/head.dmi',
- "Drask" = 'icons/mob/clothing/species/Drask/helmet.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/Grey/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/Drask/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_cover = HEADCOVERSEYES
@@ -215,11 +215,11 @@
allowed = list(/obj/item) //for stuffing extra special presents
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
species_restricted = null
@@ -238,11 +238,11 @@
species_restricted = null
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/suit/space/pirate
@@ -258,11 +258,11 @@
put_on_delay = 20
sprite_sheets = list(
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
species_restricted = null
@@ -274,22 +274,22 @@
icon_state = "paramedic-eva-helmet"
item_state = "paramedic-eva-helmet"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 65)
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
)
sprite_sheets_obj = list(
- "Vox" = 'icons/obj/clothing/species/vox/hats.dmi'
+ SPECIES_VOX = 'icons/obj/clothing/species/vox/hats.dmi'
)
/obj/item/clothing/suit/space/eva/paramedic
@@ -299,21 +299,21 @@
desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space."
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 65)
slowdown = 0.5
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
sprite_sheets_obj = list(
- "Vox" = 'icons/obj/clothing/species/vox/suits.dmi'
+ SPECIES_VOX = 'icons/obj/clothing/species/vox/suits.dmi'
)
/obj/item/clothing/suit/space/eva
@@ -322,22 +322,22 @@
item_state = "s_suit"
desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 65)
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
sprite_sheets_obj = list(
- "Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
- "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
- "Vox" = 'icons/obj/clothing/species/vox/suits.dmi',
- "Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
+ SPECIES_TAJARAN = 'icons/obj/clothing/species/tajaran/suits.dmi',
+ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi',
+ SPECIES_VOX = 'icons/obj/clothing/species/vox/suits.dmi',
+ SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
)
/obj/item/clothing/head/helmet/space/eva
@@ -348,20 +348,20 @@
flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 65)
flash_protect = 0
- species_restricted = list("exclude", "Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi'
)
sprite_sheets_obj = list(
- "Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
- "Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi'
+ SPECIES_VOX = 'icons/obj/clothing/species/vox/hats.dmi',
+ SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/hats.dmi'
)
//Mime's Hardsuit
@@ -371,10 +371,10 @@
desc = ". . ."
icon_state = "spacemimehelmet"
item_state = "spacemimehelmet"
- species_restricted = list("exclude","Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi')
sprite_sheets_obj = null
/obj/item/clothing/suit/space/eva/mime
@@ -383,10 +383,10 @@
desc = ". . ."
icon_state = "spacemime_suit"
item_state = "spacemime_items"
- species_restricted = list("exclude","Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets_obj = null
/obj/item/clothing/head/helmet/space/eva/clown
@@ -395,10 +395,10 @@
desc = "An EVA helmet specifically designed for the clown. SPESSHONK!"
icon_state = "clownhelmet"
item_state = "clownhelmet"
- species_restricted = list("exclude","Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi')
sprite_sheets_obj = null
/obj/item/clothing/suit/space/eva/clown
@@ -407,10 +407,10 @@
desc = "An EVA suit specifically designed for the clown. SPESSHONK!"
icon_state = "spaceclown_suit"
item_state = "spaceclown_items"
- species_restricted = list("exclude","Wryn", "lesser form")
+ species_restricted = list("exclude", SPECIES_WRYN, "lesser form")
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets_obj = null
//pirate-themed stuff
@@ -421,15 +421,15 @@
desc = "A lightweight pirate-themed EVA suit designed to protect from vacuum and those nasty lasers flying from the victims of pirate raid."
armor = list(melee = 10, bullet = 5, laser = 30, energy = 25, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 65)
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/head/helmet/space/eva/pirate
@@ -441,15 +441,15 @@
armor = list(melee = 10, bullet = 5, laser = 30, energy = 25, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 65)
flash_protect = 2
sprite_sheets = list(
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi'
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/helmet.dmi'
)
/obj/item/clothing/suit/space/eva/pirate/leader
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index f68eb7a06e4..cf1dec1ef40 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -26,8 +26,8 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
visor_flags_inv = HIDEGLASSES|HIDENAME
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
- species_restricted = list("Plasmaman")
- sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi')
+ species_restricted = list(SPECIES_PLASMAMAN)
+ sprite_sheets = list(SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/helmet.dmi')
var/upgradable = FALSE
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 70b08afa3dd..a37c260c85d 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -7,14 +7,14 @@
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 25, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi')
/obj/item/clothing/suit/space/syndicate
@@ -26,13 +26,13 @@
allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 25, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
sprite_sheets = list(
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi')
//Green syndicate space suit
diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm
index 52d3c7cf14f..94b54fa52f1 100644
--- a/code/modules/clothing/spacesuits/void.dm
+++ b/code/modules/clothing/spacesuits/void.dm
@@ -7,14 +7,14 @@
item_state = "void"
flags_inv = HIDEMASK|HIDEHEADSETS
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi')
/obj/item/clothing/suit/space/nasavoid
name = "NASA Void Suit"
@@ -23,13 +23,13 @@
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance."
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool)
sprite_sheets = list(
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi')
//Colors!!!
/obj/item/clothing/head/helmet/space/nasavoid/green
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index 9d3c1677832..cb34aa3f1fe 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -1,13 +1,13 @@
//Unathi clothing.
/obj/item/clothing/suit/unathi
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/unathi/robe
@@ -24,10 +24,10 @@
icon_state = "mantle-unathi"
body_parts_covered = UPPER_TORSO
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/neck.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/neck.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/neck.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/neck.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/neck.dmi'
)
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 24cb0a4b6b1..480ae86bdca 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -11,13 +11,13 @@
resistance_flags = NONE
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
w_class = WEIGHT_CLASS_NORMAL
@@ -47,13 +47,13 @@
name = "security armor"
desc = "An armored vest that protects against some damage. This one has a clip for a holobadge."
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
icon_state = "armor"
item_state = "armor"
@@ -209,19 +209,19 @@
flags_inv = HIDEJUMPSUIT
strip_delay = 80
put_on_delay = 60
- hide_tail_by_species = list("Vox")
+ hide_tail_by_species = list(SPECIES_VOX)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/armor/riot/knight
@@ -230,34 +230,34 @@
icon_state = "knight_green"
item_state = "knight_green"
slowdown = 1
- hide_tail_by_species = list("Vulpkanin")
+ hide_tail_by_species = list(SPECIES_VULPKANIN)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/riot/knight/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/riot/knight/blue
icon_state = "knight_blue"
item_state = "knight_blue"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/riot/knight/red
icon_state = "knight_red"
item_state = "knight_red"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/riot/knight/templar
@@ -268,8 +268,8 @@
allowed = list(/obj/item/nullrod/claymore, /obj/item/storage/belt/claymore)
armor = list(melee = 25, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/vest/durathread
@@ -481,10 +481,10 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 3
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- hide_tail_by_species = list("Vox")
+ hide_tail_by_species = list(SPECIES_VOX)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/tdome
@@ -494,7 +494,7 @@
flags = THICKMATERIAL
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- hide_tail_by_species = list("Vox", "Vulpkanin")
+ hide_tail_by_species = list(SPECIES_VOX, SPECIES_VULPKANIN)
/obj/item/clothing/suit/armor/tdome/red
name = "Red Thunderdome Armor"
@@ -502,8 +502,8 @@
icon_state = "tdred"
item_state = "tdred"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/armor/tdome/green
@@ -512,8 +512,8 @@
icon_state = "tdgreen"
item_state = "tdgreen"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
//Non-hardsuit ERT armor.
@@ -541,11 +541,11 @@
desc = "A set of armor worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils."
icon_state = "knight_templar"
item_state = "knight_templar"
- hide_tail_by_species = list("Vox", "Vulpkanin")
+ hide_tail_by_species = list(SPECIES_VOX, SPECIES_VULPKANIN)
allowed = list(/obj/item/nullrod/claymore, /obj/item/storage/belt/claymore, /obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
//Engineer
@@ -592,14 +592,14 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
- hide_tail_by_species = list("Vulpkanin")
+ hide_tail_by_species = list(SPECIES_VULPKANIN)
/obj/item/clothing/head/hooded/drake
name = "drake helmet"
@@ -666,14 +666,14 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi'
)
- hide_tail_by_species = list("Vulpkanin")
+ hide_tail_by_species = list(SPECIES_VULPKANIN)
/obj/item/clothing/suit/armor/makeshift_armor
name = "makeshift armor"
@@ -689,4 +689,4 @@
name = "judge's security armor"
desc = "Perfect for when you're looking to send a message rather than performing your actual duties."
icon_state = "streetjudgearmor"
- species_restricted = list("Human", "Slime People", "Skeleton", "Nucleation", "Machine")
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_NUCLEATION, SPECIES_MACNINEPERSON)
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index b128bbb9ec6..43f8a05447c 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -11,20 +11,20 @@
resistance_flags = ACID_PROOF
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/head.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/suit/bio_suit
@@ -45,19 +45,19 @@
put_on_delay = 70
resistance_flags = ACID_PROOF
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
@@ -121,17 +121,17 @@
put_on_delay = 20
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
hide_tail_by_species = list("Unathi, Ash Walker, Ash Walker Shaman, Draconid, Tajaran, Vulpkanin")
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 54668497fdd..9fc15783695 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -12,13 +12,13 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/storage/paramedic_jacket
@@ -47,13 +47,13 @@
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Botanist
@@ -67,13 +67,13 @@
allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Captain
@@ -87,13 +87,13 @@
allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/captunic/coat
@@ -147,13 +147,13 @@
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/hooded/chaplain_hoodie/no_name
@@ -173,13 +173,13 @@
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Chaplain
@@ -213,13 +213,13 @@
allowed = list (/obj/item/kitchen/knife)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Chef
@@ -246,20 +246,20 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/storage/det_suit/black
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
icon_state = "detective_black"
@@ -287,9 +287,9 @@
desc = "A black forensics technician jacket."
icon_state = "dec_blazer_black"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/storage/det_suit/forensics/blaser/brown
@@ -315,13 +315,13 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/storage/blueshield/srt
@@ -340,25 +340,25 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Lawyer
/obj/item/clothing/suit/storage/lawyer
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/storage/lawyer/blackjacket
@@ -407,13 +407,13 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Internal Affairs
@@ -430,13 +430,13 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/storage/ntrep
@@ -451,13 +451,13 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Medical
@@ -475,13 +475,13 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Suspenders
@@ -494,15 +494,15 @@
var/paintable = TRUE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -578,16 +578,16 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 30)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
)
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 204b3b80d1e..527046f352a 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -12,14 +12,14 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
species_exception = list(/datum/species/golem)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 9fc5d92805b..734b2e18fb1 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -21,13 +21,13 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/redtag
@@ -42,13 +42,13 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/*
@@ -61,13 +61,13 @@
item_state = "pirate_old"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/pirate_black
@@ -77,13 +77,13 @@
item_state = "pirate"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/hgpirate
@@ -146,13 +146,13 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/apron/overalls
@@ -200,11 +200,11 @@
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
flags_inv = HIDESHOES|HIDEJUMPSUIT
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/corgisuit
@@ -312,11 +312,11 @@
allowed = list(/obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/carp_hood
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/head/hooded/carp_hood
@@ -369,11 +369,11 @@
item_state = "lingspacesuit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/draculacoat // Bleh!
@@ -398,13 +398,13 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/head/hooded/winterhood
@@ -418,13 +418,13 @@
flags_inv = HIDEHEADSETS
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/suit/hooded/wintercoat/captain
@@ -598,13 +598,13 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/hood
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/head/hooded/hood
@@ -617,13 +617,13 @@
flags_inv = HIDEHEADSETS
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/hooded/hood/blue
@@ -677,11 +677,11 @@
strip_delay = 60
breakouttime = 3000
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/ianshirt
@@ -691,13 +691,13 @@
item_state = "ianshirt"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
@@ -747,13 +747,13 @@
item_state = "brtrenchcoat"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/blacktrenchcoat
@@ -763,13 +763,13 @@
item_state = "bltrenchcoat"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//trackjackets
@@ -786,13 +786,13 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/tracksuit/green
@@ -854,11 +854,11 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
//swimsuit
@@ -932,13 +932,13 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/jacket/pilot
@@ -978,15 +978,15 @@
adjust_flavour = "unzip"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/jacket/leather/overcoat
@@ -1006,13 +1006,13 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/soldiercoat
@@ -1025,13 +1025,13 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/sovietcoat
@@ -1363,9 +1363,9 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
allowed = list()
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
)
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index c332dbdddd8..ee56831a35f 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -31,11 +31,11 @@
put_on_delay = 60
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/fire/firefighter
@@ -43,14 +43,14 @@
item_state = "firefighter"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/suit/fire/heavy
@@ -69,14 +69,14 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/*
@@ -100,15 +100,15 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/bomb_suit
@@ -133,23 +133,23 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"
item_state = "bombsuitsec"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/bomb_suit/security
@@ -157,9 +157,9 @@
item_state = "bombsuitsec"
allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/restraints/handcuffs)
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
@@ -178,15 +178,15 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/radiation
@@ -208,12 +208,12 @@
resistance_flags = NONE
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 4dd553949b8..d6111ff426e 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -38,15 +38,15 @@
item_state = "wizhatmime"
dog_fashion = null
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/head/wizard/fake
@@ -60,8 +60,8 @@
resistance_flags = FLAMMABLE
dog_fashion = /datum/dog_fashion/head/blue_wizard
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi'
)
/obj/item/clothing/head/wizard/marisa
@@ -86,11 +86,11 @@
dog_fashion = null
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/head.dmi'
)
/obj/item/clothing/head/wizard/necromage
@@ -101,11 +101,11 @@
dog_fashion = null
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/head.dmi'
)
/obj/item/clothing/head/wizard/artmage
@@ -115,8 +115,8 @@
item_state = "artmage"
dog_fashion = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/wizard/visionmage
@@ -126,8 +126,8 @@
item_state = "visionmage"
dog_fashion = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/wizard/healmage
@@ -137,7 +137,7 @@
item_state = "healmage"
dog_fashion = null
sprite_sheets = list(
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/wizard/amp
@@ -186,15 +186,15 @@
icon_state = "wizzmime"
item_state = "wizzmime"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/marisa
@@ -209,11 +209,11 @@
icon_state = "magusblue"
item_state = "magusblue"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/magusred
@@ -222,11 +222,11 @@
icon_state = "magusred"
item_state = "magusred"
sprite_sheets = list(
- "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
+ SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/magusdefender
@@ -235,8 +235,8 @@
icon_state = "magusdefender"
item_state = "magusdefender"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/necromage
@@ -245,8 +245,8 @@
icon_state = "necromage"
item_state = "necromage"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/artmage
@@ -255,8 +255,8 @@
icon_state = "artmage"
item_state = "artmage"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/visionmage
@@ -265,8 +265,8 @@
icon_state = "visionmage"
item_state = "visionmage"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/healmage
@@ -275,9 +275,9 @@
icon_state = "healmage"
item_state = "healmage"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/wizrobe/psypurple
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 17bfdbcd670..9cff80afa8a 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -141,12 +141,12 @@
item_color = "waistcoat"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/stethoscope
@@ -621,19 +621,19 @@
item_state = "jacket_ntrf"
item_color = "jacket_ntrf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
//Cowboy Shirts
@@ -645,12 +645,12 @@
item_color = "cowboyshirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/short_sleeved
@@ -661,12 +661,12 @@
item_color = "cowboyshirt_s"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white
@@ -677,12 +677,12 @@
item_color = "cowboyshirt_white"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white/short_sleeved
@@ -693,12 +693,12 @@
item_color = "cowboyshirt_whites"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink
@@ -709,12 +709,12 @@
item_color = "cowboyshirt_pink"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved
@@ -725,12 +725,12 @@
item_color = "cowboyshirt_pinks"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy
@@ -741,12 +741,12 @@
item_color = "cowboyshirt_navy"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
@@ -757,12 +757,12 @@
item_color = "cowboyshirt_navys"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red
@@ -773,12 +773,12 @@
item_color = "cowboyshirt_red"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red/short_sleeved
@@ -789,14 +789,14 @@
item_color = "cowboyshirt_reds"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/corset
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
index 4b201f7d857..1dff8f2a9f2 100644
--- a/code/modules/clothing/under/accessories/storage.dm
+++ b/code/modules/clothing/under/accessories/storage.dm
@@ -86,12 +86,12 @@
item_color = "webbing"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/accessory/storage/black_vest
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 1db6254a7ea..42c3b33e608 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -121,12 +121,12 @@
item_color = "psyche"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/color/lightblue
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 051c16a0a24..10b4c9e8d2f 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -172,14 +172,14 @@
item_state = "g_suit"
item_color = "hydroponicsf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi'
)
/obj/item/clothing/under/rank/internalaffairs
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index 26a3a5cd703..29691a74545 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -30,15 +30,15 @@
item_color = "atmosf"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/rank/engineer
@@ -83,15 +83,15 @@
item_color = "enginef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/rank/roboticist
diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
index 046a4d4b5f6..f13e36baff0 100644
--- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
@@ -8,8 +8,8 @@
var/extinguish_cooldown = 100
var/extinguishes_left = 5
icon = 'icons/obj/clothing/species/plasmaman/uniform.dmi'
- species_restricted = list("Plasmaman")
- sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi')
+ species_restricted = list(SPECIES_PLASMAMAN)
+ sprite_sheets = list(SPECIES_PLASMAMAN = 'icons/mob/clothing/species/plasmaman/uniform.dmi')
icon_state = "plasmaman"
item_state = "plasmaman"
item_color = "plasmaman"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index ce763653943..320481d24e1 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -25,13 +25,13 @@
item_state = "r_suit"
item_color = "wardenf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/rank/security
@@ -76,13 +76,13 @@
item_state = "r_suit"
item_color = "secredf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
@@ -125,16 +125,16 @@
strip_delay = 50
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/det/skirt
@@ -142,13 +142,13 @@
icon_state = "detective_skirt"
item_color = "detective_skirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
@@ -166,8 +166,8 @@
item_state = "noir_skirt"
item_color = "noirdet_skirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi'
)
/obj/item/clothing/under/det/alt_a
@@ -179,15 +179,15 @@
icon_state = "detectives_skirt_grey"
item_color = "detectives_skirt_grey"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/uniform.dmi',
- "Tajaran" = 'icons/mob/clothing/species/vulpkanin/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/uniform.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/vulpkanin/uniform.dmi'
)
/obj/item/clothing/under/det/alt_b
@@ -213,13 +213,13 @@
item_state = "r_suit"
item_color = "hosredf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/rank/head_of_security/corp
@@ -237,8 +237,8 @@
item_state = "hosalt_skirt"
item_color = "hosalt_skirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi'
)
/obj/item/clothing/under/rank/head_of_security/paradef
@@ -248,8 +248,8 @@
item_state = "hos_parade_fem"
item_color = "hos_parade_fem"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi'
)
//Jensen cosplay gear
@@ -325,15 +325,15 @@
item_color = "brig_physf"
permeability_coefficient = 0.50
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/rank/security/brigmedical
@@ -351,8 +351,8 @@
item_state = "brigmed_skirt"
item_color = "brigmed_skirt"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi'
)
//Pod Pilot
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 4dd021d69c6..a85afb13660 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -135,15 +135,15 @@
item_state = "navy_goldf"
item_color = "navy_goldf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/rank/centcom/captain
@@ -324,9 +324,9 @@
item_state = "r_suit"
item_color = "red_suitf"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi'
)
/obj/item/clothing/under/suit_jacket/navy
@@ -478,7 +478,7 @@
item_state = "shamanrags"
item_color = "shamanrags"
has_sensor = FALSE
- species_restricted = list("Unathi", "Ash Walker", "Ash Walker Shaman", "Draconid")
+ species_restricted = list(SPECIES_UNATHI, SPECIES_ASHWALKER_BASIC, SPECIES_ASHWALKER_SHAMAN, SPECIES_DRACONOID)
//dress
@@ -782,12 +782,12 @@
item_color = "rocksouniform"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Kidan" = 'icons/mob/clothing/species/kidan/uniform.dmi',
- "Wryn" = 'icons/mob/clothing/species/wryn/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/uniform.dmi',
+ SPECIES_WRYN = 'icons/mob/clothing/species/wryn/uniform.dmi'
)
/obj/item/clothing/under/assistantformal
@@ -1044,15 +1044,15 @@
item_color = "colorize_skirt"
var/colour = null
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/uniform.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/uniform.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/uniform.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/uniform.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/uniform.dmi'
)
/obj/item/clothing/under/colour/skirt/Initialize(mapload)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index f0f276b7b01..bc7882f5202 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -345,12 +345,12 @@
M.icon = 'icons/obj/custom_items.dmi'
M.icon_state = "gas_tariq"
M.sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/mask.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/mask.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/mask.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/mask.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/mask.dmi'
)
user.update_icons()
qdel(src)
@@ -623,7 +623,7 @@
desc = "A visor of alien origin, charred by fire and completely non-functioning. It's been impeccably polished, shiny!"
icon = 'icons/obj/custom_items.dmi'
icon_state = "charred_visor"
- species_restricted = list("Vox")
+ species_restricted = list(SPECIES_VOX)
/obj/item/clothing/head/bearpelt/fluff/polar //Gibson1027: Sploosh
name = "polar bear pelt hat"
@@ -946,12 +946,12 @@
icon_state = "k3_webbing"
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
actions_types = list(/datum/action/item_action/toggle)
suit_adjusted = FALSE
@@ -1213,7 +1213,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "spartan_mask"
item_state = "spartan_mask"
- species_restricted = list("Vox")
+ species_restricted = list(SPECIES_VOX)
//////////// Shoes ////////////
@@ -1620,12 +1620,12 @@
icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
- sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi')
+ sprite_sheets = list(SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi')
icon_state = "kiaoutfit"
item_state = "kiaoutfit"
item_color = "kiaoutfit"
displays_id = FALSE
- species_restricted = list("Vox")
+ species_restricted = list(SPECIES_VOX)
/obj/item/clothing/head/fluff/kiahat //FullOfSkittles: Kiachi
name = "Suspicious Witch Hat"
@@ -1643,11 +1643,11 @@
icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
- sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi')
+ sprite_sheets = list(SPECIES_VOX = 'icons/mob/clothing/species/vox/mask.dmi')
icon_state = "kiamask"
item_state = "kiamask"
item_color = "kiamask"
- species_restricted = list("Vox")
+ species_restricted = list(SPECIES_VOX)
/obj/item/clothing/gloves/ring/fluff
@@ -1674,10 +1674,10 @@
desc = "A simple black dress with a white undercoat, tied with a blue ribbon."
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
- sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi')
+ sprite_sheets = list(SPECIES_VOX = 'icons/mob/clothing/species/vox/uniform.dmi')
icon = 'icons/obj/custom_items.dmi'
icon_state = "kikeridress"
item_state = "kikeridress"
item_color = "kikeridress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
- species_restricted = list("Vox")
+ species_restricted = list(SPECIES_VOX)
diff --git a/code/modules/holiday/new_year.dm b/code/modules/holiday/new_year.dm
index c747cbe348f..f62153f7ac4 100644
--- a/code/modules/holiday/new_year.dm
+++ b/code/modules/holiday/new_year.dm
@@ -45,13 +45,13 @@
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/suit/space/new_year
@@ -72,14 +72,14 @@
heat_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | TAIL
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/gun/magic/staff/frost
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 2d35238543f..5ec49f4a778 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -14,22 +14,22 @@
armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
resistance_flags = FIRE_PROOF
- hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi", "Ash Walker", "Ash Walker Shaman", "Draconid", "Tajaran")
+ hide_tail_by_species = list(SPECIES_VOX , SPECIES_VULPKANIN , SPECIES_UNATHI, SPECIES_ASHWALKER_BASIC, SPECIES_ASHWALKER_SHAMAN, SPECIES_DRACONOID, SPECIES_TAJARAN)
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi'
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)
/obj/item/clothing/head/hooded/explorer
@@ -46,21 +46,21 @@
resistance_flags = FIRE_PROOF
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/head.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi',
- "Monkey" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Farwa" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Wolpin" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Neara" = 'icons/mob/clothing/species/monkey/head.dmi',
- "Stok" = 'icons/mob/clothing/species/monkey/head.dmi'
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/head.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/head.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/head.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/head.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/head.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/head.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/head.dmi'
)
/obj/item/clothing/suit/space/hostile_environment
@@ -127,14 +127,14 @@
heat_protection = HEAD
armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80)
sprite_sheets = list(
- "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/space/hardsuit/champion
@@ -148,13 +148,13 @@
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80)
sprite_sheets = list(
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/champion/templar
@@ -169,7 +169,7 @@
icon_state = "darktemplar-follower0"
item_color = "darktemplar-follower0"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/champion/templar
- species_restricted = list("Human", "Slime People", "Skeleton", "Nucleation", "Machine", "Plasmaman", "Diona", "Kidan", "Shadow") // only humanoids. And we don't have animal sprites.
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_NUCLEATION, SPECIES_MACNINEPERSON, SPECIES_PLASMAMAN, SPECIES_DIONA, SPECIES_KIDAN, "Shadow") // only humanoids. And we don't have animal sprites.
/obj/item/clothing/head/helmet/space/hardsuit/champion/templar/premium
name = "high dark templar's helmet"
@@ -197,19 +197,19 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi", "Ash Walker", "Ash Walker Shaman", "Draconid", "Tajaran")
+ hide_tail_by_species = list(SPECIES_VOX , SPECIES_VULPKANIN , SPECIES_UNATHI, SPECIES_ASHWALKER_BASIC, SPECIES_ASHWALKER_SHAMAN, SPECIES_DRACONOID, SPECIES_TAJARAN)
hoodtype = /obj/item/clothing/head/hooded/pathfinder
species_restricted = list("exclude", "lesser form")
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/suit.dmi',
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/suit.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
/obj/item/clothing/head/hooded/pathfinder
@@ -225,13 +225,13 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = list(
- "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/head.dmi',
- "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
- "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
- "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Ash Walker Shaman" = 'icons/mob/clothing/species/unathi/helmet.dmi',
- "Draconid" = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/drask/head.dmi',
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/head.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
)
diff --git a/code/modules/mob/living/carbon/human/interactions.dm b/code/modules/mob/living/carbon/human/interactions.dm
index 58dbcb307a3..a366fe38b36 100644
--- a/code/modules/mob/living/carbon/human/interactions.dm
+++ b/code/modules/mob/living/carbon/human/interactions.dm
@@ -60,7 +60,7 @@
dat += {"• Дать пощечину!
"}
if (P.dna.species.name == SPECIES_MOTH)
dat += {"• Дёрнуть за крылья!
"}
- if ((P.dna.species.name == SPECIES_TAJARAN) || (P.dna.species.name == "Vox")|| (P.dna.species.name == "Vulpkanin") || (P.dna.species.name == SPECIES_UNATHI))
+ if ((P.dna.species.name == SPECIES_TAJARAN) || (P.dna.species.name == SPECIES_VOX)|| (P.dna.species.name == SPECIES_VULPKANIN) || (P.dna.species.name == SPECIES_UNATHI))
dat += {"• Дёрнуть за хвост!
"}
if(P.can_inject(H))
dat += {"• Погладить.
"}
diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm
index 76b830d34c5..286fee13126 100644
--- a/code/modules/mob/living/carbon/human/npcs.dm
+++ b/code/modules/mob/living/carbon/human/npcs.dm
@@ -3,7 +3,7 @@
desc = "It looks like it was tailored for a monkey."
icon_state = "punpun"
item_color = "punpun"
- species_restricted = list("Monkey")
+ species_restricted = list(SPECIES_MONKEY)
species_exception = list(/datum/species/monkey)
/mob/living/carbon/human/lesser/monkey/punpun/Initialize(mapload)
diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm b/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm
index 67340c67aab..f707486d8c7 100644
--- a/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm
+++ b/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm
@@ -1,6 +1,6 @@
/datum/sprite_accessory/body_markings/none
name = "None"
- species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_DIONA, "Grey", SPECIES_MACNINEPERSON, SPECIES_TAJARAN, SPECIES_VULPKANIN, SPECIES_SKRELL, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_VOX, SPECIES_KIDAN)
+ species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_GREY, SPECIES_MACNINEPERSON, SPECIES_TAJARAN, SPECIES_VULPKANIN, SPECIES_SKRELL, SPECIES_SLIMEPERSON, SPECIES_SKELETON, SPECIES_VOX, SPECIES_KIDAN)
icon_state = "none"
/datum/sprite_accessory/body_markings/tiger
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index bcabb2de7f7..88763ec2aa1 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -52,7 +52,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/sonic)
cell_type = /obj/item/stock_parts/cell/super
restricted_species = list(/datum/species/vox/armalis)
- sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds.
+ sprite_sheets_inhand = list(SPECIES_VOX_ARMALIS = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds.
/obj/item/gun/energy/noisecannon/update_icon_state()
diff --git a/code/modules/ruins/syndicate_space_base.dm b/code/modules/ruins/syndicate_space_base.dm
index 35becbc2a66..0814a416564 100644
--- a/code/modules/ruins/syndicate_space_base.dm
+++ b/code/modules/ruins/syndicate_space_base.dm
@@ -34,7 +34,7 @@
allow_species_pick = TRUE
allow_gender_pick = TRUE
allow_name_pick = TRUE
- pickable_species = list("Human", "Vulpkanin", "Tajaran", "Unathi", "Skrell", "Diona", "Drask", "Vox", "Plasmaman", "Machine", "Kidan", "Grey", "Nucleation", "Slime People", "Wryn", "Nian")
+ pickable_species = list(SPECIES_HUMAN, SPECIES_VULPKANIN, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_DIONA, SPECIES_DRASK, SPECIES_VOX, SPECIES_PLASMAMAN, SPECIES_MACNINEPERSON, SPECIES_KIDAN, SPECIES_GREY, SPECIES_NUCLEATION, SPECIES_SLIMEPERSON, SPECIES_WRYN, SPECIES_MOTH)
faction = list("syndicate")
min_hours = 10
exp_type = EXP_TYPE_LIVING
@@ -61,9 +61,9 @@
if(H.dna.species)
var/race = H.dna.species.name
switch(race)
- if("Vox", "Vox Armalis")
+ if(SPECIES_VOX, SPECIES_VOX_ARMALIS)
box = /obj/item/storage/box/survival_vox
- if("Plasmaman")
+ if(SPECIES_PLASMAMAN)
box = /obj/item/storage/box/survival_plasmaman
else
box = /obj/item/storage/box/survival_syndi
@@ -75,12 +75,12 @@
var/race = H.dna.species.name
switch(race)
- if("Vox", "Vox Armalis")
+ if(SPECIES_VOX, SPECIES_VOX_ARMALIS)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(H), SLOT_HUD_WEAR_MASK)
H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(H), SLOT_HUD_LEFT_HAND)
H.internal = H.l_hand
- if("Plasmaman")
+ if(SPECIES_PLASMAMAN)
var/L = H.get_item_by_slot(SLOT_HUD_LEFT_STORE)
var/R = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE)
var/I = H.get_item_by_slot(SLOT_HUD_WEAR_ID)
@@ -109,10 +109,7 @@
name = "Syndicate Medic sleeper"
mob_name = "Syndicate Medic"
id_job = "Syndicate Medic"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Проводите медицинские опыты сомнительного содержания. Вылечивайте своих коллег, которые опять поссорились с генералом Синди, или оживляйте неудачливых космических путников, для допросов или киборгизации. Даже Синдикату нужны врачи!"
- flavour_text = "Вы — агент Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько можете и постарайтесь не высовываться. \
- Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
outfit = /datum/outfit/space_base_syndicate/medic
assignedrole = TAIPAN_MEDIC
min_hours = 10
@@ -143,10 +140,7 @@
name = "Syndicate Botanist sleeper"
mob_name = "Syndicate Botanist"
id_job = "Syndicate Botanist"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Выращивайте сомнительные растения. Помогите повару накормить экипаж, а учёным — создать опаснейшие растения! Наслаждайтесь силой природы в руках Синдиката!"
- flavour_text = "Вы — агент Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько можете и постарайтесь не высовываться. \
- Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
outfit = /datum/outfit/space_base_syndicate/botanist
assignedrole = TAIPAN_BOTANIST
min_hours = 10
@@ -170,7 +164,6 @@
name = "Syndicate Cargo Technician sleeper"
mob_name = "Syndicate Cargo Technician"
id_job = "Syndicate Cargo Technician"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Даже Синдикату нужны рабочие руки, приносите людям их посылки, заказывайте и продавайте, наслаждайтесь простой работой среди всех этих учёных. Здесь всё равно платят в разы лучше!"
flavour_text = "Вы — грузчик Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Работайте с грузами, заказывайте всё, что может потребоваться станции или вам и зарабатывайте реальные деньги, а не виртуальные очки!"
outfit = /datum/outfit/space_base_syndicate/cargotech
@@ -191,7 +184,6 @@
name = "Syndicate Chef Sleeper"
mob_name = "Syndicate Chef"
id_job = "Syndicate Chef"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Даже Синдикату нужны рабочие руки! У вас в распоряжении свой бар, кухня и ботаника. Накормите этих голодных учёных или помогите им создать последнее блюдо для ваших врагов. Здесь всё равно платят в разы лучше!"
flavour_text = "Вы — повар Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Готовьте еду и напитки экипажу и постарайтесь не высовываться!"
outfit = /datum/outfit/space_base_syndicate/chef
@@ -218,7 +210,6 @@
name = "Syndicate Atmos Engineer Sleeper"
mob_name = "Syndicate Atmos Engineer"
id_job = "Syndicate Atmos Engineer"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Там, где есть космическая станция, есть и двигатели с трубами, которым нужно своё техобслуживание. Обеспечьте станцию энергией, чините повреждения после неудачных опытов учёных и отдыхайте в баре, пока снова что-нибудь не взорвут. "
flavour_text = "Вы — инженер-атмосферник Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Запустите двигатель, убедитесь, что на станцию подаётся достаточно электричества и воздуха, а также чините отделы, которые непременно сломают."
outfit = /datum/outfit/space_base_syndicate/engineer
@@ -239,7 +230,6 @@
name = "Syndicate Comms Officer sleeper"
mob_name = "Syndicate Comms Officer"
id_job = "Syndicate Comms Officer"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Проверяйте камеры и коммуникации, руководите станцией в случае ЧП, старайтесь помогать любым агентам Синдиката на станции, при этом сохраняя свою базу в секрете от НТ. Вы являетесь единственным агентом с доступом в хранилище и оружейную."
flavour_text = "Вы — офицер Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Наблюдайте за станцией НТ, руководите вверенной вам базой и постарайтесь не высовываться. \
Синдикат ясно дал вам понять, что не стоит подводить их доверие. Не разочаруйте их!"
@@ -266,7 +256,6 @@
name = "Syndicate Research Director sleeper"
mob_name = "Syndicate Research Director"
id_job = "Syndicate Research Director"
- important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
description = "Следите за тем, чтобы учёные занимались исследованиями и не подорвали всю станцию, предоставьте Синдикату результаты своих исследований через карго и помните: смерть НаноТрейзен!"
flavour_text = "Вы Директор Исследований Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько сможете и постарайтесь не высовываться. \
Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
diff --git a/code/modules/ruins/ussp_base.dm b/code/modules/ruins/ussp_base.dm
index c1ff55bb4cb..8a986f54817 100644
--- a/code/modules/ruins/ussp_base.dm
+++ b/code/modules/ruins/ussp_base.dm
@@ -1,29 +1,27 @@
/obj/effect/mob_spawn/human/ussp
icon = 'icons/obj/lavaland/spawners.dmi'
icon_state = "cryostasis_sleeper"
-
-/obj/effect/mob_spawn/human/ussp/general
- name = "Генерал СССП"
- mob_name = "Генерал СССП"
roundstart = FALSE
death = FALSE
- id_job = "Soviet General"
- icon = 'icons/obj/lavaland/spawners.dmi'
- icon_state = "cryostasis_sleeper"
- important_info = "Вы - не антагонист! Ваша задача управлять остатками экипажа и не дать станции окончательно развалиться."
- description = "Вы - командующий станцией СССП! Руководите оставшимся членами экипажа, и по возможности восстановите станцию. Защищайте имущество СССП и научные наработки, возможно ЦК СССП ещё вспомнит про вас. Соблюдайте субординацию."
- flavour_text = "Вы являетесь единственным выжившим командующим на повреждённой станции СССП. В вашей памяти мелькают спутанные воспоминания того, что случилось до того как Вы уснули... Отдавайте приказы выжившему персоналу и не дайте ему умереть. Вашей первостепенной задачей будет попытка восстановить целостность станции и завершить научные эксперементы, после - можете попытаться связаться с ЦК СССП и доложить о произошедшем."
- outfit = /datum/outfit/ussp_general
- faction = list("ussp")
allow_prefs_prompt = TRUE
allow_species_pick = TRUE
allow_gender_pick = TRUE
allow_name_pick = TRUE
- pickable_species = list("Human")
+ faction = list("ussp")
+ pickable_species = list(SPECIES_HUMAN)
mob_species = /datum/species/human
min_hours = 10
exp_type = EXP_TYPE_LIVING
+/obj/effect/mob_spawn/human/ussp/general
+ name = "Генерал СССП"
+ mob_name = "Генерал СССП"
+ id_job = "Soviet General"
+ important_info = "Вы - не антагонист! Ваша задача управлять остатками экипажа и не дать станции окончательно развалиться."
+ description = "Вы - командующий станцией СССП! Руководите оставшимся членами экипажа, и по возможности восстановите станцию. Защищайте имущество СССП и научные наработки, возможно ЦК СССП ещё вспомнит про вас. Соблюдайте субординацию."
+ flavour_text = "Вы являетесь единственным выжившим командующим на повреждённой станции СССП. В вашей памяти мелькают спутанные воспоминания того, что случилось до того как Вы уснули... Отдавайте приказы выжившему персоналу и не дайте ему умереть. Вашей первостепенной задачей будет попытка восстановить целостность станции и завершить научные эксперементы, после - можете попытаться связаться с ЦК СССП и доложить о произошедшем."
+ outfit = /datum/outfit/ussp_general
+
/obj/item/card/id/ussp_general
name = "USSP general ID card"
desc = "An ID straight from USSP."
@@ -38,7 +36,7 @@
if(H.dna.species)
var/race = H.dna.species.name
switch(race)
- if("Human")
+ if(SPECIES_HUMAN)
box = /obj/item/storage/box/soviet
/datum/outfit/ussp_general
@@ -70,24 +68,11 @@
/obj/effect/mob_spawn/human/ussp/engineer
name = "Инженер СССП"
mob_name = "Инженер СССП"
- roundstart = FALSE
- death = FALSE
id_job = "Soviet Engineer"
- icon = 'icons/obj/lavaland/spawners.dmi'
- icon_state = "cryostasis_sleeper"
important_info = "Вы - не антагонист! Ваша задача восстановить полученные повреждения и нормализовать функционирование станции."
description = "Вы - инженер на станции СССП! Постарайтесь удержать станцию на плаву!"
flavour_text = "Вы один из немногих выживших на повреждённой станции СССП. Вы лишь отрывками вспоминаете, что пошло не так перед тем как Вы уснули. Вашей задачей будет исполнение приказов командующего и поддержание работоспособности станции. Соблюдайте субординацию."
outfit = /datum/outfit/ussp_engineer
- faction = list("ussp")
- allow_prefs_prompt = TRUE
- allow_species_pick = TRUE
- allow_gender_pick = TRUE
- allow_name_pick = TRUE
- pickable_species = list("Human")
- mob_species = /datum/species/human
- min_hours = 10
- exp_type = EXP_TYPE_LIVING
/obj/item/card/id/ussp_engineer
name = "USSP engineer ID card"
@@ -103,7 +88,7 @@
if(H.dna.species)
var/race = H.dna.species.name
switch(race)
- if("Human")
+ if(SPECIES_HUMAN)
box = /obj/item/storage/box/soviet
/datum/outfit/ussp_engineer
@@ -134,24 +119,11 @@
/obj/effect/mob_spawn/human/ussp/security
name = "Сотрудник безопасности СССП"
mob_name = "Сотрудник безопасности СССП"
- roundstart = FALSE
- death = FALSE
id_job = "Soviet Soldier"
- icon = 'icons/obj/lavaland/spawners.dmi'
- icon_state = "cryostasis_sleeper"
important_info = "Вы - не антагонист! Ваша задача защищать территорию СССП от враждебных форм жизни и интервентов."
description = "Вы - сотрудник безопасности на станции СССП! Ваша работа, помимо поддержания порядка на станции, выполнение поручений старших по званию. Готовьте пищу, собирайте разбросанные ресурсы, а главное соблюдайте субординацию."
flavour_text = "Ранее вы следили за порядком на этой станции... Ранее. Вы смутно припоминаете, как вместе с товарищем напились до отключки и упали в криосон. Выполняйте приказы и не дайте станции окончательно развалиться."
outfit = /datum/outfit/ussp_security
- faction = list("ussp")
- allow_prefs_prompt = TRUE
- allow_species_pick = TRUE
- allow_gender_pick = TRUE
- allow_name_pick = TRUE
- pickable_species = list("Human")
- mob_species = /datum/species/human
- min_hours = 10
- exp_type = EXP_TYPE_LIVING
/obj/item/card/id/ussp_security
name = "USSP security ID card"
@@ -167,7 +139,7 @@
if(H.dna.species)
var/race = H.dna.species.name
switch(race)
- if("Human")
+ if(SPECIES_HUMAN)
box = /obj/item/storage/box/soviet
/datum/outfit/ussp_security
@@ -199,30 +171,17 @@
/obj/effect/mob_spawn/human/ussp/scientist
name = "Учёный СССП"
mob_name = "Учёный СССП"
- roundstart = FALSE
- death = FALSE
id_job = "Soviet Scientist"
- icon = 'icons/obj/lavaland/spawners.dmi'
- icon_state = "cryostasis_sleeper"
important_info = "Вы - не антагонист! Ваша задача восстановить потерянные научные данные и следить за здоровьем экипажа."
description = "Вы - Учёный на станции СССП! Постарайтесь выжить! А также попытайтесь восстановить потерянные научные данные и проследите, чтобы остатки экипажа не умерли. Соблюдайте субординацию."
flavour_text = "Вы смутно что то припоминаете. Ваша задача попытаться выжить и не дать умереть остальным."
outfit = /datum/outfit/ussp_scientist
- faction = list("ussp")
- allow_prefs_prompt = TRUE
- allow_species_pick = TRUE
- allow_gender_pick = TRUE
- allow_name_pick = TRUE
- pickable_species = list("Human")
- mob_species = /datum/species/human
- min_hours = 10
- exp_type = EXP_TYPE_LIVING
/datum/outfit/ussp_scientist/pre_equip(mob/living/carbon/human/H)
if(H.dna.species)
var/race = H.dna.species.name
switch(race)
- if("Human")
+ if(SPECIES_HUMAN)
box = /obj/item/storage/box/soviet
/datum/outfit/ussp_scientist