cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors

Browse Source
This commit is contained in:
E-MonaRhg
2021-09-06 19:32:39 +02:00
parent 61a7eadb22 dd17035c1f
commit a99fc879df
299 changed files with 4627 additions and 4762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/chameleon.dm
+12 -12
View File
@@ -232,7 +232,7 @@
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/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -267,9 +267,9 @@
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/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -367,7 +367,7 @@
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/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -406,12 +406,12 @@
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
var/obj/item/voice_changer/voice_changer
@@ -484,7 +484,7 @@
name = "backpack"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/back.dmi'
"Vox" = 'icons/mob/clothing/species/vox/back.dmi'
)
var/datum/action/item_action/chameleon/change/chameleon_action
code/modules/clothing/clothing.dm
+11 -11
View File
@@ -134,8 +134,8 @@
slot_flags = SLOT_EARS
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/ears.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/ears.dmi'
"Vox" = 'icons/mob/clothing/species/vox/ears.dmi',
"Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi'
) //We read you loud and skree-er.
/obj/item/clothing/ears/attack_hand(mob/user)
@@ -262,8 +262,8 @@ BLIND // can't see anything
put_on_delay = 40
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/gloves.dmi',
"Drask" = 'icons/mob/species/drask/gloves.dmi'
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi'
)
// Called just before an attack_hand(), in mob/UnarmedAttack()
@@ -447,8 +447,8 @@ BLIND // can't see anything
slowdown = SHOES_SLOWDOWN
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/shoes.dmi',
"Drask" = 'icons/mob/species/drask/shoes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/shoes.dmi'
)
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
@@ -617,7 +617,7 @@ BLIND // can't see anything
hide_tail_by_species = null
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Under clothing
@@ -633,9 +633,9 @@ BLIND // can't see anything
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi',
"Drask" = 'icons/mob/species/drask/uniform.dmi',
"Grey" = 'icons/mob/species/grey/uniform.dmi'
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
"Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
"Grey" = 'icons/mob/clothing/species/grey/uniform.dmi'
)
var/has_sensor = TRUE//For the crew computer 2 = unable to change mode
@@ -728,7 +728,7 @@ BLIND // can't see anything
if(!usr.incapacitated())
if(copytext(item_color,-2) != "_d")
basecolor = item_color
if((basecolor + "_d_s") in icon_states('icons/mob/uniform.dmi'))
if((basecolor + "_d_s") in icon_states('icons/mob/clothing/uniform.dmi'))
item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
usr.update_inv_w_uniform()
else
code/modules/clothing/glasses/glasses.dm
+56 -50
View File
@@ -71,10 +71,10 @@
prescription_upgradable = 1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/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',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/meson/night
@@ -121,9 +121,9 @@
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/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
actions_types = list(/datum/action/item_action/toggle_research_scanner)
@@ -147,7 +147,7 @@
item_state = "glasses"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
/obj/item/clothing/glasses/night
@@ -160,9 +160,9 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/eyepatch
@@ -172,9 +172,9 @@
item_state = "eyepatch"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/monocle
@@ -185,9 +185,9 @@
prescription_upgradable = 1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/material
@@ -199,9 +199,9 @@
vision_flags = SEE_OBJS
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/material/cyber
@@ -229,9 +229,9 @@
prescription = 1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/regular/hipster
@@ -247,9 +247,9 @@
item_state = "3d"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/gglasses
@@ -259,9 +259,9 @@
item_state = "gglasses"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
prescription_upgradable = 1
@@ -276,9 +276,9 @@
prescription_upgradable = 1
dog_fashion = /datum/dog_fashion/head
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/sunglasses_fake
@@ -290,9 +290,9 @@
flash_protect = 0
tint = 0
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/sunglasses/noir
@@ -344,9 +344,9 @@
tint = 1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/sunglasses/lasers
@@ -370,9 +370,9 @@
tint = 2
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/welding/attack_self(mob/user)
@@ -395,6 +395,12 @@
tint = 3 //to make them blind
prescription_upgradable = 0
/obj/item/clothing/glasses/sunglasses/blindfold/fake
name = "tattered blindfold"
desc = "A see-through blindfold perfect for cheating at games like pin the stunbaton on the clown."
flash_protect = 0
tint = 0
/obj/item/clothing/glasses/sunglasses/prescription
prescription = 1
@@ -414,9 +420,9 @@
flash_protect = -1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/thermal/emp_act(severity)
@@ -463,9 +469,9 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
resistance_flags = LAVA_PROOF | FIRE_PROOF
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -493,9 +499,9 @@
tint = 0
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/tajblind/eng
code/modules/clothing/glasses/hud.dm
+25 -25
View File
@@ -36,9 +36,9 @@
examine_extensions = list(EXAMINE_HUD_MEDICAL)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/hud/health/night
@@ -67,9 +67,9 @@
HUDType = DATA_HUD_DIAGNOSTIC
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/hud/diagnostic/night
@@ -100,9 +100,9 @@
examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
@@ -137,9 +137,9 @@
prescription_upgradable = 1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/hud/security/sunglasses/prescription
@@ -152,9 +152,9 @@
HUDType = DATA_HUD_HYDROPONIC
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/glasses/hud/hydroponic/night
@@ -177,7 +177,7 @@
up = 0
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
/obj/item/clothing/glasses/hud/security/tajblind/attack_self()
@@ -193,9 +193,9 @@
up = 0
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi'
)
/obj/item/clothing/glasses/hud/health/tajblind/attack_self()
@@ -209,9 +209,9 @@
HUDType = DATA_HUD_SECURITY_BASIC
examine_extensions = list(EXAMINE_HUD_SKILLS)
sprite_sheets = list(
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Vox" = 'icons/mob/species/vox/eyes.dmi'
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
/obj/item/clothing/glasses/hud/skills/sunglasses
@@ -223,7 +223,7 @@
tint = 1
prescription_upgradable = TRUE
sprite_sheets = list(
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi',
"Vox" = 'icons/mob/species/vox/eyes.dmi'
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
code/modules/clothing/head/beanie.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_state = "beanie" //Default white
item_color = "beanie"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
)
/obj/item/clothing/head/beanie/black
code/modules/clothing/head/collectable.dm
+6 -6
View File
@@ -66,10 +66,10 @@
item_state = "welding"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.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'
)
/obj/item/clothing/head/collectable/slime
@@ -116,7 +116,7 @@
desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
dog_fashion = /datum/dog_fashion/head
dog_fashion = /datum/dog_fashion/head/hardhat
/obj/item/clothing/head/collectable/HoS
name = "collectable HoS hat"
@@ -142,5 +142,5 @@
item_state = "swat"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi'
)
code/modules/clothing/head/hardhat.dm
+4 -3
View File
@@ -13,7 +13,7 @@
resistance_flags = FIRE_PROOF
dog_fashion = /datum/dog_fashion/head/hardhat
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/hardhat/attack_self(mob/living/user)
@@ -67,6 +67,7 @@
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = /datum/dog_fashion/head/hardhat/red
/obj/item/clothing/head/hardhat/white
name = "white hard hat"
@@ -78,7 +79,7 @@
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = /datum/dog_fashion/head/hardhat
dog_fashion = /datum/dog_fashion/head/hardhat/white
/obj/item/clothing/head/hardhat/dblue
name = "blue hard hat"
@@ -100,5 +101,5 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = null
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
code/modules/clothing/head/helmet.dm
+4 -4
View File
@@ -15,9 +15,9 @@
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/helmet
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Drask" = 'icons/mob/species/drask/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/attack_self(mob/user)
@@ -224,7 +224,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi'
)
/obj/item/clothing/head/helmet/riot/knight/blue
code/modules/clothing/head/jobs.dm
+2 -2
View File
@@ -82,7 +82,7 @@
dog_fashion = /datum/dog_fashion/head/detective
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//Mime
@@ -176,7 +176,7 @@
icon_state = "surgcap_blue"
flags = BLOCKHEADHAIR
sprite_sheets = list(
"Drask" = 'icons/mob/species/drask/head.dmi'
"Drask" = 'icons/mob/clothing/species/drask/head.dmi'
)
/obj/item/clothing/head/surgery/purple
code/modules/clothing/head/misc.dm
+10 -10
View File
@@ -81,7 +81,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
@@ -95,7 +95,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/snowman
@@ -108,7 +108,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/that
@@ -273,7 +273,7 @@
flags = BLOCKHAIR
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/corgi
@@ -313,7 +313,7 @@
icon_state = "fedora"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/fedora/whitefedora
@@ -321,7 +321,7 @@
icon_state = "wfedora"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/fedora/brownfedora
@@ -329,7 +329,7 @@
icon_state = "bfedora"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/stalhelm //Why do these exist
@@ -436,7 +436,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
actions_types = list(/datum/action/item_action/caw)
@@ -469,7 +469,7 @@
flags_inv = HIDEFACE|HIDEEARS
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/papersack/smiley
@@ -480,7 +480,7 @@
flags_inv = HIDEFACE|HIDEEARS
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/crown
code/modules/clothing/head/misc_special.dm
+16 -16
View File
@@ -28,11 +28,11 @@
resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Unathi" = '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'
)
/obj/item/clothing/head/welding/attack_self(mob/user)
@@ -141,7 +141,7 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = /datum/dog_fashion/head/ushanka
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
@@ -166,10 +166,10 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
dog_fashion = null
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -202,10 +202,10 @@
if(!istype(user)) return
var/obj/item/organ/external/head/head_organ = user.get_organ("head")
mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kitty")
mob.Blend(head_organ.hair_colour, ICON_ADD)
var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kittyinner")
mob.Blend(earbit, ICON_OVERLAY)
icon_override = mob
@@ -224,10 +224,10 @@
/obj/item/clothing/head/kitty/mouse/update_icon(mob/living/carbon/human/user)
if(!istype(user)) return
var/obj/item/organ/external/head/head_organ = user.get_organ("head")
mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mousey")
mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mousey")
mob.Blend(head_organ.hair_colour, ICON_ADD)
var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mouseyinner")
var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mouseyinner")
mob.Blend(earbit, ICON_OVERLAY)
icon_override = mob
@@ -242,7 +242,7 @@
species_disguise = "High-tech robot"
dog_fashion = /datum/dog_fashion/head/cardborg
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/head.dmi'
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
@@ -268,8 +268,8 @@
item_state = "head_mirror"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Drask" = 'icons/mob/species/drask/head.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
code/modules/clothing/head/soft_caps.dm
+1 -1
View File
@@ -8,7 +8,7 @@
actions_types = list(/datum/action/item_action/flip_cap)
dog_fashion = /datum/dog_fashion/head/cargo_tech
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/soft/dropped()
code/modules/clothing/masks/boxing.dm
+12 -12
View File
@@ -10,12 +10,12 @@
adjusted_flags = SLOT_HEAD
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
@@ -31,12 +31,12 @@
w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/luchador/tecnicos
code/modules/clothing/masks/breath.dm
+8 -8
View File
@@ -11,14 +11,14 @@
actions_types = list(/datum/action/item_action/adjust)
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi',
"Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi'
"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',
"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'
)
/obj/item/clothing/mask/breath/attack_self(mob/user)
code/modules/clothing/masks/gasmask.dm
+13 -13
View File
@@ -11,13 +11,13 @@
permeability_coefficient = 0.01
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi'
)
// **** Welding gas mask ****
@@ -50,12 +50,12 @@
resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
/obj/item/clothing/mask/gas/explorer/marines
code/modules/clothing/masks/miscellaneous.dm
+32 -32
View File
@@ -13,7 +13,7 @@
var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi'
)
// Clumsy folks can't take the mask off themselves.
@@ -91,11 +91,11 @@
flags = DROPDEL
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user)
@@ -119,12 +119,12 @@
materials = list(MAT_METAL=500, MAT_GLASS=50)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/muzzle/safety/shock
@@ -216,12 +216,12 @@
actions_types = list(/datum/action/item_action/adjust)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
@@ -237,12 +237,12 @@
dog_fashion = /datum/dog_fashion/head/not_ian
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/fakemoustache/attack_self(mob/user)
@@ -318,8 +318,8 @@
var/originalname = ""
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
/obj/item/clothing/mask/horsehead/equipped(mob/user, slot)
@@ -427,12 +427,12 @@
icon_state = "bandbotany"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi',
"Grey" = 'icons/mob/species/grey/mask.dmi',
"Drask" = 'icons/mob/species/drask/mask.dmi'
"Vox" = 'icons/mob/clothing/species/vox/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',
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi',
"Drask" = 'icons/mob/clothing/species/drask/mask.dmi'
)
actions_types = list(/datum/action/item_action/adjust)
code/modules/clothing/patreon/glasses.dm
+1 -1
View File
@@ -9,7 +9,7 @@
item_state = "gar"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi'
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi'
)
code/modules/clothing/patreon/hats.dm
+4 -4
View File
@@ -11,7 +11,7 @@
flags = BLOCKHAIR
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//gold top hat and recolours
@@ -22,7 +22,7 @@
item_state = "goldtophat"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
@@ -47,7 +47,7 @@
flags = BLOCKHAIR
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
//black sombrero
@@ -59,5 +59,5 @@
flags = BLOCKHAIR
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
code/modules/clothing/spacesuits/alien.dm
+13 -13
View File
@@ -34,7 +34,7 @@
icon = 'icons/obj/clothing/species/unathi/hats.dmi'
species_restricted = list("Unathi")
sprite_sheets = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi'
"Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/unathi/helmet_cheap
@@ -48,7 +48,7 @@
icon = 'icons/obj/clothing/species/unathi/suits.dmi'
species_restricted = list("Unathi")
sprite_sheets = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi'
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
)
/obj/item/clothing/suit/space/unathi/rig_cheap
@@ -82,8 +82,8 @@
icon = 'icons/obj/clothing/species/vox/suits.dmi'
species_restricted = list("Vox", "Vox Armalis")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi',
)
/obj/item/clothing/head/helmet/space/vox
@@ -93,8 +93,8 @@
icon = 'icons/obj/clothing/species/vox/hats.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/head.dmi',
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Vox Armalis" = 'icons/mob/clothing/species/armalis/head.dmi',
)
/obj/item/clothing/head/helmet/space/vox/pressure
@@ -151,7 +151,7 @@
icon = 'icons/obj/clothing/species/vox/uniforms.dmi'
species_restricted = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi'
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/obj/item/clothing/under/vox/vox_casual
@@ -170,8 +170,8 @@
item_state = "vox-casual-2"
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
"Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi'
)
/obj/item/clothing/gloves/color/yellow/vox
@@ -185,8 +185,8 @@
icon = 'icons/obj/clothing/species/vox/gloves.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/gloves.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi',
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Vox Armalis" = 'icons/mob/clothing/species/armalis/gloves.dmi',
)
/obj/item/clothing/shoes/magboots/vox
@@ -197,8 +197,8 @@
icon = 'icons/obj/clothing/species/vox/shoes.dmi'
species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/feet.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/feet.dmi'
"Vox" = 'icons/mob/clothing/species/vox/feet.dmi',
"Vox Armalis" = 'icons/mob/clothing/species/armalis/feet.dmi'
)
/obj/item/clothing/shoes/magboots/vox/attack_self(mob/user)
code/modules/clothing/spacesuits/ert.dm
+13 -13
View File
@@ -12,8 +12,8 @@
strip_delay = 130
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi'
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize()
@@ -59,8 +59,8 @@
strip_delay = 130
resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Drask" = 'icons/mob/species/drask/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Commander
@@ -206,11 +206,11 @@
resistance_flags = FIRE_PROOF
has_camera = FALSE
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/space/hardsuit/ert/paranormal
@@ -221,10 +221,10 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
hide_tail_by_species = list("Unathi, Tajaran, Vox, Vulpkanin")
code/modules/clothing/spacesuits/hardsuit.dm
+13 -13
View File
@@ -23,13 +23,13 @@
//Species-specific stuff.
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Drask" = 'icons/mob/species/drask/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Unathi" = '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'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
@@ -157,12 +157,12 @@
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi'
"Unathi" = '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'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
code/modules/clothing/spacesuits/miscellaneous.dm
+32 -32
View File
@@ -10,8 +10,8 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot)
@@ -34,7 +34,7 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Deathsquad space suit, not hardsuits because no flashlight!
@@ -77,7 +77,7 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/helmet/space/deathsquad/beret
@@ -117,8 +117,8 @@
icon_state = "santahat"
sprite_sheets = list(
"Grey" = 'icons/mob/species/Grey/head.dmi',
"Drask" = 'icons/mob/species/Drask/helmet.dmi'
"Grey" = 'icons/mob/clothing/species/Grey/head.dmi',
"Drask" = 'icons/mob/clothing/species/Drask/helmet.dmi'
)
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_cover = HEADCOVERSEYES
@@ -177,13 +177,13 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Drask" = 'icons/mob/species/drask/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"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',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi'
@@ -198,12 +198,12 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi',
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"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',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi'
@@ -218,10 +218,10 @@
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
sprite_sheets_obj = list(
"Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
@@ -240,11 +240,11 @@
flash_protect = 0
species_restricted = list("exclude", "Wryn")
sprite_sheets = list(
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi'
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
"Unathi" = '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'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
@@ -260,7 +260,7 @@
item_state = "spacemimehelmet"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi')
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
sprite_sheets_obj = null
/obj/item/clothing/suit/space/eva/mime
@@ -271,7 +271,7 @@
item_state = "spacemime_items"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi')
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets_obj = null
/obj/item/clothing/head/helmet/space/eva/clown
@@ -282,7 +282,7 @@
item_state = "clownhelmet"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi')
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
sprite_sheets_obj = null
/obj/item/clothing/suit/space/eva/clown
@@ -293,5 +293,5 @@
item_state = "spaceclown_items"
species_restricted = list("exclude","Wryn")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi')
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets_obj = null
code/modules/clothing/spacesuits/plasmamen.dm
+1 -1
View File
@@ -22,7 +22,7 @@
visor_flags_inv = HIDEEYES|HIDEFACE
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
species_restricted = list("Plasmaman")
sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/helmet.dmi')
sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi')
/obj/item/clothing/head/helmet/space/plasmaman/New()
..()
code/modules/clothing/spacesuits/syndi.dm
+9 -9
View File
@@ -7,11 +7,11 @@
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi')
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
/obj/item/clothing/suit/space/syndicate
@@ -23,10 +23,10 @@
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" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
sprite_sheets = list(
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi')
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
//Green syndicate space suit
code/modules/clothing/spacesuits/void.dm
+9 -9
View File
@@ -7,11 +7,11 @@
item_state = "void"
flags_inv = HIDEMASK|HIDEEARS
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi')
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
/obj/item/clothing/suit/space/nasavoid
name = "NASA Void Suit"
@@ -20,10 +20,10 @@
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/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi')
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
//Colors!!!
/obj/item/clothing/head/helmet/space/nasavoid/green
code/modules/clothing/suits/alien.dm
+1 -1
View File
@@ -1,7 +1,7 @@
//Unathi clothing.
/obj/item/clothing/suit/unathi
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/unathi/robe
code/modules/clothing/suits/armor.dm
+2 -2
View File
@@ -11,7 +11,7 @@
resistance_flags = NONE
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
)
w_class = WEIGHT_CLASS_NORMAL
@@ -41,7 +41,7 @@
name = "security armor"
desc = "An armored vest that protects against some damage. This one has a clip for a holobadge."
sprite_sheets = list(
"Grey" = 'icons/mob/species/grey/suit.dmi'
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
icon_state = "armor"
item_state = "armor"
code/modules/clothing/suits/bio.dm
+12 -12
View File
@@ -11,11 +11,11 @@
resistance_flags = ACID_PROOF
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/head.dmi',
"Tajaran" = 'icons/mob/species/tajaran/head.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Unathi" = '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'
)
/obj/item/clothing/suit/bio_suit
@@ -36,10 +36,10 @@
put_on_delay = 70
resistance_flags = ACID_PROOF
sprite_sheets = list(
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
@@ -103,8 +103,8 @@
put_on_delay = 20
sprite_sheets = list(
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
hide_tail_by_species = list("Unathi, Tajaran, Vulpkanin")
code/modules/clothing/suits/jobs.dm
+16 -16
View File
@@ -12,7 +12,7 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Brig Physician
@@ -27,7 +27,7 @@
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Botanist
@@ -41,7 +41,7 @@
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(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Captain
@@ -55,7 +55,7 @@
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(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/captunic/capjacket
@@ -67,7 +67,7 @@
flags_inv = HIDEJUMPSUIT
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/mantle/armor/captain
@@ -88,7 +88,7 @@
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(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Chaplain
@@ -103,7 +103,7 @@
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(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Chaplain
@@ -143,7 +143,7 @@
allowed = list (/obj/item/kitchen/knife)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Chef
@@ -185,7 +185,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Forensics
@@ -221,7 +221,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Engineering
@@ -235,13 +235,13 @@
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Lawyer
/obj/item/clothing/suit/storage/lawyer
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/storage/lawyer/blackjacket
@@ -313,7 +313,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/storage/ntrep
@@ -328,7 +328,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Medical
@@ -346,7 +346,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Mime
@@ -358,7 +358,7 @@
blood_overlay_type = "armor" //it's the less thing that I can put here
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/suspenders/nodrop
code/modules/clothing/suits/labcoat.dm
+2 -2
View File
@@ -11,8 +11,8 @@
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(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Grey" = 'icons/mob/species/grey/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
code/modules/clothing/suits/miscellaneous.dm
+20 -20
View File
@@ -21,7 +21,7 @@
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/redtag
@@ -36,7 +36,7 @@
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/*
@@ -49,7 +49,7 @@
item_state = "pirate_old"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/pirate_black
@@ -59,7 +59,7 @@
item_state = "pirate"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/hgpirate
@@ -122,7 +122,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/apron/overalls
@@ -269,7 +269,7 @@
item_state = "classicponcho"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/poncho/green
@@ -373,7 +373,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
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("Vox" = 'icons/mob/species/vox/suit.dmi')
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
@@ -385,7 +385,7 @@
flags = BLOCKHAIR
flags_inv = HIDEEARS
sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi')
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')
/obj/item/clothing/suit/hooded/wintercoat/captain
name = "captain's winter coat"
@@ -502,7 +502,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/hood
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/hooded/hood
@@ -515,7 +515,7 @@
flags_inv = HIDEEARS
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
/obj/item/clothing/head/hooded/hood/blue
@@ -576,7 +576,7 @@
item_state = "ianshirt"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
@@ -626,7 +626,7 @@
item_state = "brtrenchcoat"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/blacktrenchcoat
@@ -636,7 +636,7 @@
item_state = "bltrenchcoat"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//trackjackets
@@ -653,7 +653,7 @@
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/tracksuit/green
@@ -786,7 +786,7 @@
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/jacket/pilot
@@ -826,9 +826,9 @@
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/suit/jacket/leather/overcoat
@@ -848,7 +848,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/soldiercoat
@@ -861,7 +861,7 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/toggle/owlwings
code/modules/clothing/suits/utility.dm
+8 -8
View File
@@ -36,7 +36,7 @@
item_state = "firefighter"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/fire/heavy
@@ -55,7 +55,7 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/*
@@ -79,8 +79,8 @@
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/suit/bomb_suit
@@ -105,7 +105,7 @@
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/head/bomb_hood/security
@@ -133,8 +133,8 @@
resistance_flags = NONE
flags_2 = RAD_PROTECT_CONTENTS_2
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi'
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
)
/obj/item/clothing/suit/radiation
@@ -156,5 +156,5 @@
resistance_flags = NONE
flags_2 = RAD_PROTECT_CONTENTS_2
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
code/modules/clothing/suits/wiz_robe.dm
+6 -6
View File
@@ -38,9 +38,9 @@
item_state = "wizhatmime"
dog_fashion = null
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi',
"Drask" = 'icons/mob/species/drask/head.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/head/wizard/fake
@@ -113,9 +113,9 @@
icon_state = "wizzmime"
item_state = "wizzmime"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/suit/wizrobe/marisa
code/modules/clothing/under/accessories/accessory.dm
+13 -13
View File
@@ -124,7 +124,7 @@
item_color = "waistcoat"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/stethoscope
@@ -526,7 +526,7 @@
item_color = "cowboyshirt"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/short_sleeved
@@ -537,7 +537,7 @@
item_color = "cowboyshirt_s"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white
@@ -548,7 +548,7 @@
item_color = "cowboyshirt_white"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white/short_sleeved
@@ -559,7 +559,7 @@
item_color = "cowboyshirt_whites"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink
@@ -570,7 +570,7 @@
item_color = "cowboyshirt_pink"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved
@@ -581,7 +581,7 @@
item_color = "cowboyshirt_pinks"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy
@@ -592,7 +592,7 @@
item_color = "cowboyshirt_navy"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
@@ -603,7 +603,7 @@
item_color = "cowboyshirt_navys"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red
@@ -614,7 +614,7 @@
item_color = "cowboyshirt_red"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red/short_sleeved
@@ -625,9 +625,9 @@
item_color = "cowboyshirt_reds"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi',
"Grey" = 'icons/mob/species/grey/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'
)
/obj/item/clothing/accessory/corset
code/modules/clothing/under/accessories/storage.dm
+1 -1
View File
@@ -80,7 +80,7 @@
item_color = "webbing"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/accessory/storage/black_vest
code/modules/clothing/under/color.dm
+1 -1
View File
@@ -109,7 +109,7 @@
item_color = "psyche"
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi'
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/obj/item/clothing/under/color/lightblue
code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
+1 -1
View File
@@ -9,7 +9,7 @@
var/extinguishes_left = 5
icon = 'icons/obj/clothing/species/plasmaman/uniform.dmi'
species_restricted = list("Plasmaman")
sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/uniform.dmi')
sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi')
icon_state = "plasmaman"
item_state = "plasmaman"
item_color = "plasmaman"
code/modules/clothing/under/jobs/security.dm
+1 -1
View File
@@ -85,7 +85,7 @@
strip_delay = 50
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/uniform.dmi'
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi'
)
/*