From 73540f1298c959c21b93d3832c4a639b5cc837a3 Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Tue, 17 Sep 2019 18:28:56 +0200 Subject: [PATCH 1/7] Add files via upload QoL improvement for shaft miners so that they don't have to steal security jumpsuits anymore. --- civilian.dm | 426 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 426 insertions(+) create mode 100644 civilian.dm diff --git a/civilian.dm b/civilian.dm new file mode 100644 index 0000000000..c896d11545 --- /dev/null +++ b/civilian.dm @@ -0,0 +1,426 @@ +//Alphabetical order of civilian jobs. + +/obj/item/clothing/under/rank/bartender + desc = "It looks like it could use some more flair." + name = "bartender's uniform" + icon_state = "barman" + item_state = "bar_suit" + item_color = "barman" + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/bartender/purple + desc = "It looks like it has lots of flair!" + name = "purple bartender's uniform" + icon_state = "purplebartender" + item_state = "purplebartender" + item_color = "purplebartender" + can_adjust = FALSE + +/obj/item/clothing/under/rank/bartender/skirt + name = "bartender's skirt" + desc = "It looks like it could use some more flair." + icon_state = "barman_skirt" + item_state = "bar_suit" + item_color = "barman_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/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\"." + name = "captain's jumpsuit" + icon_state = "captain" + item_state = "b_suit" + item_color = "captain" + sensor_mode = SENSOR_COORDS + random_sensor = FALSE + +/obj/item/clothing/under/rank/captain/skirt + name = "captain's jumpskirt" + desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"." + icon_state = "captain_skirt" + item_state = "b_suit" + item_color = "captain_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/cargo + name = "quartermaster's jumpsuit" + desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." + icon_state = "qm" + item_state = "lb_suit" + item_color = "qm" + +/obj/item/clothing/under/rank/cargo/skirt + name = "quartermaster's jumpskirt" + desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." + icon_state = "qm_skirt" + item_state = "lb_suit" + item_color = "qm_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/cargotech + name = "cargo technician's jumpsuit" + desc = "Shooooorts! They're comfy and easy to wear!" + icon_state = "cargotech" + item_state = "lb_suit" + item_color = "cargo" + body_parts_covered = CHEST|GROIN|ARMS + mutantrace_variation = MUTANTRACE_VARIATION + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/cargotech/skirt + name = "cargo technician's jumpskirt" + desc = "Skiiiiirts! They're comfy and easy to wear" + icon_state = "cargo_skirt" + item_state = "lb_suit" + item_color = "cargo_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/chaplain + desc = "It's a black jumpsuit, often worn by religious folk." + name = "chaplain's jumpsuit" + icon_state = "chaplain" + item_state = "bl_suit" + item_color = "chapblack" + can_adjust = FALSE + +/obj/item/clothing/under/rank/chaplain/skirt + name = "chaplain's jumpskirt" + desc = "It's a black jumpskirt, often worn by religious folk." + icon_state = "chapblack_skirt" + item_state = "bl_suit" + item_color = "chapblack_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/chef + name = "cook's suit" + desc = "A suit which is given only to the most hardcore cooks in space." + icon_state = "chef" + item_color = "chef" + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/chef/skirt + name = "cook's skirt" + desc = "A skirt which is given only to the most hardcore cooks in space." + icon_state = "chef_skirt" + item_color = "chef_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/clown + name = "clown suit" + desc = "'HONK!'" + icon_state = "clown" + item_state = "clown" + item_color = "clown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE +/obj/item/clothing/under/rank/blueclown + name = "blue clown suit" + desc = "'BLUE HONK!'" + icon_state = "blueclown" + item_state = "blueclown" + item_color = "blueclown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/under/rank/greenclown + name = "green clown suit" + desc = "'GREEN HONK!'" + icon_state = "greenclown" + item_state = "greenclown" + item_color = "greenclown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/under/rank/yellowclown + name = "yellow clown suit" + desc = "'YELLOW HONK!'" + icon_state = "yellowclown" + item_state = "yellowclown" + item_color = "yellowclown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/under/rank/purpleclown + name = "purple clown suit" + desc = "'PURPLE HONK!'" + icon_state = "purpleclown" + item_state = "purpleclown" + item_color = "purpleclown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/under/rank/orangeclown + name = "orange clown suit" + desc = "'ORANGE HONK!'" + icon_state = "orangeclown" + item_state = "orangeclown" + item_color = "orangeclown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/under/rank/rainbowclown + name = "rainbow clown suit" + desc = "'R A I N B O W HONK!'" + icon_state = "rainbowclown" + item_state = "rainbowclown" + item_color = "rainbowclown" + fitted = FEMALE_UNIFORM_TOP + can_adjust = FALSE + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/under/rank/clown/Initialize() + . = ..() + AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) +/obj/item/clothing/under/rank/head_of_personnel + desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." + name = "head of personnel's jumpsuit" + icon_state = "hop" + item_state = "b_suit" + item_color = "hop" + can_adjust = FALSE + +/obj/item/clothing/under/rank/head_of_personnel/skirt + name = "head of personnel's jumpskirt" + desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"." + icon_state = "hop_skirt" + item_state = "b_suit" + item_color = "hop_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/hydroponics + desc = "It's a jumpsuit designed to protect against minor plant-related hazards." + name = "botanist's jumpsuit" + icon_state = "hydroponics" + item_state = "g_suit" + item_color = "hydroponics" + permeability_coefficient = 0.5 + +/obj/item/clothing/under/rank/hydroponics/skirt + name = "botanist's jumpskirt" + desc = "It's a jumpskirt designed to protect against minor plant-related hazards." + icon_state = "hydroponics_skirt" + item_state = "g_suit" + item_color = "hydroponics_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/janitor + desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." + name = "janitor's jumpsuit" + icon_state = "janitor" + item_color = "janitor" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/under/rank/janitor/skirt + name = "janitor's jumpskirt" + desc = "It's the official skirt of the station's janitor. It has minor protection from biohazards." + icon_state = "janitor_skirt" + item_color = "janitor_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer + desc = "Slick threads." + name = "Lawyer suit" + can_adjust = FALSE +/obj/item/clothing/under/lawyer/black + name = "lawyer black suit" + icon_state = "lawyer_black" + item_state = "lawyer_black" + item_color = "lawyer_black" + +/obj/item/clothing/under/lawyer/black/skirt + name = "lawyer black suitskirt" + icon_state = "lawyer_black_skirt" + item_state = "lawyer_black" + item_color = "lawyer_black_skirt" + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer/female + name = "female black suit" + icon_state = "black_suit_fem" + item_state = "bl_suit" + item_color = "black_suit_fem" + +/obj/item/clothing/under/lawyer/red + name = "lawyer red suit" + icon_state = "lawyer_red" + item_state = "lawyer_red" + item_color = "lawyer_red" + +/obj/item/clothing/under/lawyer/female/skirt + name = "female black suitskirt" + icon_state = "black_suit_fem_skirt" + item_state = "bl_suit" + item_color = "black_suit_fem_skirt" + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer/red/skirt + name = "lawyer red suitskirt" + icon_state = "lawyer_red_skirt" + item_state = "lawyer_red" + item_color = "lawyer_red_skirt" + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer/blue + name = "lawyer blue suit" + icon_state = "lawyer_blue" + item_state = "lawyer_blue" + item_color = "lawyer_blue" + +/obj/item/clothing/under/lawyer/blue/skirt + name = "lawyer blue suitskirt" + icon_state = "lawyer_blue_skirt" + item_state = "lawyer_blue" + item_color = "lawyer_blue_skirt" + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer/bluesuit + name = "blue suit" + desc = "A classy suit and tie." + icon_state = "bluesuit" + item_state = "b_suit" + item_color = "bluesuit" + can_adjust = TRUE + alt_covers_chest = TRUE + +/obj/item/clothing/under/lawyer/bluesuit/skirt + name = "blue suitskirt" + desc = "A classy suitskirt and tie." + icon_state = "bluesuit_skirt" + item_state = "b_suit" + item_color = "bluesuit_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer/purpsuit + name = "purple suit" + icon_state = "lawyer_purp" + item_state = "p_suit" + item_color = "lawyer_purp" + fitted = NO_FEMALE_UNIFORM + can_adjust = TRUE + alt_covers_chest = TRUE + +/obj/item/clothing/under/lawyer/purpsuit/skirt + name = "purple suitskirt" + icon_state = "lawyer_purp_skirt" + item_state = "p_suit" + item_color = "lawyer_purp_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/lawyer/blacksuit + name = "black suit" + desc = "A professional black suit. Nanotrasen Investigation Bureau approved!" + icon_state = "blacksuit" + item_state = "bar_suit" + item_color = "blacksuit" + can_adjust = TRUE + alt_covers_chest = TRUE + +/obj/item/clothing/under/lawyer/blacksuit/skirt + name = "black suitskirt" + desc = "A professional black suit. Nanotrasen Investigation Bureau approved!" + icon_state = "blacksuit_skirt" + item_state = "bar_suit" + item_color = "blacksuit_skirt" + can_adjust = FALSE + alt_covers_chest = TRUE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/curator + name = "sensible suit" + desc = "It's very... sensible." + icon_state = "red_suit" + item_state = "red_suit" + item_color = "red_suit" + can_adjust = FALSE + +/obj/item/clothing/under/lawyer/really_black + name = "executive suit" + desc = "A formal black suit and red tie, intended for the station's finest." + icon_state = "really_black_suit" + item_state = "bl_suit" + item_color = "really_black_suit" + +/obj/item/clothing/under/lawyer/really_black/skirt + name = "executive suitskirt" + desc = "A formal black suitskirt and red tie, intended for the station's finest." + icon_state = "really_black_suit_skirt" + item_state = "bl_suit" + item_color = "really_black_suit_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/curator/skirt + name = "sensible suitskirt" + desc = "It's very... sensible." + icon_state = "red_suit_skirt" + item_state = "red_suit" + item_color = "red_suit_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/curator/treasure_hunter + name = "treasure hunter uniform" + desc = "A rugged uniform suitable for treasure hunting." + icon_state = "curator" + item_state = "curator" + item_color = "curator" + +/obj/item/clothing/under/rank/mime + name = "mime's outfit" + desc = "It's not very colourful." + icon_state = "mime" + item_state = "mime" + item_color = "mime" + +/obj/item/clothing/under/rank/mime/skirt + name = "mime's skirt" + desc = "It's not very colourful." + icon_state = "mime_skirt" + item_state = "mime" + item_color = "mime_skirt" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/miner + desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty." + name = "shaft miner's jumpsuit" + icon_state = "miner" + item_state = "miner" + item_color = "miner" +/obj/item/clothing/under/rank/miner/lavaland + desc = "A green uniform for operating in hazardous environments." + name = "shaft miner's jumpsuit" + icon_state = "explorer" + item_state = "explorer" + item_color = "explorer" + armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 5, "acid" = 0) + can_adjust = FALSE From 896d20bfc289b0a6fc26d0065307f9a6b2e459e8 Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Tue, 17 Sep 2019 18:31:19 +0200 Subject: [PATCH 2/7] Delete civilian.dm fuck --- civilian.dm | 426 ---------------------------------------------------- 1 file changed, 426 deletions(-) delete mode 100644 civilian.dm diff --git a/civilian.dm b/civilian.dm deleted file mode 100644 index c896d11545..0000000000 --- a/civilian.dm +++ /dev/null @@ -1,426 +0,0 @@ -//Alphabetical order of civilian jobs. - -/obj/item/clothing/under/rank/bartender - desc = "It looks like it could use some more flair." - name = "bartender's uniform" - icon_state = "barman" - item_state = "bar_suit" - item_color = "barman" - alt_covers_chest = TRUE - -/obj/item/clothing/under/rank/bartender/purple - desc = "It looks like it has lots of flair!" - name = "purple bartender's uniform" - icon_state = "purplebartender" - item_state = "purplebartender" - item_color = "purplebartender" - can_adjust = FALSE - -/obj/item/clothing/under/rank/bartender/skirt - name = "bartender's skirt" - desc = "It looks like it could use some more flair." - icon_state = "barman_skirt" - item_state = "bar_suit" - item_color = "barman_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/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\"." - name = "captain's jumpsuit" - icon_state = "captain" - item_state = "b_suit" - item_color = "captain" - sensor_mode = SENSOR_COORDS - random_sensor = FALSE - -/obj/item/clothing/under/rank/captain/skirt - name = "captain's jumpskirt" - desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"." - icon_state = "captain_skirt" - item_state = "b_suit" - item_color = "captain_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/cargo - name = "quartermaster's jumpsuit" - desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." - icon_state = "qm" - item_state = "lb_suit" - item_color = "qm" - -/obj/item/clothing/under/rank/cargo/skirt - name = "quartermaster's jumpskirt" - desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." - icon_state = "qm_skirt" - item_state = "lb_suit" - item_color = "qm_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/cargotech - name = "cargo technician's jumpsuit" - desc = "Shooooorts! They're comfy and easy to wear!" - icon_state = "cargotech" - item_state = "lb_suit" - item_color = "cargo" - body_parts_covered = CHEST|GROIN|ARMS - mutantrace_variation = MUTANTRACE_VARIATION - alt_covers_chest = TRUE - -/obj/item/clothing/under/rank/cargotech/skirt - name = "cargo technician's jumpskirt" - desc = "Skiiiiirts! They're comfy and easy to wear" - icon_state = "cargo_skirt" - item_state = "lb_suit" - item_color = "cargo_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/chaplain - desc = "It's a black jumpsuit, often worn by religious folk." - name = "chaplain's jumpsuit" - icon_state = "chaplain" - item_state = "bl_suit" - item_color = "chapblack" - can_adjust = FALSE - -/obj/item/clothing/under/rank/chaplain/skirt - name = "chaplain's jumpskirt" - desc = "It's a black jumpskirt, often worn by religious folk." - icon_state = "chapblack_skirt" - item_state = "bl_suit" - item_color = "chapblack_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/chef - name = "cook's suit" - desc = "A suit which is given only to the most hardcore cooks in space." - icon_state = "chef" - item_color = "chef" - alt_covers_chest = TRUE - -/obj/item/clothing/under/rank/chef/skirt - name = "cook's skirt" - desc = "A skirt which is given only to the most hardcore cooks in space." - icon_state = "chef_skirt" - item_color = "chef_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/clown - name = "clown suit" - desc = "'HONK!'" - icon_state = "clown" - item_state = "clown" - item_color = "clown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE -/obj/item/clothing/under/rank/blueclown - name = "blue clown suit" - desc = "'BLUE HONK!'" - icon_state = "blueclown" - item_state = "blueclown" - item_color = "blueclown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE - mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/under/rank/greenclown - name = "green clown suit" - desc = "'GREEN HONK!'" - icon_state = "greenclown" - item_state = "greenclown" - item_color = "greenclown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE - mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/under/rank/yellowclown - name = "yellow clown suit" - desc = "'YELLOW HONK!'" - icon_state = "yellowclown" - item_state = "yellowclown" - item_color = "yellowclown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE - mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/under/rank/purpleclown - name = "purple clown suit" - desc = "'PURPLE HONK!'" - icon_state = "purpleclown" - item_state = "purpleclown" - item_color = "purpleclown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE - mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/under/rank/orangeclown - name = "orange clown suit" - desc = "'ORANGE HONK!'" - icon_state = "orangeclown" - item_state = "orangeclown" - item_color = "orangeclown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE - mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/under/rank/rainbowclown - name = "rainbow clown suit" - desc = "'R A I N B O W HONK!'" - icon_state = "rainbowclown" - item_state = "rainbowclown" - item_color = "rainbowclown" - fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE - mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/under/rank/clown/Initialize() - . = ..() - AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) -/obj/item/clothing/under/rank/head_of_personnel - desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." - name = "head of personnel's jumpsuit" - icon_state = "hop" - item_state = "b_suit" - item_color = "hop" - can_adjust = FALSE - -/obj/item/clothing/under/rank/head_of_personnel/skirt - name = "head of personnel's jumpskirt" - desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"." - icon_state = "hop_skirt" - item_state = "b_suit" - item_color = "hop_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/hydroponics - desc = "It's a jumpsuit designed to protect against minor plant-related hazards." - name = "botanist's jumpsuit" - icon_state = "hydroponics" - item_state = "g_suit" - item_color = "hydroponics" - permeability_coefficient = 0.5 - -/obj/item/clothing/under/rank/hydroponics/skirt - name = "botanist's jumpskirt" - desc = "It's a jumpskirt designed to protect against minor plant-related hazards." - icon_state = "hydroponics_skirt" - item_state = "g_suit" - item_color = "hydroponics_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/janitor - desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." - name = "janitor's jumpsuit" - icon_state = "janitor" - item_color = "janitor" - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) - -/obj/item/clothing/under/rank/janitor/skirt - name = "janitor's jumpskirt" - desc = "It's the official skirt of the station's janitor. It has minor protection from biohazards." - icon_state = "janitor_skirt" - item_color = "janitor_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer - desc = "Slick threads." - name = "Lawyer suit" - can_adjust = FALSE -/obj/item/clothing/under/lawyer/black - name = "lawyer black suit" - icon_state = "lawyer_black" - item_state = "lawyer_black" - item_color = "lawyer_black" - -/obj/item/clothing/under/lawyer/black/skirt - name = "lawyer black suitskirt" - icon_state = "lawyer_black_skirt" - item_state = "lawyer_black" - item_color = "lawyer_black_skirt" - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer/female - name = "female black suit" - icon_state = "black_suit_fem" - item_state = "bl_suit" - item_color = "black_suit_fem" - -/obj/item/clothing/under/lawyer/red - name = "lawyer red suit" - icon_state = "lawyer_red" - item_state = "lawyer_red" - item_color = "lawyer_red" - -/obj/item/clothing/under/lawyer/female/skirt - name = "female black suitskirt" - icon_state = "black_suit_fem_skirt" - item_state = "bl_suit" - item_color = "black_suit_fem_skirt" - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer/red/skirt - name = "lawyer red suitskirt" - icon_state = "lawyer_red_skirt" - item_state = "lawyer_red" - item_color = "lawyer_red_skirt" - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer/blue - name = "lawyer blue suit" - icon_state = "lawyer_blue" - item_state = "lawyer_blue" - item_color = "lawyer_blue" - -/obj/item/clothing/under/lawyer/blue/skirt - name = "lawyer blue suitskirt" - icon_state = "lawyer_blue_skirt" - item_state = "lawyer_blue" - item_color = "lawyer_blue_skirt" - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer/bluesuit - name = "blue suit" - desc = "A classy suit and tie." - icon_state = "bluesuit" - item_state = "b_suit" - item_color = "bluesuit" - can_adjust = TRUE - alt_covers_chest = TRUE - -/obj/item/clothing/under/lawyer/bluesuit/skirt - name = "blue suitskirt" - desc = "A classy suitskirt and tie." - icon_state = "bluesuit_skirt" - item_state = "b_suit" - item_color = "bluesuit_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer/purpsuit - name = "purple suit" - icon_state = "lawyer_purp" - item_state = "p_suit" - item_color = "lawyer_purp" - fitted = NO_FEMALE_UNIFORM - can_adjust = TRUE - alt_covers_chest = TRUE - -/obj/item/clothing/under/lawyer/purpsuit/skirt - name = "purple suitskirt" - icon_state = "lawyer_purp_skirt" - item_state = "p_suit" - item_color = "lawyer_purp_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/lawyer/blacksuit - name = "black suit" - desc = "A professional black suit. Nanotrasen Investigation Bureau approved!" - icon_state = "blacksuit" - item_state = "bar_suit" - item_color = "blacksuit" - can_adjust = TRUE - alt_covers_chest = TRUE - -/obj/item/clothing/under/lawyer/blacksuit/skirt - name = "black suitskirt" - desc = "A professional black suit. Nanotrasen Investigation Bureau approved!" - icon_state = "blacksuit_skirt" - item_state = "bar_suit" - item_color = "blacksuit_skirt" - can_adjust = FALSE - alt_covers_chest = TRUE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/curator - name = "sensible suit" - desc = "It's very... sensible." - icon_state = "red_suit" - item_state = "red_suit" - item_color = "red_suit" - can_adjust = FALSE - -/obj/item/clothing/under/lawyer/really_black - name = "executive suit" - desc = "A formal black suit and red tie, intended for the station's finest." - icon_state = "really_black_suit" - item_state = "bl_suit" - item_color = "really_black_suit" - -/obj/item/clothing/under/lawyer/really_black/skirt - name = "executive suitskirt" - desc = "A formal black suitskirt and red tie, intended for the station's finest." - icon_state = "really_black_suit_skirt" - item_state = "bl_suit" - item_color = "really_black_suit_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/curator/skirt - name = "sensible suitskirt" - desc = "It's very... sensible." - icon_state = "red_suit_skirt" - item_state = "red_suit" - item_color = "red_suit_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/curator/treasure_hunter - name = "treasure hunter uniform" - desc = "A rugged uniform suitable for treasure hunting." - icon_state = "curator" - item_state = "curator" - item_color = "curator" - -/obj/item/clothing/under/rank/mime - name = "mime's outfit" - desc = "It's not very colourful." - icon_state = "mime" - item_state = "mime" - item_color = "mime" - -/obj/item/clothing/under/rank/mime/skirt - name = "mime's skirt" - desc = "It's not very colourful." - icon_state = "mime_skirt" - item_state = "mime" - item_color = "mime_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP - -/obj/item/clothing/under/rank/miner - desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty." - name = "shaft miner's jumpsuit" - icon_state = "miner" - item_state = "miner" - item_color = "miner" -/obj/item/clothing/under/rank/miner/lavaland - desc = "A green uniform for operating in hazardous environments." - name = "shaft miner's jumpsuit" - icon_state = "explorer" - item_state = "explorer" - item_color = "explorer" - armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 5, "acid" = 0) - can_adjust = FALSE From 84a413a43a84fc29083ca0be09e13aded79f6435 Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Wed, 18 Dec 2019 17:37:08 +0100 Subject: [PATCH 3/7] Chef buffs chef buffs tastier food. "The strong flavor of" was always in game but someone put it behind an else if statement that would never proc. Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor! Hurrah! --- code/modules/reagents/chemistry/holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index f2c6dd2fb5..5dc5f0db4c 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -1114,7 +1114,7 @@ var/intensity_desc = "a hint of" if(percent > minimum_percent * 2 || percent == 100) intensity_desc = "" - else if(percent > minimum_percent * 3) + if(percent > minimum_percent * 3) // CITCHANGE - food now tasty intensity_desc = "the strong flavor of" if(intensity_desc != "") out += "[intensity_desc] [taste_desc]" From 7841faa3a90942bfb5a6c61411c0b8eb0409da55 Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Wed, 18 Dec 2019 19:24:25 +0100 Subject: [PATCH 4/7] Actually hold on So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying. --- code/modules/reagents/chemistry/holder.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 5dc5f0db4c..f683324105 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -1112,9 +1112,9 @@ if(percent < minimum_percent) continue var/intensity_desc = "a hint of" - if(percent > minimum_percent * 2 || percent == 100) + if(percent <= minimum_percent * 3 || percent == 100) intensity_desc = "" - if(percent > minimum_percent * 3) // CITCHANGE - food now tasty + else if(percent > minimum_percent * 3) // CITCHANGE - food now tasty intensity_desc = "the strong flavor of" if(intensity_desc != "") out += "[intensity_desc] [taste_desc]" From 19b20f8385760544bafc0cf92b2fc925020a3404 Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Wed, 18 Dec 2019 19:29:57 +0100 Subject: [PATCH 5/7] im baby dumb and removed "a hint of" by accident. Okay whoops haha there we go now both strong and weak should work. --- code/modules/reagents/chemistry/holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index f683324105..9dd9efa3a2 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -1112,7 +1112,7 @@ if(percent < minimum_percent) continue var/intensity_desc = "a hint of" - if(percent <= minimum_percent * 3 || percent == 100) + if(percent >= minimum_percent * 2 && percent <= minimum_percent * 3 || percent == 100) intensity_desc = "" else if(percent > minimum_percent * 3) // CITCHANGE - food now tasty intensity_desc = "the strong flavor of" From d011a7a3d9a59d68dbebc35ff8b63332d6c10812 Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Wed, 18 Dec 2019 19:35:36 +0100 Subject: [PATCH 6/7] oh hey macros. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit slightly less ugly ™ --- code/modules/reagents/chemistry/holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 9dd9efa3a2..41b6aa87d9 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -1112,7 +1112,7 @@ if(percent < minimum_percent) continue var/intensity_desc = "a hint of" - if(percent >= minimum_percent * 2 && percent <= minimum_percent * 3 || percent == 100) + if(ISINRANGE(percent, minimum_percent * 2, minimum_percent * 3)|| percent == 100) intensity_desc = "" else if(percent > minimum_percent * 3) // CITCHANGE - food now tasty intensity_desc = "the strong flavor of" From 21c77cbdf160afca787c15b97ec92ccee11af05e Mon Sep 17 00:00:00 2001 From: B1gb3ast Date: Wed, 18 Dec 2019 23:36:32 +0100 Subject: [PATCH 7/7] modular man bad. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit now mörge this so chefs can make delicious dish, hemk. --- code/modules/reagents/chemistry/holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 41b6aa87d9..d540cd02fe 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -1114,7 +1114,7 @@ var/intensity_desc = "a hint of" if(ISINRANGE(percent, minimum_percent * 2, minimum_percent * 3)|| percent == 100) intensity_desc = "" - else if(percent > minimum_percent * 3) // CITCHANGE - food now tasty + else if(percent > minimum_percent * 3) intensity_desc = "the strong flavor of" if(intensity_desc != "") out += "[intensity_desc] [taste_desc]"