Skip to content

Commit

Permalink
refractor: Species defines in masses (ss220-space#4771)
Browse files Browse the repository at this point in the history
* hos

* species

* get the d
  • Loading branch information
Den109G authored Apr 2, 2024
1 parent 624c973 commit 601a302
Show file tree
Hide file tree
Showing 69 changed files with 2,024 additions and 2,076 deletions.
26 changes: 13 additions & 13 deletions code/game/gamemodes/clockwork/clockwork_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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
Expand Down
46 changes: 23 additions & 23 deletions code/game/gamemodes/cult/cult_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/steal_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions code/game/objects/items/weapons/cigs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)


Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/defib.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
22 changes: 11 additions & 11 deletions code/game/objects/items/weapons/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/tanks/tank_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/structures/bedsheet_bin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)


Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/mirror.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading

0 comments on commit 601a302

Please sign in to comment.