[MIRROR] clothing _vr dmi cleanup: undersuits [IDB IGNORE] (#11506)
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com> Co-authored-by: C.L. <killer65311@gmail.com>
@@ -1095,7 +1095,8 @@
|
|||||||
blood_sprite_state = "uniformblood"
|
blood_sprite_state = "uniformblood"
|
||||||
|
|
||||||
var/has_sensor = 1 //For the crew computer 2 = unable to change mode
|
var/has_sensor = 1 //For the crew computer 2 = unable to change mode
|
||||||
var/sensor_mode = 0
|
var/sensor_mode = 3
|
||||||
|
var/sensorpref = 5
|
||||||
/*
|
/*
|
||||||
1 = Report living/dead
|
1 = Report living/dead
|
||||||
2 = Report detailed damages
|
2 = Report detailed damages
|
||||||
@@ -1108,7 +1109,8 @@
|
|||||||
var/rolled_sleeves_icon_override = TRUE
|
var/rolled_sleeves_icon_override = TRUE
|
||||||
sprite_sheets = list(
|
sprite_sheets = list(
|
||||||
SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
|
SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
|
||||||
SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi'
|
SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi',
|
||||||
|
SPECIES_WEREBEAST = 'icons/inventory/uniform/mob_werebeast.dmi'
|
||||||
)
|
)
|
||||||
|
|
||||||
//convenience var for defining the icon state for the overlay used when the clothing is worn.
|
//convenience var for defining the icon state for the overlay used when the clothing is worn.
|
||||||
@@ -1165,6 +1167,21 @@
|
|||||||
if(rolled_sleeves == -1)
|
if(rolled_sleeves == -1)
|
||||||
verbs -= /obj/item/clothing/under/verb/rollsleeves
|
verbs -= /obj/item/clothing/under/verb/rollsleeves
|
||||||
|
|
||||||
|
if(!ishuman(loc))
|
||||||
|
return
|
||||||
|
|
||||||
|
var/mob/living/carbon/human/H = loc
|
||||||
|
sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1)
|
||||||
|
switch(sensorpref)
|
||||||
|
if(1) sensor_mode = 0 //Sensors off
|
||||||
|
if(2) sensor_mode = 1 //Sensors on binary
|
||||||
|
if(3) sensor_mode = 2 //Sensors display vitals
|
||||||
|
if(4) sensor_mode = 3 //Sensors display vitals and enables tracking
|
||||||
|
if(5) sensor_mode = pick(0,1,2,3) //Select a random setting
|
||||||
|
else
|
||||||
|
sensor_mode = pick(0,1,2,3)
|
||||||
|
log_debug("Invalid switch for suit sensors, defaulting to random. [sensorpref] chosen")
|
||||||
|
|
||||||
/obj/item/clothing/under/proc/update_rolldown_status()
|
/obj/item/clothing/under/proc/update_rolldown_status()
|
||||||
var/mob/living/carbon/human/H
|
var/mob/living/carbon/human/H
|
||||||
if(ishuman(src.loc))
|
if(ishuman(src.loc))
|
||||||
|
|||||||
@@ -56,31 +56,6 @@
|
|||||||
src.visible_message(span_red("\The [src] moves a little!"))
|
src.visible_message(span_red("\The [src] moves a little!"))
|
||||||
to_chat(user, span_red("You throw yourself against the inside of \the [src]!"))
|
to_chat(user, span_red("You throw yourself against the inside of \the [src]!"))
|
||||||
|
|
||||||
/obj/item/clothing/under
|
|
||||||
sensor_mode = 3
|
|
||||||
var/sensorpref = 5
|
|
||||||
sprite_sheets = list(
|
|
||||||
SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
|
|
||||||
SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi',
|
|
||||||
SPECIES_WEREBEAST = 'icons/inventory/uniform/mob_vr_werebeast.dmi')
|
|
||||||
|
|
||||||
/obj/item/clothing/under/Initialize(mapload)
|
|
||||||
. = ..()
|
|
||||||
if(!ishuman(loc))
|
|
||||||
return
|
|
||||||
|
|
||||||
var/mob/living/carbon/human/H = loc
|
|
||||||
sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1)
|
|
||||||
switch(sensorpref)
|
|
||||||
if(1) sensor_mode = 0 //Sensors off
|
|
||||||
if(2) sensor_mode = 1 //Sensors on binary
|
|
||||||
if(3) sensor_mode = 2 //Sensors display vitals
|
|
||||||
if(4) sensor_mode = 3 //Sensors display vitals and enables tracking
|
|
||||||
if(5) sensor_mode = pick(0,1,2,3) //Select a random setting
|
|
||||||
else
|
|
||||||
sensor_mode = pick(0,1,2,3)
|
|
||||||
log_debug("Invalid switch for suit sensors, defaulting to random. [sensorpref] chosen")
|
|
||||||
|
|
||||||
/obj/item/clothing/head
|
/obj/item/clothing/head
|
||||||
sprite_sheets = list(
|
sprite_sheets = list(
|
||||||
SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
|
SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
/obj/item/clothing/under/pants/altevian
|
/obj/item/clothing/under/pants/altevian
|
||||||
name = "Altevian Hegemony Civilian Pants"
|
name = "Altevian Hegemony Civilian Pants"
|
||||||
desc = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort."
|
desc = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "altevian-pants-civ"
|
icon_state = "altevian-pants-civ"
|
||||||
worn_state = "altevian-pants-civ"
|
worn_state = "altevian-pants-civ"
|
||||||
gender = PLURAL
|
gender = PLURAL
|
||||||
@@ -52,12 +50,9 @@
|
|||||||
|
|
||||||
/obj/item/clothing/under/altevian
|
/obj/item/clothing/under/altevian
|
||||||
name = "Altevian Duty Jumpsuit"
|
name = "Altevian Duty Jumpsuit"
|
||||||
desc = "A uniform commonly seen worn by altevians. The material on this uniform is made of a durable thread that can handle the stress of most forms of labor."
|
desc = "A uniform commonly seen worn by altevians. The material of this uniform is made of a durable thread that can handle the stress of most forms of labor."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "altevian-specialist"
|
icon_state = "altevian-specialist"
|
||||||
worn_state = "altevian-specialist"
|
worn_state = "altevian-specialist"
|
||||||
species_restricted = list(SPECIES_ALTEVIAN)
|
|
||||||
|
|
||||||
/obj/item/clothing/under/altevian/sci
|
/obj/item/clothing/under/altevian/sci
|
||||||
name = "Altevian Science Duty Jumpsuit"
|
name = "Altevian Science Duty Jumpsuit"
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
/obj/item/clothing/under/undersuit // undersuits! intended for wearing under hardsuits or for being too lazy to not wear anything other than it
|
/obj/item/clothing/under/undersuit // undersuits! intended for wearing under hardsuits or for being too lazy to not wear anything other than it
|
||||||
name = "undersuit"
|
name = "undersuit"
|
||||||
desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. Breathable, yet sleek."
|
desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. Breathable, yet sleek."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
icon_state = "bodysuit"
|
icon_state = "bodysuit"
|
||||||
item_state = "bodysuit"
|
item_state = "bodysuit"
|
||||||
rolled_sleeves = -1
|
rolled_sleeves = -1
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
/obj/item/clothing/under/imperial
|
/obj/item/clothing/under/imperial
|
||||||
desc = "imperial military jumpsuit"
|
desc = "imperial military jumpsuit"
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "crimson"
|
icon_state = "crimson"
|
||||||
item_state = "crimson"
|
item_state = "crimson"
|
||||||
|
|||||||
@@ -56,7 +56,6 @@
|
|||||||
rolled_sleeves = -1
|
rolled_sleeves = -1
|
||||||
worn_state = "securitymodern"
|
worn_state = "securitymodern"
|
||||||
icon = 'icons/inventory/uniform/item.dmi'
|
icon = 'icons/inventory/uniform/item.dmi'
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
|
|
||||||
/obj/item/clothing/under/rank/security/turtleneck
|
/obj/item/clothing/under/rank/security/turtleneck
|
||||||
name = "security turtleneck"
|
name = "security turtleneck"
|
||||||
|
|||||||
@@ -18,8 +18,6 @@
|
|||||||
|
|
||||||
/obj/item/clothing/under/hyperfiber
|
/obj/item/clothing/under/hyperfiber
|
||||||
name = "HYPER jumpsuit"
|
name = "HYPER jumpsuit"
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "hyper"
|
icon_state = "hyper"
|
||||||
item_icons = list(
|
item_icons = list(
|
||||||
slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
|
slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
|
||||||
@@ -263,8 +261,6 @@
|
|||||||
/obj/item/clothing/under/qipao
|
/obj/item/clothing/under/qipao
|
||||||
name = "black qipao"
|
name = "black qipao"
|
||||||
desc = "A type of feminine body-hugging dress with distinctive Chinese features of Manchu origin."
|
desc = "A type of feminine body-hugging dress with distinctive Chinese features of Manchu origin."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "qipao"
|
icon_state = "qipao"
|
||||||
item_state = "qipao"
|
item_state = "qipao"
|
||||||
body_parts_covered = CHEST
|
body_parts_covered = CHEST
|
||||||
@@ -286,9 +282,6 @@
|
|||||||
/obj/item/clothing/under/pizzaguy
|
/obj/item/clothing/under/pizzaguy
|
||||||
name = "pizza delivery uniform"
|
name = "pizza delivery uniform"
|
||||||
desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin."
|
desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
rolled_down_icon_override = FALSE
|
rolled_down_icon_override = FALSE
|
||||||
icon_state = "pizzadelivery"
|
icon_state = "pizzadelivery"
|
||||||
item_state = "pizzadelivery"
|
item_state = "pizzadelivery"
|
||||||
@@ -299,9 +292,6 @@
|
|||||||
/obj/item/clothing/under/rank/talon/basic
|
/obj/item/clothing/under/rank/talon/basic
|
||||||
name = "Talon jumpsuit"
|
name = "Talon jumpsuit"
|
||||||
desc = "A basic jumpsuit that bares the ITV Talon logo on the breast."
|
desc = "A basic jumpsuit that bares the ITV Talon logo on the breast."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "talon_basic"
|
icon_state = "talon_basic"
|
||||||
item_state = "talon_basic"
|
item_state = "talon_basic"
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
@@ -311,9 +301,6 @@
|
|||||||
/obj/item/clothing/under/rank/talon/proper
|
/obj/item/clothing/under/rank/talon/proper
|
||||||
name = "Talon proper jumpsuit"
|
name = "Talon proper jumpsuit"
|
||||||
desc = "A neat and proper uniform for a proper private ship."
|
desc = "A neat and proper uniform for a proper private ship."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "talon_jumpsuit"
|
icon_state = "talon_jumpsuit"
|
||||||
item_state = "talon_jumpsuit"
|
item_state = "talon_jumpsuit"
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
@@ -323,9 +310,6 @@
|
|||||||
/obj/item/clothing/under/rank/talon/security
|
/obj/item/clothing/under/rank/talon/security
|
||||||
name = "Talon security jumpsuit"
|
name = "Talon security jumpsuit"
|
||||||
desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit that bares security markings."
|
desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit that bares security markings."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "talon_security"
|
icon_state = "talon_security"
|
||||||
item_state = "talon_security"
|
item_state = "talon_security"
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
@@ -335,9 +319,6 @@
|
|||||||
/obj/item/clothing/under/rank/talon/pilot
|
/obj/item/clothing/under/rank/talon/pilot
|
||||||
name = "Talon pilot jumpsuit"
|
name = "Talon pilot jumpsuit"
|
||||||
desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit. Made from cushioned fabric to handle intense flight."
|
desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit. Made from cushioned fabric to handle intense flight."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "talon_pilot"
|
icon_state = "talon_pilot"
|
||||||
item_state = "talon_pilot"
|
item_state = "talon_pilot"
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
@@ -347,9 +328,6 @@
|
|||||||
/obj/item/clothing/under/rank/talon/command
|
/obj/item/clothing/under/rank/talon/command
|
||||||
name = "Talon command jumpsuit"
|
name = "Talon command jumpsuit"
|
||||||
desc = "A commanding jumpsuit fit for a commanding officer."
|
desc = "A commanding jumpsuit fit for a commanding officer."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "talon_captain"
|
icon_state = "talon_captain"
|
||||||
item_state = "talon_captain"
|
item_state = "talon_captain"
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
@@ -360,13 +338,11 @@
|
|||||||
/obj/item/clothing/under/excelsior
|
/obj/item/clothing/under/excelsior
|
||||||
name = "\improper Excelsior uniform"
|
name = "\improper Excelsior uniform"
|
||||||
desc = "A uniform from a particular spaceship: Excelsior."
|
desc = "A uniform from a particular spaceship: Excelsior."
|
||||||
|
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "excelsior_white"
|
icon_state = "excelsior_white"
|
||||||
|
|
||||||
/obj/item/clothing/under/excelsior/mixed
|
/obj/item/clothing/under/excelsior/mixed
|
||||||
icon_state = "excelsior_mixed"
|
icon_state = "excelsior_mixed"
|
||||||
|
|
||||||
/obj/item/clothing/under/excelsior/orange
|
/obj/item/clothing/under/excelsior/orange
|
||||||
icon_state = "excelsior_orange"
|
icon_state = "excelsior_orange"
|
||||||
|
|
||||||
@@ -374,21 +350,17 @@
|
|||||||
/obj/item/clothing/under/summerdress
|
/obj/item/clothing/under/summerdress
|
||||||
name = "summer dress"
|
name = "summer dress"
|
||||||
desc = "A nice summer dress."
|
desc = "A nice summer dress."
|
||||||
|
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "summerdress"
|
icon_state = "summerdress"
|
||||||
|
|
||||||
/obj/item/clothing/under/summerdress/red
|
/obj/item/clothing/under/summerdress/red
|
||||||
icon_state = "summerdress3"
|
icon_state = "summerdress3"
|
||||||
|
|
||||||
/obj/item/clothing/under/summerdress/blue
|
/obj/item/clothing/under/summerdress/blue
|
||||||
icon_state = "summerdress2"
|
icon_state = "summerdress2"
|
||||||
|
|
||||||
/obj/item/clothing/under/dress/dress_cap/femformal // formal in the loosest sense. because it's going to be taken off. or something. funnier in my head i swear
|
/obj/item/clothing/under/dress/dress_cap/femformal // formal in the loosest sense. because it's going to be taken off. or something. funnier in my head i swear
|
||||||
name = "site manager's feminine formalwear"
|
name = "site manager's feminine formalwear"
|
||||||
desc = "Essentially a skimpy...dress? Leotard? Whatever it is, it has the coloration and markings suitable for a site manager or rough equivalent."
|
desc = "Essentially a skimpy...dress? Leotard? Whatever it is, it has the coloration and markings suitable for a site manager or rough equivalent."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "lewdcap"
|
icon_state = "lewdcap"
|
||||||
item_state = "lewdcap"
|
item_state = "lewdcap"
|
||||||
rolled_sleeves = -1
|
rolled_sleeves = -1
|
||||||
@@ -399,8 +371,6 @@
|
|||||||
/obj/item/clothing/under/color/fjumpsuit //They won't see this so we can make it whatever we want.
|
/obj/item/clothing/under/color/fjumpsuit //They won't see this so we can make it whatever we want.
|
||||||
name = "blue feminine jumpsuit"
|
name = "blue feminine jumpsuit"
|
||||||
desc = "It's very smart and in a ladies size!"
|
desc = "It's very smart and in a ladies size!"
|
||||||
icon = 'icons/inventory/uniform/item.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "blue" // In hand
|
icon_state = "blue" // In hand
|
||||||
worn_state = "bluef" // On mob
|
worn_state = "bluef" // On mob
|
||||||
|
|
||||||
@@ -408,66 +378,82 @@
|
|||||||
name = "blue feminine jumpsuit"
|
name = "blue feminine jumpsuit"
|
||||||
icon_state = "blue"
|
icon_state = "blue"
|
||||||
worn_state = "bluef"
|
worn_state = "bluef"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/aquaf
|
/obj/item/clothing/under/color/fjumpsuit/aquaf
|
||||||
name = "aqua feminine jumpsuit"
|
name = "aqua feminine jumpsuit"
|
||||||
icon_state = "aqua"
|
icon_state = "aqua"
|
||||||
worn_state = "aquaf"
|
worn_state = "aquaf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/brownf
|
/obj/item/clothing/under/color/fjumpsuit/brownf
|
||||||
name = "brown feminine jumpsuit"
|
name = "brown feminine jumpsuit"
|
||||||
icon_state = "brown"
|
icon_state = "brown"
|
||||||
worn_state = "brownf"
|
worn_state = "brownf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/darkbluef
|
/obj/item/clothing/under/color/fjumpsuit/darkbluef
|
||||||
name = "dark blue feminine jumpsuit"
|
name = "dark blue feminine jumpsuit"
|
||||||
icon_state = "darkblue"
|
icon_state = "darkblue"
|
||||||
worn_state = "darkbluef"
|
worn_state = "darkbluef"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/darkredf
|
/obj/item/clothing/under/color/fjumpsuit/darkredf
|
||||||
name = "dark red feminine jumpsuit"
|
name = "dark red feminine jumpsuit"
|
||||||
icon_state = "darkred"
|
icon_state = "darkred"
|
||||||
worn_state = "darkredf"
|
worn_state = "darkredf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/greenf
|
/obj/item/clothing/under/color/fjumpsuit/greenf
|
||||||
name = "green feminine jumpsuit"
|
name = "green feminine jumpsuit"
|
||||||
icon_state = "green"
|
icon_state = "green"
|
||||||
worn_state = "greenf"
|
worn_state = "greenf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/lightbluef
|
/obj/item/clothing/under/color/fjumpsuit/lightbluef
|
||||||
name = "light blue feminine jumpsuit"
|
name = "light blue feminine jumpsuit"
|
||||||
icon_state = "lightblue"
|
icon_state = "lightblue"
|
||||||
worn_state = "lightbluef"
|
worn_state = "lightbluef"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/lightbrownf
|
/obj/item/clothing/under/color/fjumpsuit/lightbrownf
|
||||||
name = "light brown feminine jumpsuit"
|
name = "light brown feminine jumpsuit"
|
||||||
icon_state = "lightbrown"
|
icon_state = "lightbrown"
|
||||||
worn_state = "lightbrownf"
|
worn_state = "lightbrownf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/lightgreenf
|
/obj/item/clothing/under/color/fjumpsuit/lightgreenf
|
||||||
name = "light green feminine jumpsuit"
|
name = "light green feminine jumpsuit"
|
||||||
icon_state = "lightgreen"
|
icon_state = "lightgreen"
|
||||||
worn_state = "lightgreenf"
|
worn_state = "lightgreenf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/lightpurplef
|
/obj/item/clothing/under/color/fjumpsuit/lightpurplef
|
||||||
name = "light purple feminine jumpsuit"
|
name = "light purple feminine jumpsuit"
|
||||||
icon_state = "lightpurple"
|
icon_state = "lightpurple"
|
||||||
worn_state = "lightpurplef"
|
worn_state = "lightpurplef"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/lightredf
|
/obj/item/clothing/under/color/fjumpsuit/lightredf
|
||||||
name = "light red feminine jumpsuit"
|
name = "light red feminine jumpsuit"
|
||||||
icon_state = "lightred"
|
icon_state = "lightred"
|
||||||
worn_state = "lightredf"
|
worn_state = "lightredf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/maroonf
|
/obj/item/clothing/under/color/fjumpsuit/maroonf
|
||||||
name = "maroon feminine jumpsuit"
|
name = "maroon feminine jumpsuit"
|
||||||
icon_state = "maroon"
|
icon_state = "maroon"
|
||||||
worn_state = "maroonf"
|
worn_state = "maroonf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/pinkf
|
/obj/item/clothing/under/color/fjumpsuit/pinkf
|
||||||
name = "pink feminine jumpsuit"
|
name = "pink feminine jumpsuit"
|
||||||
icon_state = "pink"
|
icon_state = "pink"
|
||||||
worn_state = "pinkf"
|
worn_state = "pinkf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/purplef
|
/obj/item/clothing/under/color/fjumpsuit/purplef
|
||||||
name = "purple feminine jumpsuit"
|
name = "purple feminine jumpsuit"
|
||||||
icon_state = "purple"
|
icon_state = "purple"
|
||||||
worn_state = "purplef"
|
worn_state = "purplef"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/redf
|
/obj/item/clothing/under/color/fjumpsuit/redf
|
||||||
name = "red feminine jumpsuit"
|
name = "red feminine jumpsuit"
|
||||||
icon_state = "red"
|
icon_state = "red"
|
||||||
worn_state = "redf"
|
worn_state = "redf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/yellowf
|
/obj/item/clothing/under/color/fjumpsuit/yellowf
|
||||||
name = "yellow feminine jumpsuit"
|
name = "yellow feminine jumpsuit"
|
||||||
icon_state = "yellow"
|
icon_state = "yellow"
|
||||||
worn_state = "yellowf"
|
worn_state = "yellowf"
|
||||||
|
|
||||||
/obj/item/clothing/under/color/fjumpsuit/yellowgreenf
|
/obj/item/clothing/under/color/fjumpsuit/yellowgreenf
|
||||||
name = "yellow-green feminine jumpsuit"
|
name = "yellow-green feminine jumpsuit"
|
||||||
icon_state = "yellowgreen"
|
icon_state = "yellowgreen"
|
||||||
@@ -476,8 +462,6 @@
|
|||||||
/obj/item/clothing/under/qipao_colorable
|
/obj/item/clothing/under/qipao_colorable
|
||||||
name = "qipao"
|
name = "qipao"
|
||||||
desc = "A traditional Chinese women's garment, typically made from silk."
|
desc = "A traditional Chinese women's garment, typically made from silk."
|
||||||
icon = 'icons/inventory/uniform/item.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "qipao3"
|
icon_state = "qipao3"
|
||||||
item_state = "qipao3"
|
item_state = "qipao3"
|
||||||
worn_state = "qipao3"
|
worn_state = "qipao3"
|
||||||
@@ -486,8 +470,6 @@
|
|||||||
/obj/item/clothing/under/qipao2_colorable
|
/obj/item/clothing/under/qipao2_colorable
|
||||||
name = "slim qipao"
|
name = "slim qipao"
|
||||||
desc = "A traditional Chinese women's garment, typically made from silk. This one is fairly slim."
|
desc = "A traditional Chinese women's garment, typically made from silk. This one is fairly slim."
|
||||||
icon = 'icons/inventory/uniform/item.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "qipao2"
|
icon_state = "qipao2"
|
||||||
item_state = "qipao2"
|
item_state = "qipao2"
|
||||||
worn_state = "qipao2"
|
worn_state = "qipao2"
|
||||||
@@ -496,8 +478,6 @@
|
|||||||
/obj/item/clothing/under/dress/antediluvian
|
/obj/item/clothing/under/dress/antediluvian
|
||||||
name = "antediluvian corset"
|
name = "antediluvian corset"
|
||||||
desc = "A regal black and gold tight corset with silky sleeves. A sheer bodystocking accompanies it."
|
desc = "A regal black and gold tight corset with silky sleeves. A sheer bodystocking accompanies it."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "antediluvian"
|
icon_state = "antediluvian"
|
||||||
item_state = "antediluvian"
|
item_state = "antediluvian"
|
||||||
worn_state = "antediluvian"
|
worn_state = "antediluvian"
|
||||||
@@ -511,8 +491,6 @@
|
|||||||
/obj/item/clothing/under/skirt/colorable
|
/obj/item/clothing/under/skirt/colorable
|
||||||
name = "skirt"
|
name = "skirt"
|
||||||
desc = "A rather plain looking skirt."
|
desc = "A rather plain looking skirt."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "skirt_casual"
|
icon_state = "skirt_casual"
|
||||||
item_state = "skirt_casual"
|
item_state = "skirt_casual"
|
||||||
worn_state = "skirt_casual"
|
worn_state = "skirt_casual"
|
||||||
@@ -612,29 +590,21 @@
|
|||||||
/obj/item/clothing/under/stripeddungarees
|
/obj/item/clothing/under/stripeddungarees
|
||||||
name = "striped dungarees"
|
name = "striped dungarees"
|
||||||
desc = "A colourful set of striped dungarees, pretty funny lookin'."
|
desc = "A colourful set of striped dungarees, pretty funny lookin'."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "striped_clown_uniform"
|
icon_state = "striped_clown_uniform"
|
||||||
|
|
||||||
/obj/item/clothing/under/dress/cdress_fire
|
/obj/item/clothing/under/dress/cdress_fire
|
||||||
name = "flame dress"
|
name = "flame dress"
|
||||||
desc = "A small black dress with a flames print on it. Perfect for recoloring!"
|
desc = "A small black dress with a flames print on it. Perfect for recoloring!"
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "cflame_dress"
|
icon_state = "cflame_dress"
|
||||||
|
|
||||||
/obj/item/clothing/under/dress/cbridesmaid
|
/obj/item/clothing/under/dress/cbridesmaid
|
||||||
name = "fancy dress"
|
name = "fancy dress"
|
||||||
desc = "A cute, flirty dress. Good for weddings and fancy parties, or if you just want to look fashionable. Perfect for recoloring!"
|
desc = "A cute, flirty dress. Good for weddings and fancy parties, or if you just want to look fashionable. Perfect for recoloring!"
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "cbridesmaid"
|
icon_state = "cbridesmaid"
|
||||||
|
|
||||||
/obj/item/clothing/under/dress/cswoopdress
|
/obj/item/clothing/under/dress/cswoopdress
|
||||||
name = "swoop dress"
|
name = "swoop dress"
|
||||||
desc = "A fancy gown for those who like to show leg. Perfect for recoloring!"
|
desc = "A fancy gown for those who like to show leg. Perfect for recoloring!"
|
||||||
icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "cswoopdress"
|
icon_state = "cswoopdress"
|
||||||
|
|
||||||
//Replikant uniforms
|
//Replikant uniforms
|
||||||
@@ -643,8 +613,6 @@
|
|||||||
name = "generic"
|
name = "generic"
|
||||||
desc = "generic"
|
desc = "generic"
|
||||||
description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
|
description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "arar"
|
icon_state = "arar"
|
||||||
item_state = "arar"
|
item_state = "arar"
|
||||||
rolled_sleeves = -1
|
rolled_sleeves = -1
|
||||||
@@ -658,7 +626,6 @@
|
|||||||
icon_state = "arar"
|
icon_state = "arar"
|
||||||
item_state = "arar"
|
item_state = "arar"
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/under/replika/lstr
|
/obj/item/clothing/under/replika/lstr
|
||||||
name = "land-survey replikant bodysuit"
|
name = "land-survey replikant bodysuit"
|
||||||
desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
|
desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
|
||||||
@@ -713,8 +680,6 @@
|
|||||||
/obj/item/clothing/under/gestalt
|
/obj/item/clothing/under/gestalt
|
||||||
name = "generic"
|
name = "generic"
|
||||||
desc = "generic"
|
desc = "generic"
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "gestalt_skirt"
|
icon_state = "gestalt_skirt"
|
||||||
item_state = "gestalt_skirt"
|
item_state = "gestalt_skirt"
|
||||||
rolled_sleeves = -1
|
rolled_sleeves = -1
|
||||||
@@ -727,21 +692,18 @@
|
|||||||
icon_state = "gestalt_skirt"
|
icon_state = "gestalt_skirt"
|
||||||
item_state = "gestalt_skirt"
|
item_state = "gestalt_skirt"
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/under/gestalt/sleek
|
/obj/item/clothing/under/gestalt/sleek
|
||||||
name = "sleek crew uniform"
|
name = "sleek crew uniform"
|
||||||
desc = "A tight-fitting black uniform with striking crimson trim."
|
desc = "A tight-fitting black uniform with striking crimson trim."
|
||||||
icon_state = "gestalt"
|
icon_state = "gestalt"
|
||||||
item_state = "gestalt"
|
item_state = "gestalt"
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/under/gestalt/sleek_fem
|
/obj/item/clothing/under/gestalt/sleek_fem
|
||||||
name = "sleek female crew uniform"
|
name = "sleek female crew uniform"
|
||||||
desc = "A tight-fitting black uniform with striking crimson trim."
|
desc = "A tight-fitting black uniform with striking crimson trim."
|
||||||
icon_state = "gestalt_fem"
|
icon_state = "gestalt_fem"
|
||||||
item_state = "gestalt_fem"
|
item_state = "gestalt_fem"
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/under/gestalt/sleeveless
|
/obj/item/clothing/under/gestalt/sleeveless
|
||||||
name = "sleeveless sleek crew uniform"
|
name = "sleeveless sleek crew uniform"
|
||||||
desc = "A tight-fitting, sleeveless single-piece black uniform with striking crimson trim."
|
desc = "A tight-fitting, sleeveless single-piece black uniform with striking crimson trim."
|
||||||
|
|||||||
@@ -55,16 +55,12 @@
|
|||||||
/obj/item/clothing/under/solgov/utility/army/olive
|
/obj/item/clothing/under/solgov/utility/army/olive
|
||||||
name = "olive fatigues"
|
name = "olive fatigues"
|
||||||
desc = "An olive version of the USDF marine utility uniform, made from durable material." //YW EDIT: TCG to USDF
|
desc = "An olive version of the USDF marine utility uniform, made from durable material." //YW EDIT: TCG to USDF
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "bdu_olive"
|
icon_state = "bdu_olive"
|
||||||
item_state = "bdu_olive"
|
item_state = "bdu_olive"
|
||||||
|
|
||||||
/obj/item/clothing/under/solgov/utility/army/desert
|
/obj/item/clothing/under/solgov/utility/army/desert
|
||||||
name = "desert fatigues"
|
name = "desert fatigues"
|
||||||
desc = "A desert version of the USDF marine utility uniform, made from durable material." //YW EDIT: TCG to USDF
|
desc = "A desert version of the USDF marine utility uniform, made from durable material." //YW EDIT: TCG to USDF
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "bdu_olive"
|
icon_state = "bdu_olive"
|
||||||
item_state = "bdu_olive"
|
item_state = "bdu_olive"
|
||||||
|
|
||||||
|
|||||||
@@ -844,9 +844,6 @@
|
|||||||
name = DEVELOPER_WARNING_NAME
|
name = DEVELOPER_WARNING_NAME
|
||||||
desc = "Why did you spawn this one? Dork."
|
desc = "Why did you spawn this one? Dork."
|
||||||
sensor_mode = 3
|
sensor_mode = 3
|
||||||
|
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
icon_state = "khi_uniform"
|
icon_state = "khi_uniform"
|
||||||
|
|
||||||
/obj/item/clothing/under/rank/khi/cmd //Command version
|
/obj/item/clothing/under/rank/khi/cmd //Command version
|
||||||
@@ -1128,12 +1125,9 @@ Departamental Swimsuits, for general use
|
|||||||
//Just some alt-uniforms themed around Star Trek - Pls don't sue, Mr Roddenberry ;_;
|
//Just some alt-uniforms themed around Star Trek - Pls don't sue, Mr Roddenberry ;_;
|
||||||
// PS. <3 Nienhaus
|
// PS. <3 Nienhaus
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/under/rank/trek
|
/obj/item/clothing/under/rank/trek
|
||||||
name = "Section 31 Uniform"
|
name = "Section 31 Uniform"
|
||||||
desc = "Oooh... right."
|
desc = "Oooh... right."
|
||||||
icon = 'icons/inventory/uniform/item_vr.dmi'
|
|
||||||
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
|
|
||||||
|
|
||||||
//TOS
|
//TOS
|
||||||
/obj/item/clothing/under/rank/trek/command
|
/obj/item/clothing/under/rank/trek/command
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 200 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 657 KiB After Width: | Height: | Size: 690 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
@@ -1,15 +1,11 @@
|
|||||||
/obj/item/clothing/under/rank/brigphys
|
/obj/item/clothing/under/rank/brigphys
|
||||||
icon = 'modular_chomp/icons/inventory/uniform/item.dmi'
|
|
||||||
icon_state = "brigphys"
|
|
||||||
icon_override = 'modular_chomp/icons/inventory/uniform/mob.dmi'
|
|
||||||
item_icons = list(slot_w_uniform_str = 'modular_chomp/icons/inventory/uniform/item.dmi', slot_r_hand_str = "red", slot_l_hand_str = "red")
|
|
||||||
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
|
|
||||||
name = "brig physician's jumpsuit"
|
name = "brig physician's jumpsuit"
|
||||||
|
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
|
||||||
|
icon_state = "brigphys"
|
||||||
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
|
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
|
||||||
permeability_coefficient = 0.50
|
permeability_coefficient = 0.50
|
||||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
|
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
update_icon_define_digi = 'modular_chomp/icons/inventory/uniform/mob_digi.dmi'
|
|
||||||
|
|
||||||
/obj/item/clothing/under/rank/brigphys/jeans
|
/obj/item/clothing/under/rank/brigphys/jeans
|
||||||
icon_state = "brigphysj"
|
icon_state = "brigphysj"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 531 B |
|
Before Width: | Height: | Size: 960 B |
|
Before Width: | Height: | Size: 998 B |