diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 59ea8992889..46fd640b9fc 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -976,14 +976,12 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(pda, slot_belt) equip_special_id(M,list(access_maint_tunnels), "Spy", /obj/item/weapon/card/id/syndicate, "syndie") - if("vox") - if(istype(M, /mob/living/carbon/human/voxarmalis)) // have to do this, they cannot wear normal vox gear! - M.equip_to_slot_or_del(new /obj/item/clothing/under/vox_grey(M), slot_w_uniform) + if(M.species.name == "Vox Armalis") // have to do this, they cannot wear normal vox gear! + M.equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/carapace(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes (M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate/vox(M), slot_shoes) @@ -1474,15 +1472,15 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that return error_cache.showTo(usr) - + /client/proc/jump_to_ruin() set category = "Debug" set name = "Jump to Ruin" set desc = "Displays a list of all placed ruins to teleport to." - + if(!check_rights(R_DEBUG)) return - + var/list/names = list() for(var/i in ruin_landmarks) var/obj/effect/landmark/ruin/ruin_landmark = i @@ -1505,21 +1503,21 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(istype(landmark)) var/datum/map_template/ruin/template = landmark.ruin_template admin_forcemove(usr, get_turf(landmark)) - + to_chat(usr, "[template.name]") to_chat(usr, "[template.description]") - + log_admin("[key_name(usr)] jumped to ruin [ruinname]") if(!isobserver(usr)) message_admins("[key_name_admin(usr)] jumped to ruin [ruinname]", 1) - + feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - + /client/proc/toggle_medal_disable() set category = "Debug" set name = "Toggle Medal Disable" set desc = "Toggles the safety lock on trying to contact the medal hub." - + if(!check_rights(R_DEBUG)) return diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 3a6aedf1439..95fba0a1a48 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -31,6 +31,7 @@ //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") sprite_sheets = list( "Unathi" = 'icons/mob/species/unathi/helmet.dmi' @@ -44,6 +45,7 @@ item_color = "unathi_helm_cheap" /obj/item/clothing/suit/space/unathi + icon = 'icons/obj/clothing/species/unathi/suits.dmi' species_restricted = list("Unathi") sprite_sheets = list( "Unathi" = 'icons/mob/species/unathi/suit.dmi' @@ -77,6 +79,7 @@ armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) 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") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', @@ -86,6 +89,7 @@ /obj/item/clothing/head/helmet/space/vox armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) flags = HEADCOVERSEYES|STOPSPRESSUREDMAGE + icon = 'icons/obj/clothing/species/vox/hats.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', @@ -143,6 +147,7 @@ /obj/item/clothing/under/vox has_sensor = 0 + icon = 'icons/obj/clothing/species/vox/uniforms.dmi' species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/uniform.dmi' @@ -156,12 +161,17 @@ item_state = "vox-casual-1" body_parts_covered = LEGS -/obj/item/clothing/under/vox/vox_robes +/obj/item/clothing/under/vox/vox_robes //This will be invisible on Armalis for lack of a proper sprite. They wear a carapace suit anyway, and this is more just to let them use IDs and such. name = "alien robes" desc = "Weird and flowing!" icon_state = "vox-casual-2" item_color = "vox-casual-2" 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' + ) /obj/item/clothing/gloves/color/yellow/vox desc = "These bizarre gauntlets seem to be fitted for... bird claws?" @@ -171,17 +181,19 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 item_color = "gloves-vox" + 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', ) -/obj/item/clothing/shoes/magboots/vox +/obj/item/clothing/shoes/magboots/vox desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor." name = "vox magclaws" item_state = "boots-vox" icon_state = "boots-vox" + icon = 'icons/obj/clothing/species/vox/shoes.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/feet.dmi', @@ -229,6 +241,7 @@ name = "Vox EVA Suit" icon_state = "voxspace" item_state = "voxspace" + icon = 'icons/obj/clothing/species/vox/suits.dmi' species_restricted = list("Vox", "Vox Armalis") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', @@ -239,6 +252,7 @@ name = "Vox EVA Suit" icon_state = "voxspace" item_state = "voxspace" + icon = 'icons/obj/clothing/species/vox/hats.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/head.dmi', diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index f935772b225..edc715f0b27 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -10,6 +10,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT + icon = 'icons/obj/clothing/species/plasmaman/suits.dmi' species_restricted = list("Plasmaman") sprite_sheets = list( "Plasmaman" = 'icons/mob/species/plasmaman/suit.dmi' @@ -41,6 +42,7 @@ name = "plasmaman helmet" desc = "A special containment helmet designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies." flags = STOPSPRESSUREDMAGE + icon = 'icons/obj/clothing/species/plasmaman/hats.dmi' species_restricted = list("Plasmaman") sprite_sheets = list( "Plasmaman" = 'icons/mob/species/plasmaman/helmet.dmi' diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 0da9b38a2f4..27724fa0749 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -10,8 +10,9 @@ vision_restriction = 1 offline_vision_restriction = 2 - chest_type = /obj/item/clothing/suit/space/new_rig + chest_type = /obj/item/clothing/suit/space/new_rig/unathi helm_type = /obj/item/clothing/head/helmet/space/new_rig/unathi + glove_type = /obj/item/clothing/gloves/rig/unathi boot_type = /obj/item/clothing/shoes/magboots/rig/unathi /obj/item/weapon/rig/unathi/fancy @@ -23,12 +24,22 @@ vision_restriction = 0 /obj/item/clothing/head/helmet/space/new_rig/unathi + icon = 'icons/obj/clothing/species/unathi/hats.dmi' species_restricted = list("Unathi") /obj/item/clothing/suit/space/new_rig/unathi + icon = 'icons/obj/clothing/species/unathi/suits.dmi' species_restricted = list("Unathi") +/obj/item/clothing/gloves/rig/unathi + icon = 'icons/obj/clothing/species/unathi/gloves.dmi' + species_restricted = list("Unathi") + sprite_sheets = list( + "Unathi" = 'icons/mob/species/unathi/gloves.dmi' + ) + /obj/item/clothing/shoes/magboots/rig/unathi + icon = 'icons/obj/clothing/species/unathi/shoes.dmi' species_restricted = list("Unathi") sprite_sheets = list( "Unathi" = 'icons/mob/species/unathi/feet.dmi' diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 486d7d7c34e..c7128ae8bf1 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -565,35 +565,43 @@ item_state = "bane" item_color = "bane" -/obj/item/clothing/under/vox_grey +/obj/item/clothing/under/vox + name = "Ripped Jumpsuit" + desc = "A jumpsuit that looks like it's been shredded by some talons. Who could wear this now?" + icon = 'icons/obj/clothing/species/vox/uniforms.dmi' + icon_state = "vgrey" + item_state = "vgrey" + item_color = "vgrey" + +/obj/item/clothing/under/vox/grey name = "Grey Vox Jumpsuit" desc = "An assistant's jumpsuit ripped to better fit a vox." icon_state = "vgrey" item_state = "vgrey" item_color = "vgrey" -/obj/item/clothing/under/vox_robotics +/obj/item/clothing/under/vox/robotics name = "Vox Robotics Jumpsuit" desc = "A roboticist's jumpsuit ripped to better fit a vox." icon_state = "vrobotics" item_state = "vrobotics" item_color = "vrobotics" -/obj/item/clothing/under/vox_toxins +/obj/item/clothing/under/vox/toxins name = "Vox Toxins Jumpsuit" desc = "A Toxin Researcher's jumpsuit ripped to better fit a vox." icon_state = "vtoxinswhite" item_state = "vtoxinswhite" item_color = "vtoxinswhite" -/obj/item/clothing/under/vox_atmos +/obj/item/clothing/under/vox/atmos name = "Vox Atmos Jumpsuit" desc = "An Atmos Tech's jumpsuit ripped to better fit a vox." icon_state = "vatmos" item_state = "vatmos" item_color = "vatmos" -/obj/item/clothing/under/vox_engi +/obj/item/clothing/under/vox/engi name = "Vox Engineer Jumpsuit" desc = "An Engineer's jumpsuit ripped to better fit a vox." icon_state = "vengine" @@ -601,7 +609,7 @@ item_color = "vengine" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10) -/obj/item/clothing/under/vox_sec +/obj/item/clothing/under/vox/sec name = "Vox Security Jumpsuit" desc = "A Security officer's jumpsuit ripped to better fit a vox." icon_state = "vred" @@ -609,7 +617,7 @@ item_color = "vred" armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/under/vox_chem +/obj/item/clothing/under/vox/chem name = "Vox Chemist Jumpsuit" desc = "A Chemist's jumpsuit ripped to better fit a vox." icon_state = "vchem" diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index d4f0b3ac57a..a5a14094fd6 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/species/armalis/suit.dmi b/icons/mob/species/armalis/suit.dmi index cecf7e414b4..ceed59b7819 100644 Binary files a/icons/mob/species/armalis/suit.dmi and b/icons/mob/species/armalis/suit.dmi differ diff --git a/icons/mob/species/unathi/gloves.dmi b/icons/mob/species/unathi/gloves.dmi new file mode 100644 index 00000000000..808736e4cfd Binary files /dev/null and b/icons/mob/species/unathi/gloves.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 48d253c16cb..82ce8437b28 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 41dc7afbb0e..bd1ef93cb93 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 1fbcc049e6b..fa191ef7e21 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi new file mode 100644 index 00000000000..19bb100595c Binary files /dev/null and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/suits.dmi b/icons/obj/clothing/species/plasmaman/suits.dmi new file mode 100644 index 00000000000..b9695f0ff27 Binary files /dev/null and b/icons/obj/clothing/species/plasmaman/suits.dmi differ diff --git a/icons/obj/clothing/species/unathi/gloves.dmi b/icons/obj/clothing/species/unathi/gloves.dmi new file mode 100644 index 00000000000..26ce9ca8ac5 Binary files /dev/null and b/icons/obj/clothing/species/unathi/gloves.dmi differ diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi index f55259fadf4..6023ff01ee5 100644 Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ diff --git a/icons/obj/clothing/species/unathi/shoes.dmi b/icons/obj/clothing/species/unathi/shoes.dmi new file mode 100644 index 00000000000..78f74765a76 Binary files /dev/null and b/icons/obj/clothing/species/unathi/shoes.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi index f0be55a5291..d5875e74191 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ diff --git a/icons/obj/clothing/species/vox/gloves.dmi b/icons/obj/clothing/species/vox/gloves.dmi new file mode 100644 index 00000000000..eeca4b63f30 Binary files /dev/null and b/icons/obj/clothing/species/vox/gloves.dmi differ diff --git a/icons/obj/clothing/species/vox/hats.dmi b/icons/obj/clothing/species/vox/hats.dmi index 2680137ff0a..714e98e1878 100644 Binary files a/icons/obj/clothing/species/vox/hats.dmi and b/icons/obj/clothing/species/vox/hats.dmi differ diff --git a/icons/obj/clothing/species/vox/shoes.dmi b/icons/obj/clothing/species/vox/shoes.dmi new file mode 100644 index 00000000000..a1dde383ff7 Binary files /dev/null and b/icons/obj/clothing/species/vox/shoes.dmi differ diff --git a/icons/obj/clothing/species/vox/suits.dmi b/icons/obj/clothing/species/vox/suits.dmi index 3d23ba1e396..1d0873b9661 100644 Binary files a/icons/obj/clothing/species/vox/suits.dmi and b/icons/obj/clothing/species/vox/suits.dmi differ diff --git a/icons/obj/clothing/species/vox/uniforms.dmi b/icons/obj/clothing/species/vox/uniforms.dmi new file mode 100644 index 00000000000..4bf1b92308d Binary files /dev/null and b/icons/obj/clothing/species/vox/uniforms.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index be68443c2bf..a0fd3b51210 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 40f4c4c2b07..1a099e23d23 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ