shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes bartender suit having an adjust state

Browse Source
This commit is contained in:
ShizCalev
2017-11-22 13:40:12 -05:00
committed by CitadelStationBot
parent dc0128a6d3
commit 6ab499b57b
36 changed files with 517 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/_under.dm
+3 -3
View File
@@ -7,11 +7,11 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
var/has_sensor = HAS_SENSORS // For the crew computer
var/random_sensor = 1
var/random_sensor = TRUE
var/sensor_mode = NO_SENSORS
var/can_adjust = 1
var/can_adjust = TRUE
var/adjusted = NORMAL_STYLE
var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only
var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only
var/obj/item/clothing/accessory/attached_accessory
var/mutable_appearance/accessory_overlay
var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
code/modules/clothing/under/color.dm
+136 -1
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
/obj/item/clothing/under/color
desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
@@ -126,4 +127,138 @@
icon_state = "rainbow"
item_state = "rainbow"
item_color = "rainbow"
can_adjust = 0
can_adjust = 0
=======
/obj/item/clothing/under/color
desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
/obj/item/clothing/under/color/random/New()
..()
var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random)
name = initial(C.name)
icon_state = initial(C.icon_state)
item_state = initial(C.item_state)
item_color = initial(C.item_color)
/obj/item/clothing/under/color/black
name = "black jumpsuit"
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
resistance_flags = NONE
/obj/item/clothing/under/color/black/ghost
flags_1 = NODROP_1|DROPDEL_1
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
desc = "A tasteful grey jumpsuit that reminds you of the good old days."
icon_state = "grey"
item_state = "gy_suit"
item_color = "grey"
/obj/item/clothing/under/color/grey/glorf
name = "ancient jumpsuit"
desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
owner.forcesay(GLOB.hit_appends)
return 0
/obj/item/clothing/under/color/blue
name = "blue jumpsuit"
icon_state = "blue"
item_state = "b_suit"
item_color = "blue"
/obj/item/clothing/under/color/green
name = "green jumpsuit"
icon_state = "green"
item_state = "g_suit"
item_color = "green"
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
desc = "Don't wear this near paranoid security officers."
icon_state = "orange"
item_state = "o_suit"
item_color = "orange"
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
icon_state = "pink"
desc = "Just looking at this makes you feel <i>fabulous</i>."
item_state = "p_suit"
item_color = "pink"
/obj/item/clothing/under/color/red
name = "red jumpsuit"
icon_state = "red"
item_state = "r_suit"
item_color = "red"
/obj/item/clothing/under/color/white
name = "white jumpsuit"
icon_state = "white"
item_state = "w_suit"
item_color = "white"
/obj/item/clothing/under/color/yellow
name = "yellow jumpsuit"
icon_state = "yellow"
item_state = "y_suit"
item_color = "yellow"
/obj/item/clothing/under/color/darkblue
name = "darkblue jumpsuit"
icon_state = "darkblue"
item_state = "b_suit"
item_color = "darkblue"
/obj/item/clothing/under/color/teal
name = "teal jumpsuit"
icon_state = "teal"
item_state = "b_suit"
item_color = "teal"
/obj/item/clothing/under/color/lightpurple
name = "purple jumpsuit"
icon_state = "lightpurple"
item_state = "p_suit"
item_color = "lightpurple"
/obj/item/clothing/under/color/darkgreen
name = "darkgreen jumpsuit"
icon_state = "darkgreen"
item_state = "g_suit"
item_color = "darkgreen"
/obj/item/clothing/under/color/lightbrown
name = "lightbrown jumpsuit"
icon_state = "lightbrown"
item_state = "lb_suit"
item_color = "lightbrown"
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
icon_state = "brown"
item_state = "lb_suit"
item_color = "brown"
/obj/item/clothing/under/color/maroon
name = "maroon jumpsuit"
icon_state = "maroon"
item_state = "r_suit"
item_color = "maroon"
/obj/item/clothing/under/color/rainbow
name = "rainbow jumpsuit"
desc = "A multi-colored jumpsuit!"
icon_state = "rainbow"
item_state = "rainbow"
item_color = "rainbow"
can_adjust = FALSE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
code/modules/clothing/under/jobs/civilian.dm
+16 -16
View File
@@ -6,7 +6,7 @@
icon_state = "barman"
item_state = "bar_suit"
item_color = "barman"
alt_covers_chest = 1
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/bartender/purple
desc = "It looks like it has lots of flair!"
@@ -14,7 +14,7 @@
icon_state = "purplebartender"
item_state = "purplebartender"
item_color = "purplebartender"
alt_covers_chest = 1
can_adjust = FALSE
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
@@ -23,7 +23,7 @@
item_state = "b_suit"
item_color = "captain"
sensor_mode = SENSOR_COORDS
random_sensor = 0
random_sensor = FALSE
/obj/item/clothing/under/rank/cargo
name = "quartermaster's jumpsuit"
@@ -48,14 +48,14 @@
icon_state = "chaplain"
item_state = "bl_suit"
item_color = "chapblack"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/chef
name = "cook's suit"
desc = "A suit which is given only to the most <b>hardcore</b> cooks in space."
icon_state = "chef"
item_color = "chef"
alt_covers_chest = 1
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/clown
name = "clown suit"
@@ -64,7 +64,7 @@
item_state = "clown"
item_color = "clown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/clown/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
@@ -76,7 +76,7 @@
icon_state = "hop"
item_state = "b_suit"
item_color = "hop"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/hydroponics
desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
@@ -96,7 +96,7 @@
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "Lawyer suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/lawyer/black
icon_state = "lawyer_black"
@@ -124,8 +124,8 @@
icon_state = "bluesuit"
item_state = "bluesuit"
item_color = "bluesuit"
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/lawyer/purpsuit
name = "purple suit"
@@ -133,8 +133,8 @@
item_state = "lawyer_purp"
item_color = "lawyer_purp"
fitted = NO_FEMALE_UNIFORM
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/lawyer/blacksuit
name = "black suit"
@@ -142,8 +142,8 @@
icon_state = "blacksuit"
item_state = "bar_suit"
item_color = "blacksuit"
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/curator
name = "sensible suit"
@@ -151,7 +151,7 @@
icon_state = "red_suit"
item_state = "red_suit"
item_color = "red_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/curator/treasure_hunter
name = "treasure hunter uniform"
@@ -180,4 +180,4 @@
icon_state = "explorer"
item_state = "explorer"
item_color = "explorer"
can_adjust = 0
can_adjust = FALSE
code/modules/clothing/under/jobs/engineering.dm
+38 -1
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
//Contains: Engineering department jumpsuits
/obj/item/clothing/under/rank/chief_engineer
desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
@@ -31,4 +32,40 @@
icon_state = "robotics"
item_state = "robotics"
item_color = "robotics"
resistance_flags = 0
resistance_flags = 0
=======
//Contains: Engineering department jumpsuits
/obj/item/clothing/under/rank/chief_engineer
desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
name = "chief engineer's jumpsuit"
icon_state = "chiefengineer"
item_state = "gy_suit"
item_color = "chief"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 80, acid = 40)
resistance_flags = NONE
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
name = "atmospheric technician's jumpsuit"
icon_state = "atmos"
item_state = "atmos_suit"
item_color = "atmos"
resistance_flags = NONE
/obj/item/clothing/under/rank/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
name = "engineer's jumpsuit"
icon_state = "engine"
item_state = "engi_suit"
item_color = "engine"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 60, acid = 20)
resistance_flags = NONE
/obj/item/clothing/under/rank/roboticist
desc = "It's a slimming black with reinforced seams; great for industrial work."
name = "roboticist's jumpsuit"
icon_state = "robotics"
item_state = "robotics"
item_color = "robotics"
resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
code/modules/clothing/under/jobs/medsci.dm
+9 -9
View File
@@ -8,7 +8,7 @@
item_state = "lb_suit"
item_color = "director"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 35)
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/research_director/alt
desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
@@ -17,8 +17,8 @@
item_state = "rdwhimsy"
item_color = "rdwhimsy"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0)
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/research_director/turtleneck
desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
@@ -27,8 +27,8 @@
item_state = "p_suit"
item_color = "rdturtle"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0)
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/scientist
desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
@@ -88,7 +88,7 @@
permeability_coefficient = 0.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
fitted = NO_FEMALE_UNIFORM
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/medical
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."
@@ -104,18 +104,18 @@
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
icon_state = "scrubsblue"
item_color = "scrubsblue"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
icon_state = "scrubsgreen"
item_color = "scrubsgreen"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
icon_state = "scrubspurple"
item_color = "scrubspurple"
can_adjust = 0
can_adjust = FALSE
code/modules/clothing/under/jobs/security.dm
+13 -13
View File
@@ -17,9 +17,9 @@
item_color = "rsecurity"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 30)
strip_delay = 50
alt_covers_chest = 1
alt_covers_chest = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = 0
random_sensor = FALSE
/obj/item/clothing/under/rank/security/grey
name = "grey security jumpsuit"
@@ -37,9 +37,9 @@
item_color = "rwarden"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 30)
strip_delay = 50
alt_covers_chest = 1
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = 0
random_sensor = FALSE
/obj/item/clothing/under/rank/warden/grey
name = "grey security suit"
@@ -59,9 +59,9 @@
item_color = "detective"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 30)
strip_delay = 50
alt_covers_chest = 1
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = 0
random_sensor = FALSE
/obj/item/clothing/under/rank/det/grey
name = "noir suit"
@@ -69,7 +69,7 @@
icon_state = "greydet"
item_state = "greydet"
item_color = "greydet"
alt_covers_chest = 1
alt_covers_chest = TRUE
/*
* Head of Security
@@ -82,9 +82,9 @@
item_color = "rhos"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
strip_delay = 60
alt_covers_chest = 1
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = 0
random_sensor = FALSE
/obj/item/clothing/under/rank/head_of_security/grey
name = "head of security's grey jumpsuit"
@@ -110,7 +110,7 @@
icon_state = "officerblueclothes"
item_state = "officerblueclothes"
item_color = "officerblueclothes"
alt_covers_chest = 1
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/head_of_security/navyblue
desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
@@ -118,7 +118,7 @@
icon_state = "hosblueclothes"
item_state = "hosblueclothes"
item_color = "hosblueclothes"
alt_covers_chest = 1
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/warden/navyblue
desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
@@ -126,7 +126,7 @@
icon_state = "wardenblueclothes"
item_state = "wardenblueclothes"
item_color = "wardenblueclothes"
alt_covers_chest = 1
alt_covers_chest = TRUE
/*
*Blueshirt
@@ -137,4 +137,4 @@
icon_state = "blueshift"
item_state = "blueshift"
item_color = "blueshift"
can_adjust = 0
can_adjust = FALSE
code/modules/clothing/under/miscellaneous.dm
+62 -62
View File
@@ -4,7 +4,7 @@
icon_state = "red_pyjamas"
item_color = "red_pyjamas"
item_state = "w_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/pj/blue
name = "blue pj's"
@@ -12,7 +12,7 @@
icon_state = "blue_pyjamas"
item_color = "blue_pyjamas"
item_state = "w_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/patriotsuit
name = "Patriotic Suit"
@@ -20,7 +20,7 @@
icon_state = "ek"
item_state = "ek"
item_color = "ek"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/scratch
name = "white suit"
@@ -28,14 +28,14 @@
icon_state = "scratch"
item_state = "scratch"
item_color = "scratch"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/sl_suit
desc = "It's a very amish looking suit."
name = "amish suit"
icon_state = "sl_suit"
item_color = "sl_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/roman
name = "roman armor"
@@ -43,9 +43,9 @@
icon_state = "roman"
item_color = "roman"
item_state = "armor"
can_adjust = 0
can_adjust = FALSE
strip_delay = 100
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/under/waiter
name = "waiter's outfit"
@@ -53,7 +53,7 @@
icon_state = "waiter"
item_state = "waiter"
item_color = "waiter"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/prisoner
name = "prison jumpsuit"
@@ -63,7 +63,7 @@
item_color = "prisoner"
has_sensor = LOCKED_SENSORS
sensor_mode = SENSOR_COORDS
random_sensor = 0
random_sensor = FALSE
/obj/item/clothing/under/rank/mailman
name = "mailman's jumpsuit"
@@ -85,7 +85,7 @@
icon_state = "sexyclown"
item_state = "sexyclown"
item_color = "sexyclown"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/jabroni
name = "Jabroni Outfit"
@@ -93,7 +93,7 @@
icon_state = "darkholme"
item_state = "darkholme"
item_color = "darkholme"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/vice
name = "vice officer's jumpsuit"
@@ -101,7 +101,7 @@
icon_state = "vice"
item_state = "gy_suit"
item_color = "vice"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/rank/centcom_officer
desc = "It's a jumpsuit worn by CentCom Officers."
@@ -109,7 +109,7 @@
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
alt_covers_chest = 1
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/centcom_commander
desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
@@ -132,8 +132,8 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = 0
resistance_flags = 0
can_adjust = FALSE
resistance_flags = NONE
/obj/item/clothing/under/acj
name = "administrative cybernetic jumpsuit"
@@ -149,7 +149,7 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = 0
can_adjust = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/under/owl
@@ -157,21 +157,21 @@
desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
icon_state = "owl"
item_color = "owl"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/griffin
name = "griffon uniform"
desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem."
icon_state = "griffin"
item_color = "griffin"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/cloud
name = "cloud"
desc = "cloud"
icon_state = "cloud"
item_color = "cloud"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/gimmick/rank/captain/suit
name = "captain's suit"
@@ -179,7 +179,7 @@
icon_state = "green_suit"
item_state = "dg_suit"
item_color = "green_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
name = "head of personnel's suit"
@@ -187,7 +187,7 @@
icon_state = "teal_suit"
item_state = "g_suit"
item_color = "teal_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/suit_jacket
name = "black suit"
@@ -195,7 +195,7 @@
icon_state = "black_suit"
item_state = "bl_suit"
item_color = "black_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/suit_jacket/really_black
name = "executive suit"
@@ -217,7 +217,7 @@
icon_state = "green_suit"
item_state = "dg_suit"
item_color = "green_suit"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/suit_jacket/red
name = "red suit"
@@ -282,7 +282,7 @@
item_color = "blackskirt"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/skirt/blue
name = "blue skirt"
@@ -292,7 +292,7 @@
item_state = "b_suit"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/skirt/red
name = "red skirt"
@@ -302,7 +302,7 @@
item_state = "r_suit"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/skirt/purple
name = "purple skirt"
@@ -312,7 +312,7 @@
item_state = "p_suit"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/schoolgirl
@@ -323,7 +323,7 @@
item_color = "schoolgirl"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/schoolgirl/red
name = "red schoolgirl uniform"
@@ -349,7 +349,7 @@
icon_state = "overalls"
item_state = "lb_suit"
item_color = "overalls"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/pirate
name = "pirate outfit"
@@ -357,7 +357,7 @@
icon_state = "pirate"
item_state = "pirate"
item_color = "pirate"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/soviet
name = "soviet uniform"
@@ -365,7 +365,7 @@
icon_state = "soviet"
item_state = "soviet"
item_color = "soviet"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/redcoat
name = "redcoat uniform"
@@ -373,7 +373,7 @@
icon_state = "redcoat"
item_state = "redcoat"
item_color = "redcoat"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/kilt
name = "kilt"
@@ -383,7 +383,7 @@
item_color = "kilt"
body_parts_covered = CHEST|GROIN|FEET
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/kilt/highlander
desc = "You're the only one worthy of this kilt."
@@ -397,7 +397,7 @@
item_color = "sexymime"
body_parts_covered = CHEST|GROIN|LEGS
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/gladiator
name = "gladiator uniform"
@@ -407,8 +407,8 @@
item_color = "gladiator"
body_parts_covered = CHEST|GROIN|ARMS
fitted = NO_FEMALE_UNIFORM
can_adjust = 0
resistance_flags = 0
can_adjust = FALSE
resistance_flags = NONE
/obj/item/clothing/under/gladiator/ash_walker
desc = "This gladiator uniform appears to be covered in ash and fairly dated."
@@ -422,7 +422,7 @@
item_color = "sundress"
body_parts_covered = CHEST|GROIN
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/captainparade
name = "captain's parade uniform"
@@ -430,7 +430,7 @@
icon_state = "captain_parade"
item_state = "by_suit"
item_color = "captain_parade"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/hosparademale
name = "head of security's parade uniform"
@@ -438,7 +438,7 @@
icon_state = "hos_parade_male"
item_state = "r_suit"
item_color = "hos_parade_male"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/hosparadefem
name = "head of security's parade uniform"
@@ -447,7 +447,7 @@
item_state = "r_suit"
item_color = "hos_parade_fem"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/assistantformal
name = "assistant's formal uniform"
@@ -455,7 +455,7 @@
icon_state = "assistant_formal"
item_state = "gy_suit"
item_color = "assistant_formal"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/blacktango
name = "black tango dress"
@@ -464,7 +464,7 @@
item_state = "wcoat"
item_color = "black_tango"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/stripeddress
name = "striped dress"
@@ -473,7 +473,7 @@
item_state = "stripeddress"
item_color = "striped_dress"
fitted = FEMALE_UNIFORM_FULL
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/sailordress
name = "sailor dress"
@@ -482,7 +482,7 @@
item_state = "sailordress"
item_color = "sailor_dress"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/redeveninggown
name = "red evening gown"
@@ -491,7 +491,7 @@
item_state = "redeveninggown"
item_color = "red_evening_gown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/maid
name = "maid costume"
@@ -501,7 +501,7 @@
item_color = "maid"
body_parts_covered = CHEST|GROIN
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/maid/Initialize()
. = ..()
@@ -516,7 +516,7 @@
item_color = "janimaid"
body_parts_covered = CHEST|GROIN
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/plaid_skirt
name = "red plaid skirt"
@@ -525,8 +525,8 @@
item_state = "plaid_red"
item_color = "plaid_red"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/plaid_skirt/blue
name = "blue plaid skirt"
@@ -535,8 +535,8 @@
item_state = "plaid_blue"
item_color = "plaid_blue"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/plaid_skirt/purple
name = "purple plaid skirt"
@@ -545,8 +545,8 @@
item_state = "plaid_purple"
item_color = "plaid_purple"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/singery
name = "yellow performer's outfit"
@@ -556,7 +556,7 @@
item_color = "ysing"
fitted = NO_FEMALE_UNIFORM
alternate_worn_layer = ABOVE_SHOES_LAYER
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/singerb
name = "blue performer's outfit"
@@ -566,7 +566,7 @@
item_color = "bsing"
alternate_worn_layer = ABOVE_SHOES_LAYER
fitted = FEMALE_UNIFORM_TOP
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/plaid_skirt/green
name = "green plaid skirt"
@@ -575,15 +575,15 @@
item_state = "plaid_green"
item_color = "plaid_green"
fitted = FEMALE_UNIFORM_TOP
can_adjust = 1
alt_covers_chest = 1
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/jester
name = "jester suit"
desc = "A jolly dress, well suited to entertain your master, nuncle."
icon_state = "jester"
item_color = "jester"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/jester/alt
icon_state = "jester2"
@@ -593,14 +593,14 @@
desc = "Cute space ninja senpai not included."
icon_state = "geisha"
item_color = "geisha"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/villain
name = "villain suit"
desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
icon_state = "villain"
item_color = "villain"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/sailor
name = "sailor suit"
@@ -608,7 +608,7 @@
icon_state = "sailor"
item_state = "b_suit"
item_color = "sailor"
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/plasmaman
name = "plasma envirosuit"
@@ -618,7 +618,7 @@
item_color = "plasmaman"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0, fire = 95, acid = 95)
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
can_adjust = 0
can_adjust = FALSE
strip_delay = 80
var/next_extinguish = 0
var/extinguish_cooldown = 100
code/modules/clothing/under/pants.dm
+80
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
/obj/item/clothing/under/pants
gender = PLURAL
body_parts_covered = GROIN|LEGS
@@ -75,3 +76,82 @@
desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
icon_state = "camopants"
item_color = "camopants"
=======
/obj/item/clothing/under/pants
gender = PLURAL
body_parts_covered = GROIN|LEGS
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
/obj/item/clothing/under/pants/classicjeans
name = "classic jeans"
desc = "You feel cooler already."
icon_state = "jeansclassic"
item_color = "jeansclassic"
/obj/item/clothing/under/pants/mustangjeans
name = "Must Hang jeans"
desc = "Made in the finest space jeans factory this side of Alpha Centauri."
icon_state = "jeansmustang"
item_color = "jeansmustang"
/obj/item/clothing/under/pants/blackjeans
name = "black jeans"
desc = "Only for those who can pull it off."
icon_state = "jeansblack"
item_color = "jeansblack"
/obj/item/clothing/under/pants/youngfolksjeans
name = "Young Folks jeans"
desc = "For those tired of boring old jeans. Relive the passion of your youth!"
icon_state = "jeansyoungfolks"
item_color = "jeansyoungfolks"
/obj/item/clothing/under/pants/white
name = "white pants"
desc = "Plain white pants. Boring."
icon_state = "whitepants"
item_color = "whitepants"
/obj/item/clothing/under/pants/red
name = "red pants"
desc = "Bright red pants. Overflowing with personality."
icon_state = "redpants"
item_color = "redpants"
/obj/item/clothing/under/pants/black
name = "black pants"
desc = "These pants are dark, like your soul."
icon_state = "blackpants"
item_color = "blackpants"
/obj/item/clothing/under/pants/tan
name = "tan pants"
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
item_color = "tanpants"
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "A pair of track pants, for the athletic."
icon_state = "trackpants"
item_color = "trackpants"
/obj/item/clothing/under/pants/jeans
name = "jeans"
desc = "A nondescript pair of tough blue jeans."
icon_state = "jeans"
item_color = "jeans"
/obj/item/clothing/under/pants/khaki
name = "khaki pants"
desc = "A pair of dust beige khaki pants."
icon_state = "khaki"
item_color = "khaki"
/obj/item/clothing/under/pants/camo
name = "camo pants"
desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
icon_state = "camopants"
item_color = "camopants"
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
code/modules/clothing/under/shorts.dm
+1 -1
View File
@@ -5,7 +5,7 @@
body_parts_covered = GROIN
fitted = NO_FEMALE_UNIFORM
mutantrace_variation = MUTANTRACE_VARIATION
can_adjust = 0
can_adjust = FALSE
/obj/item/clothing/under/shorts/red
name = "red athletic shorts"
code/modules/clothing/under/syndicate.dm
+4 -4
View File
@@ -6,7 +6,7 @@
item_color = "syndicate"
has_sensor = NO_SENSORS
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 40)
alt_covers_chest = 1
alt_covers_chest = TRUE
/obj/item/clothing/under/syndicate/tacticool
name = "tacticool turtleneck"
@@ -35,13 +35,13 @@
desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in."
icon_state = "trackpants"
item_color = "trackpants"
can_adjust = 0
can_adjust = FALSE
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/under/syndicate/combat
name = "combat uniform"
desc = "With a suit lined with this many pockets, you are ready to operate."
icon_state = "syndicate_combat"
item_color = "syndicate_combat"
can_adjust = 0
can_adjust = FALSE
code/modules/clothing/under/trek.dm
+1 -1
View File
@@ -2,7 +2,7 @@
/obj/item/clothing/under/trek
can_adjust = 0
can_adjust = FALSE
//TOS