diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
index a898c1866b..5c78a0c321 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -190,4 +190,4 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = 0
+ resistance_flags = NONE
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 2fdd800d6d..a867b7568c 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -21,7 +21,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
storage_slots = 21
- resistance_flags = 0
+ resistance_flags = NONE
max_integrity = 300
/*
@@ -147,7 +147,7 @@
desc = "It's a special backpack made exclusively for Nanotrasen officers."
icon_state = "captainpack"
item_state = "captainpack"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/industrial
name = "industrial backpack"
@@ -179,7 +179,7 @@
desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
icon_state = "toxpack"
item_state = "toxpack"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/virology
name = "virology backpack"
@@ -202,7 +202,7 @@
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
icon_state = "satchel"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/satchel/leather/withwallet/PopulateContents()
new /obj/item/storage/wallet/random(src)
@@ -212,7 +212,7 @@
desc = "A tough satchel with extra pockets."
icon_state = "satchel-eng"
item_state = "engiepack"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/satchel/med
name = "medical satchel"
@@ -243,7 +243,7 @@
desc = "Useful for holding research materials."
icon_state = "satchel-tox"
item_state = "satchel-tox"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/satchel/hyd
name = "botanist satchel"
@@ -268,7 +268,7 @@
desc = "An exclusive satchel for Nanotrasen officers."
icon_state = "satchel-cap"
item_state = "captainpack"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/satchel/flat
name = "smuggler's satchel"
@@ -335,7 +335,7 @@
desc = "A large duffel bag for holding extra captainly goods."
icon_state = "duffel-captain"
item_state = "duffel-captain"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/duffelbag/med
name = "medical duffel bag"
@@ -383,7 +383,7 @@
desc = "A large duffel bag for holding extra tools and supplies."
icon_state = "duffel-eng"
item_state = "duffel-eng"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/storage/backpack/duffelbag/drone
name = "drone duffel bag"
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 25c67b2713..698491c98f 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -939,7 +939,7 @@
card_throw_speed = 3
card_throw_range = 7
card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
- resistance_flags = 0
+ resistance_flags = NONE
/*
* Fake nuke
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 1041df9ec3..ef1d377831 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -3,6 +3,7 @@
icon = 'icons/obj/janitor.dmi'
lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+<<<<<<< HEAD
desc = "This is rubbish."
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
@@ -79,4 +80,82 @@
/obj/item/trash/coal/burn()
visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
new /obj/item/ore/diamond(loc)
+=======
+ desc = "This is rubbish."
+ w_class = WEIGHT_CLASS_TINY
+ resistance_flags = FLAMMABLE
+
+/obj/item/trash/raisins
+ name = "\improper 4no raisins"
+ icon_state= "4no_raisins"
+
+/obj/item/trash/candy
+ name = "candy"
+ icon_state= "candy"
+
+/obj/item/trash/cheesie
+ name = "cheesie honkers"
+ icon_state = "cheesie_honkers"
+
+/obj/item/trash/chips
+ name = "chips"
+ icon_state = "chips"
+
+/obj/item/trash/popcorn
+ name = "popcorn"
+ icon_state = "popcorn"
+
+/obj/item/trash/sosjerky
+ name = "\improper Scaredy's Private Reserve Beef Jerky"
+ icon_state = "sosjerky"
+
+/obj/item/trash/syndi_cakes
+ name = "syndi-cakes"
+ icon_state = "syndi_cakes"
+
+/obj/item/trash/waffles
+ name = "waffles tray"
+ icon_state = "waffles"
+
+/obj/item/trash/plate
+ name = "plate"
+ icon_state = "plate"
+ resistance_flags = NONE
+
+/obj/item/trash/pistachios
+ name = "pistachios pack"
+ icon_state = "pistachios_pack"
+
+/obj/item/trash/semki
+ name = "semki pack"
+ icon_state = "semki_pack"
+
+/obj/item/trash/tray
+ name = "tray"
+ icon_state = "tray"
+ resistance_flags = NONE
+
+/obj/item/trash/candle
+ name = "candle"
+ icon = 'icons/obj/candle.dmi'
+ icon_state = "candle4"
+
+/obj/item/trash/can
+ name = "crushed can"
+ icon_state = "cola"
+ resistance_flags = NONE
+
+/obj/item/trash/attack(mob/M, mob/living/user)
+ return
+
+/obj/item/trash/coal
+ name = "lump of coal"
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "slag"
+ desc = "Someone's gotten on the naughty list."
+
+/obj/item/trash/coal/burn()
+ visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
+ new /obj/item/ore/diamond(loc)
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 18ad4eb769..a5562e3ded 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -12,7 +12,7 @@
var/max_integrity = 500
var/integrity_failure = 0 //0 if we have no special broken behavior
- var/resistance_flags = 0 // INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF
+ var/resistance_flags = NONE // INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF
var/can_be_hit = TRUE //can this be bludgeoned by items?
var/acid_level = 0 //how much acid is on that obj
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 4250f66e51..9ad24d1cdb 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -45,7 +45,7 @@
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = FALSE
- resistance_flags = 0
+ resistance_flags = NONE
var/foldabletype = /obj/item/roller
/obj/structure/bed/roller/attackby(obj/item/W, mob/user, params)
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 513d0a16f3..6c1c0392b3 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -6,7 +6,7 @@
anchored = TRUE
can_buckle = 1
buckle_lying = 0 //you sit in a chair, not lay
- resistance_flags = 0
+ resistance_flags = NONE
max_integrity = 250
integrity_failure = 25
var/buildstacktype = /obj/item/stack/sheet/metal
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 1676ac9df8..2eff5fe25a 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -64,7 +64,7 @@
icon_state = "metalbox"
max_integrity = 500
mob_storage_capacity = 5
- resistance_flags = 0
+ resistance_flags = NONE
move_speed_multiplier = 2
cutting_tool = /obj/item/weldingtool
open_sound = 'sound/machines/click.ogg'
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 2494da0c23..ef1c38a52a 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -205,8 +205,8 @@
desc = "It's a plain jumpsuit. It has a small dial on the wrist."
origin_tech = "syndicate=2"
sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle??
- random_sensor = 0
- resistance_flags = 0
+ random_sensor = FALSE
+ resistance_flags = NONE
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -235,8 +235,12 @@
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
+<<<<<<< HEAD
origin_tech = "syndicate=2"
resistance_flags = 0
+=======
+ resistance_flags = NONE
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -257,8 +261,12 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
item_state = "meson"
+<<<<<<< HEAD
origin_tech = "syndicate=2"
resistance_flags = 0
+=======
+ resistance_flags = NONE
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -280,7 +288,7 @@
icon_state = "yellow"
item_state = "ygloves"
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -302,7 +310,7 @@
icon_state = "greysoft"
item_color = "grey"
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -338,7 +346,7 @@
desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
icon_state = "gas_alt"
item_state = "gas_alt"
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
flags_1 = BLOCK_GAS_SMOKE_EFFECT_1 | MASKINTERNALS_1
@@ -392,8 +400,12 @@
desc = "A pair of black shoes."
permeability_coefficient = 0.05
flags_1 = NOSLIP_1
+<<<<<<< HEAD
origin_tech = "syndicate=2"
resistance_flags = 0
+=======
+ resistance_flags = NONE
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
pockets = /obj/item/storage/internal/pocket/shoes
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 1263c07a91..1405e633cc 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -7,7 +7,7 @@
slot_flags = SLOT_EYES
strip_delay = 20
equip_delay_other = 25
- resistance_flags = 0
+ resistance_flags = NONE
materials = list(MAT_GLASS = 250)
var/vision_flags = 0
var/darkness_view = 2//Base human is 2
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index a55b498e0b..98c5710029 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -6,7 +6,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.5
item_color="yellow"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
@@ -16,7 +16,7 @@
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.5
item_color="yellow"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/gloves/color/fyellow/New()
..()
@@ -40,7 +40,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = 0
+ resistance_flags = NONE
var/can_be_cut = 1
/obj/item/clothing/gloves/color/black/hos
@@ -77,8 +77,13 @@
name = "insulated gloves"
desc = "These gloves will protect the wearer from electric shock."
siemens_coefficient = 0
+<<<<<<< HEAD
permeability_coefficient = 0.5
resistance_flags = 0
+=======
+ permeability_coefficient = 0.05
+ resistance_flags = NONE
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
@@ -165,7 +170,7 @@
permeability_coefficient = 0.1
item_color="white"
transfer_prints = TRUE
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/gloves/color/latex/nitrile
name = "nitrile gloves"
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 03cba84d4f..97afd78c38 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -21,7 +21,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 30)
/obj/item/clothing/gloves/combat
@@ -36,7 +36,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 50)
@@ -53,5 +53,5 @@
cold_protection = ARMS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 15, bullet = 35, laser = 35, energy = 20, bomb = 35, bio = 35, rad = 35, fire = 0, acid = 0)
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 67ce9ea370..90c0690534 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -71,7 +71,7 @@
desc = "A collectable welding helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/head/collectable/slime
name = "collectable slime hat"
@@ -143,7 +143,7 @@
desc = "Go Red! I mean Green! I mean Red! No Green!"
icon_state = "thunderdome"
item_state = "thunderdome"
- resistance_flags = 0
+ resistance_flags = NONE
flags_inv = HIDEHAIR
/obj/item/clothing/head/collectable/swat
@@ -151,5 +151,5 @@
desc = "That's not real blood. That's red paint." //Reference to the actual description
icon_state = "swat"
item_state = "swat"
- resistance_flags = 0
+ resistance_flags = NONE
flags_inv = HIDEHAIR
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index da4fe1cf5c..5691dbb782 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -10,7 +10,7 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 60
- resistance_flags = 0
+ resistance_flags = NONE
flags_cover = HEADCOVERSEYES
flags_inv = HIDEHAIR
flags_2 = BANG_PROTECT_2
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index e7b3473251..9f09783df2 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -234,7 +234,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/head/santa
name = "santa hat"
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 39099fb1a2..03a0470a95 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -12,7 +12,7 @@
actions_types = list(/datum/action/item_action/adjust)
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/mask/breath/attack_self(mob/user)
adjustmask(user)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index b4bb836075..7d15afc4e3 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -9,7 +9,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
- resistance_flags = 0
+ resistance_flags = NONE
// **** Welding gas mask ****
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index d086139ee8..663cdf2941 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -22,7 +22,7 @@
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
armor = list(melee = 25, bullet = 25, laser = 25, energy = 25, bomb = 50, bio = 10, rad = 0, fire = 70, acid = 50)
strip_delay = 70
- resistance_flags = 0
+ resistance_flags = NONE
permeability_coefficient = 0.05 //Thick soles, and covers the ankle
pockets = /obj/item/storage/internal/pocket/shoes
@@ -61,7 +61,7 @@
slowdown = SHOES_SLOWDOWN+1
strip_delay = 50
equip_delay_other = 50
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 40, acid = 75)
/obj/item/clothing/shoes/galoshes/dry
@@ -103,7 +103,7 @@
item_color = "hosred"
strip_delay = 50
equip_delay_other = 50
- resistance_flags = 0
+ resistance_flags = NONE
permeability_coefficient = 0.05 //Thick soles, and covers the ankle
pockets = /obj/item/storage/internal/pocket/shoes
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index 32caa3adf4..f9a53a1551 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -19,7 +19,7 @@
strip_delay = 50
equip_delay_other = 50
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
- resistance_flags = 0
+ resistance_flags = NONE
dog_fashion = null
/obj/item/clothing/suit/space
@@ -42,4 +42,4 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
strip_delay = 80
equip_delay_other = 80
- resistance_flags = 0
\ No newline at end of file
+ resistance_flags = NONE
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index b1fcfb1e89..7cbdb46f55 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,7 +8,7 @@
strip_delay = 60
equip_delay_other = 40
max_integrity = 250
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
/obj/item/clothing/suit/armor/Initialize()
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 7c45bb6192..21725f7722 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -115,8 +115,14 @@
icon_state = "hazard"
item_state = "hazard"
blood_overlay_type = "armor"
+<<<<<<< HEAD
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/t_scanner, /obj/item/device/radio)
resistance_flags = 0
+=======
+ allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/device/t_scanner, /obj/item/device/radio)
+ resistance_flags = NONE
+
+>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
//Lawyer
/obj/item/clothing/suit/toggle/lawyer
name = "blue suit jacket"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 1f8c37fe6d..a5135222d0 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -16,7 +16,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/gun/energy/laser/bluetag)
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/suit/redtag
name = "red laser tag armor"
@@ -26,7 +26,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/gun/energy/laser/redtag)
- resistance_flags = 0
+ resistance_flags = NONE
/*
* Costume
@@ -95,7 +95,7 @@
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/suit/hastur
name = "\improper Hastur's robe"
@@ -365,7 +365,7 @@
desc = "Pompadour not included."
icon_state = "leatherjacket"
item_state = "hostrench"
- resistance_flags = 0
+ resistance_flags = NONE
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/device/radio)
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index c70c4f341c..10c1a47ac1 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -68,7 +68,7 @@
strip_delay = 70
equip_delay_other = 70
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/suit/bomb_suit
@@ -90,7 +90,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
strip_delay = 70
equip_delay_other = 70
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/head/bomb_hood/security
@@ -125,7 +125,7 @@
strip_delay = 60
equip_delay_other = 60
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/head/radiation/ComponentInitialize()
. = ..()
@@ -147,7 +147,7 @@
strip_delay = 60
equip_delay_other = 60
flags_inv = HIDEJUMPSUIT
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/suit/radiation/ComponentInitialize()
. = ..()
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 33eeb03c7e..43da19896b 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -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.
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 9c90768ead..b985e37bf2 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -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
\ No newline at end of file
+ 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 fabulous."
+ 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)
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index f7a1cd480d..4e7f0da011 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -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 hardcore 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
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index adad1aedb5..186043ff85 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -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
\ No newline at end of file
+ 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)
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index d80b7ddba3..553424de71 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -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
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 48df3be335..0fdb155526 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -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
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 994db7381b..2a73a40d72 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -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
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 19c32ec3ed..917c6d3cb4 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -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)
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 1464c4a684..67ef30f0cc 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -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"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 9c1fc9bdd1..0db0ea11e9 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -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
\ No newline at end of file
+ can_adjust = FALSE
diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm
index 9e52e47281..e4069a7fad 100644
--- a/code/modules/clothing/under/trek.dm
+++ b/code/modules/clothing/under/trek.dm
@@ -2,7 +2,7 @@
/obj/item/clothing/under/trek
- can_adjust = 0
+ can_adjust = FALSE
//TOS
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 478c08e89f..72e3621131 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -12,7 +12,7 @@
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
possible_transfer_amounts = list(5,10,15,20,25,30,50)
volume = 50
- resistance_flags = 0
+ resistance_flags = NONE
var/isGlass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
/obj/item/reagent_containers/food/drinks/on_reagent_change()
@@ -378,7 +378,7 @@
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
w_class = WEIGHT_CLASS_SMALL
- resistance_flags = 0
+ resistance_flags = NONE
isGlass = FALSE
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 14c31c293a..4e2e88c06d 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -243,7 +243,7 @@
flags_1 = OPENCONTAINER_1
flags_inv = HIDEHAIR
slot_flags = SLOT_HEAD
- resistance_flags = 0
+ resistance_flags = NONE
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 75, acid = 50) //Weak melee protection, because you can wear it on your head
slot_equipment_priority = list( \
slot_back, slot_wear_id,\