diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 9de43a9c398e..17b4a6a0ac33 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -124,6 +124,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
#define JOB_GENERAL "USCM General"
#define JOB_ACMC "Assistant Commandant of the Marine Corps"
#define JOB_CMC "Commandant of the Marine Corps"
+#define JOB_SQUAD_TECH "Reconnaissance Support Technician"
// Used to add a timelock to a job. Will be passed onto derivatives
#define AddTimelock(Path, timelockList) \
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index cf6d6c64d9a9..2ab36d51d297 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -105,6 +105,7 @@
#define INTERRUPT_ALL_OUT_OF_RANGE (INTERRUPT_ALL & (~INTERRUPT_DIFF_TURF)|INTERRUPT_OUT_OF_RANGE)
#define INTERRUPT_MOVED (INTERRUPT_DIFF_LOC|INTERRUPT_DIFF_TURF|INTERRUPT_RESIST)
#define INTERRUPT_NO_NEEDHAND (INTERRUPT_ALL & (~INTERRUPT_NEEDHAND))
+#define INTERRUPT_NO_FLOORED (INTERRUPT_ALL & (~INTERRUPT_KNOCKED_DOWN))
#define INTERRUPT_INCAPACITATED (INTERRUPT_UNCONSCIOUS|INTERRUPT_KNOCKED_DOWN|INTERRUPT_STUNNED|INTERRUPT_RESIST)
#define INTERRUPT_CLICK (INTERRUPT_LCLICK|INTERRUPT_RCLICK|INTERRUPT_SHIFTCLICK|INTERRUPT_ALTCLICK|INTERRUPT_CTRLCLICK|INTERRUPT_MIDDLECLICK|INTERRUPT_RESIST)
diff --git a/code/datums/emergency_calls/forecon.dm b/code/datums/emergency_calls/forecon.dm
index 98e6a1c27ec2..94336b9ffa53 100644
--- a/code/datums/emergency_calls/forecon.dm
+++ b/code/datums/emergency_calls/forecon.dm
@@ -2,7 +2,7 @@
name = "FORECON (Squad)"
arrival_message = "A Force Reconnaissance squad has been dispatched to your ship. Stand by."
objectives = "Handle whatever threat is present. Further orders may be provided."
- home_base = /datum/lazy_template/ert/weyland_station
+ home_base = /datum/lazy_template/ert/uscm_station
probability = 0
mob_min = 3
mob_max = 6
diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm
index f7c49321f305..0df37c2f0c3c 100644
--- a/code/datums/factions/uscm.dm
+++ b/code/datums/factions/uscm.dm
@@ -30,6 +30,7 @@
if(JOB_MARINE_RAIDER) marine_rk = "soc"
if(JOB_MARINE_RAIDER_SL) marine_rk = "soctl"
if(JOB_MARINE_RAIDER_CMD) marine_rk = "soccmd"
+ if(JOB_SQUAD_TECH) marine_rk = "tech"
if(squad.squad_leader == current_human)
switch(squad.squad_type)
if("Squad") marine_rk = "leader_a"
@@ -87,6 +88,8 @@
if(JOB_GENERAL, JOB_COLONEL, JOB_ACMC, JOB_CMC)
marine_rk = "general"
border_rk = "command"
+ if(JOB_SQUAD_TECH)
+ marine_rk = "tech"
if(JOB_INTEL)
marine_rk = "io"
if(JOB_CAS_PILOT)
diff --git a/code/game/jobs/job/special/uscm.dm b/code/game/jobs/job/special/uscm.dm
index 751322539f77..934241fdca8a 100644
--- a/code/game/jobs/job/special/uscm.dm
+++ b/code/game/jobs/job/special/uscm.dm
@@ -14,3 +14,6 @@
title = JOB_RIOT
/datum/job/special/uscm/riot/chief
title = JOB_RIOT_CHIEF
+
+/datum/job/special/uscm/tech
+ title = JOB_SQUAD_TECH
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
deleted file mode 100644
index 44bd9907c15d..000000000000
--- a/code/game/machinery/Beacon.dm
+++ /dev/null
@@ -1,54 +0,0 @@
-/obj/structure/machinery/bluespace_beacon
-
- icon = 'icons/obj/objects.dmi'
- icon_state = "floor_beaconf"
- name = "Bluespace Gigabeacon"
- desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
- level = 1 // underfloor
- layer = UNDERFLOOR_OBJ_LAYER
- anchored = TRUE
- use_power = USE_POWER_IDLE
- idle_power_usage = 0
- var/obj/item/device/radio/beacon/Beacon
-
-/obj/structure/machinery/bluespace_beacon/Initialize(mapload, ...)
- . = ..()
- var/turf/T = loc
- Beacon = new /obj/item/device/radio/beacon
- Beacon.invisibility = INVISIBILITY_MAXIMUM
- Beacon.forceMove(T)
-
- hide(T.intact_tile)
-
-/obj/structure/machinery/bluespace_beacon/Destroy()
- QDEL_NULL(Beacon)
- return ..()
-
-/obj/structure/machinery/bluespace_beacon/hide(intact)
- // update the invisibility and icon
- invisibility = intact ? 101 : 0
- updateicon()
-
- // update the icon_state
-/obj/structure/machinery/bluespace_beacon/proc/updateicon()
- var/state="floor_beacon"
-
- if(invisibility)
- icon_state = "[state]f"
-
- else
- icon_state = "[state]"
-
-/obj/structure/machinery/bluespace_beacon/process()
- if(!Beacon)
- var/turf/T = loc
- Beacon = new /obj/item/device/radio/beacon
- Beacon.invisibility = INVISIBILITY_MAXIMUM
- Beacon.forceMove(T)
- if(Beacon)
- if(Beacon.loc != loc)
- Beacon.forceMove(loc)
-
- updateicon()
-
-
diff --git a/code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm b/code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm
new file mode 100644
index 000000000000..69261115ecaa
--- /dev/null
+++ b/code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm
@@ -0,0 +1,84 @@
+//------------ CL CLOTHING VENDOR---------------
+
+GLOBAL_LIST_INIT(cm_vending_clothing_dress_corporate_liaison, list(
+ list("SUITS AND UNDERSHIRTS", 0, null, null, null),
+ list("Black Suit Pants", 0, /obj/item/clothing/under/liaison_suit/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
+ list("Blue Suit Pants", 0, /obj/item/clothing/under/liaison_suit/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Brown Suit Pants", 0, /obj/item/clothing/under/liaison_suit/brown, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("White Suit Pants", 0, /obj/item/clothing/under/liaison_suit/corporate_formal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Liaison's Tan Suit", 0, /obj/item/clothing/under/liaison_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Liaison's Charcoal Suit", 0, /obj/item/clothing/under/liaison_suit/charcoal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Liaison's White Suit", 0, /obj/item/clothing/under/liaison_suit/formal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Liaison's Blue Blazer", 0, /obj/item/clothing/under/liaison_suit/blazer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Liaison's Suspenders", 0, /obj/item/clothing/under/liaison_suit/suspenders, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Liaison's Skirt", 0, /obj/item/clothing/under/blackskirt, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Trainee's Uniform", 0, /obj/item/clothing/under/suit_jacket/trainee, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Country Club Outfit", 0, /obj/item/clothing/under/liaison_suit/ivy, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Orange Outfit", 0, /obj/item/clothing/under/liaison_suit/orange, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Corporate Casual", 0, /obj/item/clothing/under/liaison_suit/field, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Grey Workwear", 0, /obj/item/clothing/under/colonist/workwear, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Khaki Workwear", 0, /obj/item/clothing/under/colonist/workwear/khaki, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Pink Workwear", 0, /obj/item/clothing/under/colonist/workwear/pink, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Green Workwear", 0, /obj/item/clothing/under/colonist/workwear/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+
+ list("SUIT", 0, null, null, null),
+ list("Black Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+ list("Khaki Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Brown Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Blue Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Formal Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/formal, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Grey Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Red Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber/red, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Khaki Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Brown Bomber Jacket", 0, /obj/item/clothing/suit/storage/bomber, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Black Bomber Jacket", 0, /obj/item/clothing/suit/storage/bomber/alt, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Liaison's Winter Coat", 0, /obj/item/clothing/suit/storage/snow_suit/liaison, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Grey Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest/grey, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Brown Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Tan Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest/tan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+
+ list("TIES", 0, null, null, null),
+ list("Black Tie", 0, /obj/item/clothing/accessory/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
+ list("Red Tie", 0, /obj/item/clothing/accessory/red, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Purple Tie", 0, /obj/item/clothing/accessory/purple, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Blue Tie", 0, /obj/item/clothing/accessory/blue, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Green Tie", 0, /obj/item/clothing/accessory/green, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Gold Tie", 0, /obj/item/clothing/accessory/gold, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Special Tie", 0, /obj/item/clothing/accessory/horrible, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+
+ list("GLASSES", 0, null, null, null),
+ list("BiMex Shades", 0, /obj/item/clothing/glasses/sunglasses/big, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED),
+ list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("Prescription Sunglasses", 0, /obj/item/clothing/glasses/sunglasses/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("Prescription Glasses", 0, /obj/item/clothing/glasses/regular/hipster, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+
+ list("GLOVES", 0, null, null, null),
+ list("Black Gloves", 0, /obj/item/clothing/gloves/black, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_RECOMMENDED),
+ list("Dress Gloves", 0, /obj/item/clothing/gloves/marine/dress, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR),
+
+ list("SHOES", 0, null, null, null),
+ list("Laceup Shoes, Black", 0, /obj/item/clothing/shoes/laceup, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_RECOMMENDED),
+ list("Laceup Shoes, Brown", 0, /obj/item/clothing/shoes/laceup/brown, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR),
+ list("Sneakers, Black", 0, /obj/item/clothing/shoes/black, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR),
+ list("Corporate Boots", 0, /obj/item/clothing/shoes/marine/corporate, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR),
+
+ list("HATS", 0, null, null, null),
+ list("Black Beret", 0, /obj/item/clothing/head/beret/cm/black/civilian, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("White Beret", 0, /obj/item/clothing/head/beret/cm/white/civilian, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+
+))
+
+/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison
+ name = "\improper Corporate Liaison's Personal Wardrobe"
+ desc = "A wardrobe containing all the clothes an executive would ever need."
+ icon_state = "wardrobe_vendor"
+ vendor_theme = VENDOR_THEME_USCM
+ show_points = FALSE
+ req_access = list()
+ vendor_role = list(JOB_CORPORATE_LIAISON, JOB_SURVIVOR, JOB_TRAINEE, JOB_JUNIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE_SPECIALIST, JOB_EXECUTIVE_SUPERVISOR, JOB_ASSISTANT_MANAGER, JOB_DIVISION_MANAGER, JOB_CHIEF_EXECUTIVE, JOB_DIRECTOR, JOB_WY_GOON_RESEARCHER)
+
+/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison/get_listed_products(mob/user)
+ return GLOB.cm_vending_clothing_dress_corporate_liaison
diff --git a/code/game/objects/items/handheld_distress_beacon.dm b/code/game/objects/items/handheld_distress_beacon.dm
index 73c9415dbfad..a6152b648c63 100644
--- a/code/game/objects/items/handheld_distress_beacon.dm
+++ b/code/game/objects/items/handheld_distress_beacon.dm
@@ -89,3 +89,13 @@
recipient = "the Corporate Security Division"
ert_paths = list(/datum/emergency_call/goon/bodyguard) // "Weyland-Yutani Goon (Executive Bodyguard Detail)"
ert_short_names = list("SEND BODYGUARD")
+
+// Provost office distress beacon held by Inspectors+
+/obj/item/handheld_distress_beacon/provost
+ name = "\improper Provost Office handheld beacon"
+ desc = "A standard Provost Office beacon branded with the Provost Office symbol, provided to personnel for emergencies. It features an extended relay antenna and calls a squadron of Provost enforcers."
+
+ beacon_type = "Provost Enforcers beacon"
+ recipient = "the USS Superintendent"
+ ert_paths = list(/datum/emergency_call/provost_enforcer) // "USCM Provost Enforcers"
+ ert_short_names = list("SEND ENFORCERS")
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 14961c69eaf5..139d90ff33ce 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -320,6 +320,29 @@
new /obj/item/storage/pill_bottle/imidazoline(src)
new /obj/item/storage/pill_bottle/alkysine(src)
+/obj/item/storage/belt/medical/lifesaver/full/forecon/fill_preset_inventory()
+ new /obj/item/storage/pill_bottle/bicaridine(src)
+ new /obj/item/storage/pill_bottle/bicaridine(src)
+ new /obj/item/storage/pill_bottle/kelotane(src)
+ new /obj/item/storage/pill_bottle/kelotane(src)
+ new /obj/item/storage/pill_bottle/tramadol(src)
+ new /obj/item/storage/pill_bottle/tramadol(src)
+ new /obj/item/storage/pill_bottle/antitox(src)
+ new /obj/item/storage/pill_bottle/alkysine(src)
+ new /obj/item/storage/pill_bottle/imidazoline(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/dexalinp(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src)
+ new /obj/item/device/healthanalyzer(src)
+
/obj/item/storage/belt/medical/lifesaver/upp
name = "\improper Type 41 pattern lifesaver bag"
desc = "The Type 41 load rig is the standard load-bearing equipment of the UPP military. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies, and is common among medics."
diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm
index a4c4925fba2c..a29bf97cacd3 100644
--- a/code/game/objects/items/tools/kitchen_tools.dm
+++ b/code/game/objects/items/tools/kitchen_tools.dm
@@ -135,6 +135,42 @@
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+/*
+ * Plastic Pizza Cutter
+ */
+/obj/item/tool/kitchen/pizzacutter
+ name = "pizza cutter"
+ icon_state = "plasticpizzacutter"
+ desc = "A circular blade used for cutting pizzas. This one has a cheap plastic handle."
+ flags_atom = FPRINT|CONDUCT
+ sharp = IS_SHARP_ITEM_ACCURATE
+ edge = TRUE
+ force = 10
+ w_class = SIZE_MEDIUM
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ throwforce = 6
+ throw_speed = SPEED_VERY_FAST
+ throw_range = 6
+ matter = list("metal" = 12000)
+
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/*
+ * Wood Pizza Cutter
+ */
+/obj/item/tool/kitchen/pizzacutter/wood
+ icon_state = "woodpizzacutter"
+ desc = "A circular blade used for cutting pizzas. This one has an authentic wooden handle."
+
+/*
+ * Holy Relic Pizza Cutter
+ */
+/obj/item/tool/kitchen/pizzacutter/holyrelic
+ name = "\improper PIZZA TIME"
+ icon_state = "holyrelicpizzacutter"
+ desc = "Before you is a holy relic of a bygone era when the great Pizza Lords reigned supreme. You know either that or it's just a big damn pizza cutter."
+ force = MELEE_FORCE_VERY_STRONG
+
/*
* Bucher's cleaver
*/
diff --git a/code/game/objects/items/toys/cards.dm b/code/game/objects/items/toys/cards.dm
index f63efd61a615..89aea51bb8c0 100644
--- a/code/game/objects/items/toys/cards.dm
+++ b/code/game/objects/items/toys/cards.dm
@@ -266,6 +266,7 @@
icon = 'icons/obj/items/playing_cards.dmi'
icon_state = "empty"
w_class = SIZE_TINY
+ flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB
var/concealed = FALSE
var/pile_state = FALSE
diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm
index ce1bb2ded072..b1aca8db29b4 100644
--- a/code/game/objects/items/weapons/blades.dm
+++ b/code/game/objects/items/weapons/blades.dm
@@ -138,17 +138,6 @@
throwforce = MELEE_FORCE_STRONG
edge = 1
-
-/obj/item/weapon/pizza_cutter
- name = "\improper PIZZA TIME"
- icon = 'icons/obj/items/weapons/weapons.dmi'
- icon_state = "pizza_cutter"
- item_state = "pizza_cutter"
- desc = "Before you is a holy relic of a bygone era when the great Pizza Lords reigned supreme. You know either that or it's just a big damn pizza cutter."
- sharp = IS_SHARP_ITEM_ACCURATE
- force = MELEE_FORCE_VERY_STRONG
- edge = 1
-
///For digging shrapnel out of OTHER people, not yourself. Triggered by human/attackby() so target is definitely human. User might not be.
/obj/item/proc/dig_out_shrapnel_check(mob/living/carbon/human/target, mob/living/carbon/human/user)
if(user.a_intent == INTENT_HELP && (target == user || skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC))) //Squad medics and above, or yourself
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 88605cb3b792..44d1e0a8bd0b 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -221,8 +221,8 @@
flags_equip_slot = SLOT_EYES|SLOT_FACE
/obj/item/clothing/glasses/regular/hipster
- name = "Sunglasses"
- desc = "They cut the sun and keep things fun. Why would you ever wear these indoors, or on a night operation. Are you trying to get yourself hurt?"
+ name = "Prescription Glasses"
+ desc = "Boring glasses, makes you look smart and potentially reputable."
icon_state = "hipster_glasses"
item_state = "hipster_glasses"
flags_equip_slot = SLOT_EYES|SLOT_FACE
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
index 86527457bfce..7e1c1d8d08d2 100644
--- a/code/modules/clothing/head/head.dm
+++ b/code/modules/clothing/head/head.dm
@@ -88,6 +88,16 @@
name = "USCM Squad Beret"
desc = "For those who want to show pride and have nothing to lose (in their head, at least)."
+/obj/item/clothing/head/beret/cm/white/civilian
+ name = "White Beret"
+ desc = "A nice fashionable beret, popular with executives."
+ icon_state = "s_beret"
+
+/obj/item/clothing/head/beret/cm/black/civilian
+ name = "Black Beret"
+ desc = "A nice fashionable beret, popular with executives."
+ icon_state = "beret_black"
+
/obj/item/clothing/head/beret/cm/squadberet/equipped(mob/user, slot)
. = ..()
self_set()
diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm
index 7855075c2fb4..937416943958 100644
--- a/code/modules/clothing/shoes/marine_shoes.dm
+++ b/code/modules/clothing/shoes/marine_shoes.dm
@@ -163,6 +163,8 @@
/obj/item/clothing/shoes/marine/corporate
name = "rugged boots"
desc = "These synth-leather boots seem high quality when first worn, but quickly detoriate, especially in the environments the corporate security members these are issued to operate in. Still, better than nothing."
+
+/obj/item/clothing/shoes/marine/corporate/knife
spawn_item_type = /obj/item/attachable/bayonet
/obj/item/clothing/shoes/marine/ress
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 1a49dc7fe10f..91ae13958e46 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -141,6 +141,7 @@
icon_state = "laceups"
/obj/item/clothing/shoes/laceup/brown
+ name = "brown laceup shoes"
icon_state = "laceups_brown"
/obj/item/clothing/shoes/swimmingfins
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index 0d5fc31a2560..7ac0ddc018fa 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -10,6 +10,10 @@
pockets.max_storage_space = 4
flags_atom |= USES_HEARING
+/obj/item/clothing/suit/storage/Destroy()
+ QDEL_NULL(pockets)
+ return ..()
+
/obj/item/clothing/suit/storage/get_pockets()
if(pockets)
return pockets
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index 74cb5ea552ee..52635c63600a 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -840,7 +840,7 @@
worn_state = "liaison_formal"
/obj/item/clothing/under/liaison_suit/suspenders
- name = "liaison's attire"
+ name = "liaison's suspenders"
desc = "A collared shirt, complimented by a pair of suspenders. Worn by Weyland-Yutani employees who ask the tough questions. Smells faintly of cigars and bad acting."
icon_state = "liaison_suspenders"
worn_state = "liaison_suspenders"
@@ -863,6 +863,12 @@
icon_state = "corporate_ivy"
worn_state = "corporate_ivy"
+/obj/item/clothing/under/liaison_suit/orange
+ name = "orange outfit"
+ desc = "A pair of black pants paired with a very Wey-Yu orange shirt. A popular look with those in the corporate world that conduct the majority of their business from Weyland Yutani offices."
+ icon_state = "corporate_orange"
+ worn_state = "corporate_orange"
+
/obj/item/clothing/under/liaison_suit/corporate_formal
name = "white suit pants"
desc = "A pair of ivory slacks paired with a white shirt. A popular pairing for formal corporate events."
diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm
index e534997ddd42..f8f2e61b8a37 100644
--- a/code/modules/cm_marines/Donator_Items.dm
+++ b/code/modules/cm_marines/Donator_Items.dm
@@ -244,11 +244,12 @@
icon_state = "tristan_armor"
item_state = "tristan_armor"
-/obj/item/clothing/suit/storage/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
- name = "Legion Armor"
- desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM."
- item_state = "ncrjacket"
- icon_state = "ncrjacket"
+/obj/item/clothing/suit/storage/marine/light/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
+ name = "M3 Ranger Armor"
+ desc = "A set of M3 Pattern Ranger Armor, There probably are not many of these laying around. DONOR ITEM."
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
+ icon_state = "rangerarmor"
+ item_state = "rangerarmor"
/obj/item/clothing/suit/storage/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Armor"
@@ -470,18 +471,6 @@
icon_state = "medicae_armor_u"
item_state = "medicae_armor_u"
-/obj/item/clothing/suit/storage/marine/fluff/Sanctum_heavy
- name = "Sanctum Founder Armor"
- desc = "Personal Armor of the Founder of Sanctum Team. It looks more like a Exosuit. Unique DONOR ITEM" //Add UNIQUE if Unique
- icon_state = "Sanctum_Heavy_u"
- item_state = "Sanctum_Heavy_u"
-
-/obj/item/clothing/suit/storage/marine/fluff/Sanctum_medium
- name = "Sanctum Standard Armor"
- desc = "The Standard Issue Armor for Sanctum Operatives Unique DONOR ITEM"
- icon_state = "Sanctum_Medium_u"
- item_state = "Sanctum_Medium_u"
-
/obj/item/clothing/suit/storage/marine/fluff/dudewithatude
name = "Rainbow Coat"
desc = "Powered by the magic of FRIENDSHIP. (Can be toggled opened or closed) UNIQUE DONOR ITEM"
@@ -656,6 +645,13 @@
icon_state = "hecuhelm_u"
desc = "A combat helmet, bearing the scars of many battles. UNIQUE DONOR ITEM"
+/obj/item/clothing/head/helmet/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
+ name = "M3 Ranger Helmet"
+ desc = "A M3 Ranger helmet, probably not many of these laying around. DONOR ITEM"
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
+ icon_state = "rangerhelmet"
+ item_state = "rangerhelmet"
+
/obj/item/clothing/head/helmet/marine/fluff/officialjake
name = "Timothy's Beret"
desc = "A fancy red beret owned by Timothy Seidner. DONOR ITEM"
@@ -912,14 +908,6 @@
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR
-/obj/item/clothing/head/helmet/marine/fluff/Sanctum_helmet
- name = "Sanctum Combat Helmet"
- desc = " The Standard Issue helmet of Sanctum Team. DONOR ITEM" //Add UNIQUE if Unique
- icon_state = "Sanctum_Helm_u"
- item_state = "Sanctum_Helm_u"
- flags_inventory = BLOCKSHARPOBJ
- flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR
-
/obj/item/clothing/head/helmet/marine/fluff/dingledangle
name = "Rusty's Cap"
desc = "A little old and shabby. The color has slightly faded over time. DONOR ITEM"
@@ -998,13 +986,6 @@
worn_state = "camojump"
flags_jumpsuit = FALSE
-/obj/item/clothing/under/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
- name = "Legion Suit"
- desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM."
- icon_state = "ncr_uni"
- worn_state = "ncr_uni"
- flags_jumpsuit = FALSE
-
/obj/item/clothing/under/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Uniform"
desc = "A uniform, of a famous Earth warrior... Donor Item"
@@ -1207,13 +1188,6 @@
worn_state = "medicae_jumpsuit_u"
flags_jumpsuit = FALSE
-/obj/item/clothing/under/marine/fluff/sanctum_uniform //NO USER
- name = "Sanctum Fatigues"
- desc = "Fatigues with Kevlar fibers for a bit more protection than most clothing. UNIQUE DONOR ITEM"
- icon_state = "Sanctum_u"
- worn_state = "Sanctum_u"
- flags_jumpsuit = FALSE
-
/obj/item/clothing/under/marine/fluff/sailordave //CKEY=sailordave
name = "Eden USCM uniform"
desc = "An older model USCM uniform. UNIQUE DONOR ITEM"
@@ -1244,16 +1218,6 @@
item_state = "revanmask"
icon_state = "revanmask"
-
-/obj/item/clothing/mask/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
- name = "Legion Mask"
- desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM."
- icon_override = 'icons/mob/humans/onmob/mask.dmi'
- item_state = "officer_mask"
- icon_state = "officer_mask"
- flags_inventory = COVERMOUTH|ALLOWREBREATH
- flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR
-
/obj/item/clothing/mask/fluff/totalanarchy //CKEY=totalanarchy
name = "PMC Mask"
desc = "A white colored PMC Mask. DONOR ITEM."
@@ -1373,6 +1337,13 @@
item_state = "securitypack"
has_gamemode_skin = FALSE //same sprite for all gamemodes.
+/obj/item/storage/backpack/marine/satchel/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
+ name = "M3 Armored Pack"
+ desc = "Plenty of pouches and pockets. DONOR ITEM"
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
+ icon_state = "skinnerrangerpack"
+ item_state = "skinnerrangerpack"
+
/obj/item/clothing/glasses/fluff/alexwarhammer
name = "Black Jack's Dank Shades"
desc = "+20 Badass points. Donor item"
diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm
index 01acf638c2cd..8b352340e55a 100644
--- a/code/modules/cm_marines/Donator_Kits.dm
+++ b/code/modules/cm_marines/Donator_Kits.dm
@@ -436,9 +436,9 @@
donor_key = "sasoperative"
kit_variant = "Legion"
donor_gear = list(
- /obj/item/clothing/suit/storage/marine/fluff/sas_legion,
- /obj/item/clothing/under/marine/fluff/sas_legion,
- /obj/item/clothing/mask/fluff/sas_legion,
+ /obj/item/clothing/suit/storage/marine/light/fluff/sas_legion,
+ /obj/item/clothing/head/helmet/marine/fluff/sas_legion,
+ /obj/item/storage/backpack/marine/satchel/fluff/sas_legion,
)
/obj/item/storage/box/donator_kit/seloc_aferah
diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm
index 9e688037860b..d84cf766c4fc 100644
--- a/code/modules/gear_presets/corpses.dm
+++ b/code/modules/gear_presets/corpses.dm
@@ -706,7 +706,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
@@ -731,7 +731,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
diff --git a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm
index eb04cbd5a94e..6db2882ddf82 100644
--- a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm
+++ b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm
@@ -33,7 +33,7 @@
add_random_kutjevo_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET)
..()
/datum/equipment_preset/survivor/doctor/kutjevo
diff --git a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm b/code/modules/gear_presets/survivors/lv_624/preset_lv.dm
index a56432b80b89..462075142698 100644
--- a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm
+++ b/code/modules/gear_presets/survivors/lv_624/preset_lv.dm
@@ -86,7 +86,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET)
..()
/datum/equipment_preset/survivor/corporate/lv
diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm
index f0cf368d4936..a6ed27cbb91a 100644
--- a/code/modules/gear_presets/survivors/misc.dm
+++ b/code/modules/gear_presets/survivors/misc.dm
@@ -185,7 +185,7 @@ Everything below isn't used or out of place.
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm
index 65e5a8f4c123..d90d31ef3880 100644
--- a/code/modules/gear_presets/survivors/survivors.dm
+++ b/code/modules/gear_presets/survivors/survivors.dm
@@ -18,6 +18,74 @@
var/survivor_variant = CIVILIAN_SURVIVOR
+ dress_under = list(
+ /obj/item/clothing/under/liaison_suit/black,
+ /obj/item/clothing/under/liaison_suit/blue,
+ /obj/item/clothing/under/liaison_suit/brown,
+ /obj/item/clothing/under/liaison_suit/corporate_formal,
+ /obj/item/clothing/under/liaison_suit,
+ /obj/item/clothing/under/liaison_suit/charcoal,
+ /obj/item/clothing/under/liaison_suit/formal,
+ /obj/item/clothing/under/liaison_suit/blazer,
+ /obj/item/clothing/under/liaison_suit/suspenders,
+ /obj/item/clothing/under/blackskirt,
+ /obj/item/clothing/under/suit_jacket/trainee,
+ /obj/item/clothing/under/liaison_suit/ivy,
+ /obj/item/clothing/under/liaison_suit/orange,
+ /obj/item/clothing/under/liaison_suit/field,
+ /obj/item/clothing/under/colonist/workwear,
+ /obj/item/clothing/under/colonist/workwear/khaki,
+ /obj/item/clothing/under/colonist/workwear/pink,
+ /obj/item/clothing/under/colonist/workwear/green,
+ )
+ dress_over = list(
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/brown,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/blue,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/red,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber,
+ /obj/item/clothing/suit/storage/bomber,
+ /obj/item/clothing/suit/storage/bomber/alt,
+ /obj/item/clothing/suit/storage/snow_suit/liaison,
+ /obj/item/clothing/suit/storage/labcoat,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/vest,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/tan,
+ /obj/item/clothing/suit/storage/webbing,
+ )
+ dress_extra = list(
+ /obj/item/clothing/accessory/black,
+ /obj/item/clothing/accessory/red,
+ /obj/item/clothing/accessory/purple,
+ /obj/item/clothing/accessory/blue,
+ /obj/item/clothing/accessory/green,
+ /obj/item/clothing/accessory/gold,
+ /obj/item/clothing/accessory/horrible,
+ /obj/item/clothing/glasses/sunglasses/big,
+ /obj/item/clothing/glasses/sunglasses/aviator,
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/clothing/glasses/sunglasses/prescription,
+ /obj/item/clothing/glasses/regular/hipster,
+ )
+ dress_gloves = list(
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/gloves/marine/dress,
+ )
+ dress_shoes = list(
+ /obj/item/clothing/shoes/laceup,
+ /obj/item/clothing/shoes/laceup/brown,
+ /obj/item/clothing/shoes/black,
+ /obj/item/clothing/shoes/marine/corporate,
+ )
+ dress_hat = list(
+ /obj/item/clothing/head/fedora,
+ /obj/item/clothing/head/beret/cm/black/civilian,
+ /obj/item/clothing/head/beret/cm/white/civilian,
+ )
+
/datum/equipment_preset/survivor/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
diff --git a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm
index 100f83518565..3c9926de69aa 100644
--- a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm
+++ b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm
@@ -17,7 +17,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET)
..()
/datum/equipment_preset/survivor/colonial_marshal/trijent
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index dbd8149c7866..96ebb63d3089 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -323,6 +323,7 @@
new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon/provost(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human), WEAR_IN_JACKET)
@@ -372,6 +373,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon/provost(new_human.back), WEAR_IN_BACK)
/datum/equipment_preset/uscm_event/provost/marshal/sector
name = "Provost Sector Marshal (MO7)"
diff --git a/code/modules/gear_presets/uscm_forecon.dm b/code/modules/gear_presets/uscm_forecon.dm
index 65328e8513f5..3c1db85291ea 100644
--- a/code/modules/gear_presets/uscm_forecon.dm
+++ b/code/modules/gear_presets/uscm_forecon.dm
@@ -20,31 +20,6 @@
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
-/datum/equipment_preset/uscm/forecon/load_gear(mob/living/carbon/human/new_human)
- var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
- var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
- var/obj/item/clothing/accessory/ranks/marine/e5/pin = new()
- var/obj/item/clothing/accessory/patch/patch_uscm = new()
- var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new()
- uniform.attach_accessory(new_human,pouch)
- uniform.attach_accessory(new_human,patch_uscm)
- uniform.attach_accessory(new_human,pin)
- uniform.attach_accessory(new_human,patch_forecon)
- new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/recon(new_human), WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY)
- new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY)
- new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
- new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
- new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/forecon(new_human), WEAR_L_EAR)
- GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human)
-
/datum/equipment_preset/uscm/forecon/proc/add_forecon_weapon(mob/living/carbon/human/new_human)
var/random_gun = rand(1,3)
switch(random_gun)
@@ -75,6 +50,16 @@
if (9)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
+/datum/equipment_preset/uscm/forecon/proc/spawn_random_tech_headgear(mob/living/carbon/human/new_human)
+ var/i = rand(1,4)
+ switch(i)
+ if (1 , 2)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
+ if (3 , 4)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic/white(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES)
+
/datum/equipment_preset/uscm/forecon/proc/add_forecon_weapon_pistol(mob/living/carbon/human/new_human)
var/random_pistol = rand(1,5)
switch(random_pistol)
@@ -106,8 +91,33 @@
minimap_icon = ""
skills = /datum/skills/military/survivor/forecon_standard
+/datum/equipment_preset/uscm/forecon/standard/load_gear(mob/living/carbon/human/new_human)
+ var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
+ var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
+ var/obj/item/clothing/accessory/ranks/marine/e5/pin = new()
+ var/obj/item/clothing/accessory/patch/patch_uscm = new()
+ var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new()
+ uniform.attach_accessory(new_human,pouch)
+ uniform.attach_accessory(new_human,patch_uscm)
+ uniform.attach_accessory(new_human,pin)
+ uniform.attach_accessory(new_human,patch_forecon)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/recon(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/forecon(new_human), WEAR_L_EAR)
+ GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human)
+
/datum/equipment_preset/uscm/forecon/standard/load_gear(mob/living/carbon/human/new_human)
..()
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
spawn_random_headgear(new_human)
add_forecon_weapon_pistol(new_human)
add_forecon_weapon(new_human)
@@ -115,25 +125,44 @@
/datum/equipment_preset/uscm/forecon/tech
name = "USCM Reconnaissance Support Technician"
assignment = JOB_FORECON_SUPPORT
- rank = JOB_SQUAD_MEDIC
+ rank = JOB_SQUAD_TECH
role_comm_title = "SuppTech"
minimap_icon = "engi"
skills = /datum/skills/military/survivor/forecon_techician
/datum/equipment_preset/uscm/forecon/tech/load_gear(mob/living/carbon/human/new_human)
- new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/big(new_human), WEAR_BACK)
+ var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
+ var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
+ var/obj/item/clothing/accessory/ranks/marine/e5/pin = new()
+ var/obj/item/clothing/accessory/patch/patch_uscm = new()
+ var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new()
+ uniform.attach_accessory(new_human,pouch)
+ uniform.attach_accessory(new_human,patch_uscm)
+ uniform.attach_accessory(new_human,pin)
+ uniform.attach_accessory(new_human,patch_forecon)
+ new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS)
- new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES)
- ..()
- new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/big(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full(new_human), WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/forecon(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool , WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/recon(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/forecon(new_human), WEAR_L_EAR)
+ GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human)
+
add_forecon_weapon(new_human)
- spawn_random_headgear(new_human)
+ spawn_random_tech_headgear(new_human)
/datum/equipment_preset/uscm/forecon/marksman
name = "USCM Reconnaissance Designated Marksman"
@@ -154,10 +183,11 @@
uniform.attach_accessory(new_human,pin)
uniform.attach_accessory(new_human,patch_forecon)
new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/M3S, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/scout_cloak(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
@@ -165,8 +195,6 @@
new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
- new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/forecon(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra_custom/tactical(new_human), WEAR_L_HAND)
@@ -199,6 +227,7 @@
uniform.attach_accessory(new_human,pin)
uniform.attach_accessory(new_human,patch_forecon)
new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
@@ -243,13 +272,29 @@
uniform.attach_accessory(new_human,patch_uscm)
uniform.attach_accessory(new_human,pin)
uniform.attach_accessory(new_human,patch_forecon)
+
new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical(new_human), WEAR_R_HAND)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/recon(new_human), WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/forecon(new_human), WEAR_L_EAR)
+ GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human)
+
+
+
..()
add_forecon_weapon_pistol(new_human)
spawn_random_headgear(new_human)
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index ba4a8a684321..38a07f8ee874 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -53,22 +53,73 @@
minimap_icon = "cl"
minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN
- utility_under = list(/obj/item/clothing/under/liaison_suit/black)
- utility_hat = list()
- utility_gloves = list()
- utility_shoes = list(/obj/item/clothing/shoes/laceup)
- utility_extra = list(/obj/item/clothing/under/liaison_suit/blue)
-
- service_under = list(/obj/item/clothing/under/liaison_suit/field)
- service_over = list()
- service_hat = list()
- service_shoes = list(/obj/item/clothing/shoes/laceup)
-
- dress_under = list(/obj/item/clothing/under/liaison_suit/corporate_formal)
- dress_over = list()
- dress_hat = list()
- dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
- dress_shoes = list(/obj/item/clothing/shoes/laceup)
+ dress_under = list(
+ /obj/item/clothing/under/liaison_suit/black,
+ /obj/item/clothing/under/liaison_suit/blue,
+ /obj/item/clothing/under/liaison_suit/brown,
+ /obj/item/clothing/under/liaison_suit/corporate_formal,
+ /obj/item/clothing/under/liaison_suit,
+ /obj/item/clothing/under/liaison_suit/charcoal,
+ /obj/item/clothing/under/liaison_suit/formal,
+ /obj/item/clothing/under/liaison_suit/blazer,
+ /obj/item/clothing/under/liaison_suit/suspenders,
+ /obj/item/clothing/under/blackskirt,
+ /obj/item/clothing/under/suit_jacket/trainee,
+ /obj/item/clothing/under/liaison_suit/ivy,
+ /obj/item/clothing/under/liaison_suit/orange,
+ /obj/item/clothing/under/liaison_suit/field,
+ /obj/item/clothing/under/colonist/workwear,
+ /obj/item/clothing/under/colonist/workwear/khaki,
+ /obj/item/clothing/under/colonist/workwear/pink,
+ /obj/item/clothing/under/colonist/workwear/green,
+ )
+ dress_over = list(
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/brown,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/blue,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/red,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber,
+ /obj/item/clothing/suit/storage/bomber,
+ /obj/item/clothing/suit/storage/bomber/alt,
+ /obj/item/clothing/suit/storage/snow_suit/liaison,
+ /obj/item/clothing/suit/storage/labcoat,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/vest,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/tan,
+ /obj/item/clothing/suit/storage/webbing,
+ )
+ dress_extra = list(
+ /obj/item/clothing/accessory/black,
+ /obj/item/clothing/accessory/red,
+ /obj/item/clothing/accessory/purple,
+ /obj/item/clothing/accessory/blue,
+ /obj/item/clothing/accessory/green,
+ /obj/item/clothing/accessory/gold,
+ /obj/item/clothing/accessory/horrible,
+ /obj/item/clothing/glasses/sunglasses/big,
+ /obj/item/clothing/glasses/sunglasses/aviator,
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/clothing/glasses/sunglasses/prescription,
+ /obj/item/clothing/glasses/regular/hipster,
+ )
+ dress_gloves = list(
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/gloves/marine/dress,
+ )
+ dress_shoes = list(
+ /obj/item/clothing/shoes/laceup,
+ /obj/item/clothing/shoes/laceup/brown,
+ /obj/item/clothing/shoes/black,
+ /obj/item/clothing/shoes/marine/corporate,
+ )
+ dress_hat = list(
+ /obj/item/clothing/head/fedora,
+ /obj/item/clothing/head/beret/cm/black/civilian,
+ /obj/item/clothing/head/beret/cm/white/civilian,
+ )
/datum/equipment_preset/uscm_ship/liaison/New()
. = ..()
diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm
index 75349115b47c..6cfccab00036 100644
--- a/code/modules/gear_presets/wy.dm
+++ b/code/modules/gear_presets/wy.dm
@@ -10,6 +10,74 @@
languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
var/headset_type = /obj/item/device/radio/headset/distress/WY
+ dress_under = list(
+ /obj/item/clothing/under/liaison_suit/black,
+ /obj/item/clothing/under/liaison_suit/blue,
+ /obj/item/clothing/under/liaison_suit/brown,
+ /obj/item/clothing/under/liaison_suit/corporate_formal,
+ /obj/item/clothing/under/liaison_suit,
+ /obj/item/clothing/under/liaison_suit/charcoal,
+ /obj/item/clothing/under/liaison_suit/formal,
+ /obj/item/clothing/under/liaison_suit/blazer,
+ /obj/item/clothing/under/liaison_suit/suspenders,
+ /obj/item/clothing/under/blackskirt,
+ /obj/item/clothing/under/suit_jacket/trainee,
+ /obj/item/clothing/under/liaison_suit/ivy,
+ /obj/item/clothing/under/liaison_suit/orange,
+ /obj/item/clothing/under/liaison_suit/field,
+ /obj/item/clothing/under/colonist/workwear,
+ /obj/item/clothing/under/colonist/workwear/khaki,
+ /obj/item/clothing/under/colonist/workwear/pink,
+ /obj/item/clothing/under/colonist/workwear/green,
+ )
+ dress_over = list(
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/brown,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/blue,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/red,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber,
+ /obj/item/clothing/suit/storage/bomber,
+ /obj/item/clothing/suit/storage/bomber/alt,
+ /obj/item/clothing/suit/storage/snow_suit/liaison,
+ /obj/item/clothing/suit/storage/labcoat,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/vest,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/tan,
+ /obj/item/clothing/suit/storage/webbing,
+ )
+ dress_extra = list(
+ /obj/item/clothing/accessory/black,
+ /obj/item/clothing/accessory/red,
+ /obj/item/clothing/accessory/purple,
+ /obj/item/clothing/accessory/blue,
+ /obj/item/clothing/accessory/green,
+ /obj/item/clothing/accessory/gold,
+ /obj/item/clothing/accessory/horrible,
+ /obj/item/clothing/glasses/sunglasses/big,
+ /obj/item/clothing/glasses/sunglasses/aviator,
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/clothing/glasses/sunglasses/prescription,
+ /obj/item/clothing/glasses/regular/hipster,
+ )
+ dress_gloves = list(
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/gloves/marine/dress,
+ )
+ dress_shoes = list(
+ /obj/item/clothing/shoes/laceup,
+ /obj/item/clothing/shoes/laceup/brown,
+ /obj/item/clothing/shoes/black,
+ /obj/item/clothing/shoes/marine/corporate,
+ )
+ dress_hat = list(
+ /obj/item/clothing/head/fedora,
+ /obj/item/clothing/head/beret/cm/black/civilian,
+ /obj/item/clothing/head/beret/cm/white/civilian,
+ )
+
/datum/equipment_preset/wy/New()
. = ..()
access += get_access(ACCESS_LIST_WY_BASE)
diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm
index c67f82176c93..a15e9b443302 100644
--- a/code/modules/gear_presets/wy_goons.dm
+++ b/code/modules/gear_presets/wy_goons.dm
@@ -70,7 +70,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
@@ -104,7 +104,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, WEAR_EYES)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
@@ -141,7 +141,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
@@ -167,12 +167,80 @@
paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0)
skills = /datum/skills/researcher
+ dress_under = list(
+ /obj/item/clothing/under/liaison_suit/black,
+ /obj/item/clothing/under/liaison_suit/blue,
+ /obj/item/clothing/under/liaison_suit/brown,
+ /obj/item/clothing/under/liaison_suit/corporate_formal,
+ /obj/item/clothing/under/liaison_suit,
+ /obj/item/clothing/under/liaison_suit/charcoal,
+ /obj/item/clothing/under/liaison_suit/formal,
+ /obj/item/clothing/under/liaison_suit/blazer,
+ /obj/item/clothing/under/liaison_suit/suspenders,
+ /obj/item/clothing/under/blackskirt,
+ /obj/item/clothing/under/suit_jacket/trainee,
+ /obj/item/clothing/under/liaison_suit/ivy,
+ /obj/item/clothing/under/liaison_suit/orange,
+ /obj/item/clothing/under/liaison_suit/field,
+ /obj/item/clothing/under/colonist/workwear,
+ /obj/item/clothing/under/colonist/workwear/khaki,
+ /obj/item/clothing/under/colonist/workwear/pink,
+ /obj/item/clothing/under/colonist/workwear/green,
+ )
+ dress_over = list(
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/brown,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/blue,
+ /obj/item/clothing/suit/storage/jacket/marine/corporate/black,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber/red,
+ /obj/item/clothing/suit/storage/jacket/marine/bomber,
+ /obj/item/clothing/suit/storage/bomber,
+ /obj/item/clothing/suit/storage/bomber/alt,
+ /obj/item/clothing/suit/storage/snow_suit/liaison,
+ /obj/item/clothing/suit/storage/labcoat,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/grey,
+ /obj/item/clothing/suit/storage/jacket/marine/vest,
+ /obj/item/clothing/suit/storage/jacket/marine/vest/tan,
+ /obj/item/clothing/suit/storage/webbing,
+ )
+ dress_extra = list(
+ /obj/item/clothing/accessory/black,
+ /obj/item/clothing/accessory/red,
+ /obj/item/clothing/accessory/purple,
+ /obj/item/clothing/accessory/blue,
+ /obj/item/clothing/accessory/green,
+ /obj/item/clothing/accessory/gold,
+ /obj/item/clothing/accessory/horrible,
+ /obj/item/clothing/glasses/sunglasses/big,
+ /obj/item/clothing/glasses/sunglasses/aviator,
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/clothing/glasses/sunglasses/prescription,
+ /obj/item/clothing/glasses/regular/hipster,
+ )
+ dress_gloves = list(
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/gloves/marine/dress,
+ )
+ dress_shoes = list(
+ /obj/item/clothing/shoes/laceup,
+ /obj/item/clothing/shoes/laceup/brown,
+ /obj/item/clothing/shoes/black,
+ /obj/item/clothing/shoes/marine/corporate,
+ )
+ dress_hat = list(
+ /obj/item/clothing/head/fedora,
+ /obj/item/clothing/head/beret/cm/black/civilian,
+ /obj/item/clothing/head/beret/cm/white/civilian,
+ )
+
/datum/equipment_preset/goon/researcher/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science, WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat, WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon, WEAR_IN_BACK)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 3adb5c53f299..993042a14a2b 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -512,7 +512,7 @@
last_special = world.time + 100
visible_message(SPAN_DANGER("[src] attempts to unbuckle themself!"),\
SPAN_DANGER("You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"))
- if(do_after(src, 1200, INTERRUPT_ALL^INTERRUPT_RESIST, BUSY_ICON_HOSTILE))
+ if(do_after(src, 1200, INTERRUPT_NO_FLOORED^INTERRUPT_RESIST, BUSY_ICON_HOSTILE))
if(!buckled)
return
visible_message(SPAN_DANGER("[src] manages to unbuckle themself!"),\
diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm
index 1c2adc2360a3..180dfac18a9e 100644
--- a/code/modules/projectiles/guns/revolvers.dm
+++ b/code/modules/projectiles/guns/revolvers.dm
@@ -314,7 +314,7 @@
var/folded = FALSE // Used for the stock attachment, to check if we can shoot or not
/obj/item/weapon/gun/revolver/m44/set_gun_attachment_offsets()
- attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 21,"rail_x" = 12, "rail_y" = 23, "under_x" = 21, "under_y" = 18, "stock_x" = 16, "stock_y" = 20)
+ attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 21,"rail_x" = 12, "rail_y" = 23, "under_x" = 21, "under_y" = 16, "stock_x" = 16, "stock_y" = 20)
/obj/item/weapon/gun/revolver/m44/set_gun_config_values()
..()
diff --git a/colonialmarines.dme b/colonialmarines.dme
index b2980e9431dd..ecbc10e5d850 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -844,7 +844,6 @@
#include "code\game\machinery\air_alarm.dm"
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\autolathe_datums.dm"
-#include "code\game\machinery\Beacon.dm"
#include "code\game\machinery\biohazard_lockdown.dm"
#include "code\game\machinery\bioprinter.dm"
#include "code\game\machinery\buttons.dm"
@@ -999,6 +998,7 @@
#include "code\game\machinery\vending\vendor_types\antag\antag_guns_sorted.dm"
#include "code\game\machinery\vending\vendor_types\crew\combat_correspondent.dm"
#include "code\game\machinery\vending\vendor_types\crew\commanding_officer.dm"
+#include "code\game\machinery\vending\vendor_types\crew\corporate_liaison.dm"
#include "code\game\machinery\vending\vendor_types\crew\engineering.dm"
#include "code\game\machinery\vending\vendor_types\crew\medical.dm"
#include "code\game\machinery\vending\vendor_types\crew\mp.dm"
diff --git a/html/changelogs/AutoChangeLog-pr-6887.yml b/html/changelogs/AutoChangeLog-pr-6887.yml
new file mode 100644
index 000000000000..b10add111481
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6887.yml
@@ -0,0 +1,6 @@
+author: "SASoperative"
+delete-after: True
+changes:
+ - code_imp: "Updated donator items"
+ - imageadd: "Added new donator sprites"
+ - imagedel: "Removed old unused sprites"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-6933.yml b/html/changelogs/AutoChangeLog-pr-6933.yml
deleted file mode 100644
index 5d349a08bda7..000000000000
--- a/html/changelogs/AutoChangeLog-pr-6933.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Zonespace27"
-delete-after: True
-changes:
- - bugfix: "Fixed heavy sniper spec opening up the wrong specialist slot on admin cryo"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-6984.yml b/html/changelogs/AutoChangeLog-pr-6984.yml
new file mode 100644
index 000000000000..76697a87a73f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6984.yml
@@ -0,0 +1,5 @@
+author: "dongwaiver"
+delete-after: True
+changes:
+ - imageadd: "new m44 revolver sprites"
+ - imagedel: "old m44 revolver sprites"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-6985.yml b/html/changelogs/AutoChangeLog-pr-6985.yml
new file mode 100644
index 000000000000..16559844bd0d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6985.yml
@@ -0,0 +1,5 @@
+author: "AmoryBlaine"
+delete-after: True
+changes:
+ - imageadd: "Imports TWE sprites from downstream"
+ - imageadd: "Imports mime & cowboy boots"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
index 011fae2f62c8..add055c7b7ed 100644
--- a/html/changelogs/archive/2024-08.yml
+++ b/html/changelogs/archive/2024-08.yml
@@ -232,3 +232,41 @@
cuberound:
- bugfix: two persons are needed to activate red, ert and emergency acces using
cards
+2024-08-18:
+ Zonespace27:
+ - bugfix: Fixed heavy sniper spec opening up the wrong specialist slot on admin
+ cryo
+ cuberound:
+ - rscdel: removes bluespace beacon
+2024-08-19:
+ Asmocard:
+ - qol: Playing cards no longer take a storage slot from your helmet, they take a
+ vanity slot now.
+ Vandujr:
+ - rscadd: Added a new 'Corporate Liaison's Wardrobe' that all corporate roles can
+ use. includes more clothes than the cabinet originally had.
+ - rscadd: Added a new orange outfit the CL can pick from his Wardrobe Vendor.
+ - rscadd: Added civilian black and white berets.
+ - refactor: Refactored the corporate boots, making a version with and without a
+ knife in it on spawn. All roles that should have the knife version, have it.
+ - imageadd: Added new item sprites to the old 'complete' suits; that being the tan
+ and formal suits, aswell as the suspenders.
+ - imageadd: Added a new item sprite for the black beret, in line with the rest of
+ the modern berets.
+ - maptweak: Swapped the CL's cabinet for the wardrobe vendor.
+ zzzmike:
+ - bugfix: lets you resist when bucklecuffed to bed
+2024-08-21:
+ Mensla:
+ - rscadd: Added new pizza cutter sprites.
+ Steelpoint:
+ - rscadd: Force reconnaissance response teams will now use the USS Kurtz as their
+ home base when departing from the USS Almayer on their response shuttle.
+ - balance: The ERT Forecon Medic/Engineer spawn has been reworked into the 'Reconnaissance
+ Support Technician' to better reflect its design as a combination of a Corpsman
+ and a Comtech.
+ - rscadd: Per the above, the Support Tech now spawns with a unique and full lifesaver
+ belt and some form of a medical visor.
+ - imageadd: The Support Tech has a unique HUD icon to better denote its role.
+ Waseemq1235:
+ - rscadd: Adds handheld Enforcer squad distress beacons for Provost Inspectors+
diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi
index def6cdd56a0e..53cc3a327d11 100644
Binary files a/icons/mob/hud/marine_hud.dmi and b/icons/mob/hud/marine_hud.dmi differ
diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi
index 84bdbb6ff26a..8937592c7887 100644
Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ
diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi
index 453f2e9e2b2d..31c0e9865696 100644
Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ
diff --git a/icons/mob/humans/onmob/feet.dmi b/icons/mob/humans/onmob/feet.dmi
index fdf6a4a40e80..63943633de92 100644
Binary files a/icons/mob/humans/onmob/feet.dmi and b/icons/mob/humans/onmob/feet.dmi differ
diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi
index 4a4338eac4c2..862953a27be3 100644
Binary files a/icons/mob/humans/onmob/head_0.dmi and b/icons/mob/humans/onmob/head_0.dmi differ
diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi
index 696ab464252d..f178b88abf36 100644
Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ
diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi
index d9535b796dda..434765ed34fd 100644
Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ
diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi
index a245e89b6c48..5be50a08fd8e 100644
Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ
diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi
index 737b59f6c4af..db5514a0f3b8 100644
Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ
diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi
index 85266a2077ac..37663f2ddf86 100644
Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ
diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi
index 2dd645697684..c957814e9f3b 100644
Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ
diff --git a/icons/mob/humans/onmob/uniform_1.dmi b/icons/mob/humans/onmob/uniform_1.dmi
index 89500b39a596..34a85bae0e1e 100644
Binary files a/icons/mob/humans/onmob/uniform_1.dmi and b/icons/mob/humans/onmob/uniform_1.dmi differ
diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi
index 99240596a9da..f4151b592e76 100644
Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ
diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi
index e26ee644d638..ff405cbf5e8e 100644
Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ
diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi
index 923a26b55c20..318ff118a922 100644
Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ
diff --git a/icons/obj/items/clothing/donor/HEAD.dmi b/icons/obj/items/clothing/donor/HEAD.dmi
index 3116bdef26b6..23a29f5a2a58 100644
Binary files a/icons/obj/items/clothing/donor/HEAD.dmi and b/icons/obj/items/clothing/donor/HEAD.dmi differ
diff --git a/icons/obj/items/clothing/donor/SUITS.dmi b/icons/obj/items/clothing/donor/SUITS.dmi
index fc0c9987b9d4..e6e4ffef14e5 100644
Binary files a/icons/obj/items/clothing/donor/SUITS.dmi and b/icons/obj/items/clothing/donor/SUITS.dmi differ
diff --git a/icons/obj/items/clothing/donor/Sanctum Uniforms.dmi b/icons/obj/items/clothing/donor/Sanctum Uniforms.dmi
deleted file mode 100644
index 87e9a4c94b1d..000000000000
Binary files a/icons/obj/items/clothing/donor/Sanctum Uniforms.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/UNIFORM.dmi b/icons/obj/items/clothing/donor/UNIFORM.dmi
index 2e0cd816dfed..5c43f7503a46 100644
Binary files a/icons/obj/items/clothing/donor/UNIFORM.dmi and b/icons/obj/items/clothing/donor/UNIFORM.dmi differ
diff --git a/icons/obj/items/clothing/hats.dmi b/icons/obj/items/clothing/hats.dmi
index 3e2a1dcfc243..45e09ebf7eaa 100644
Binary files a/icons/obj/items/clothing/hats.dmi and b/icons/obj/items/clothing/hats.dmi differ
diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi
index 41e6be7e89b9..cdb81b742d78 100644
Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ
diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi
index e444d7a5a40a..d08183faf920 100644
Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ
diff --git a/icons/obj/items/kitchen_tools.dmi b/icons/obj/items/kitchen_tools.dmi
index 625d992f014c..572053258961 100644
Binary files a/icons/obj/items/kitchen_tools.dmi and b/icons/obj/items/kitchen_tools.dmi differ
diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi
index 1f0b98967a25..a22810024717 100644
Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ
diff --git a/icons/obj/items/weapons/weapons.dmi b/icons/obj/items/weapons/weapons.dmi
index aa99545cb577..6c5f4ad34509 100644
Binary files a/icons/obj/items/weapons/weapons.dmi and b/icons/obj/items/weapons/weapons.dmi differ
diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi
index 3098aadca8be..ba45e612ca22 100644
Binary files a/icons/obj/structures/machinery/vending.dmi and b/icons/obj/structures/machinery/vending.dmi differ
diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm
index 8b840ec4ec8c..f9816fe31821 100644
--- a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm
@@ -249,7 +249,7 @@
/area/template_noop)
"K" = (
/obj/structure/closet/secure_closet/freezer/fridge/full,
-/obj/item/weapon/pizza_cutter,
+/obj/item/tool/kitchen/pizzacutter,
/turf/open/floor/prison/kitchen,
/area/template_noop)
"L" = (
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 2764da8aaa78..079067d7938a 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -2461,10 +2461,10 @@
icon_state = "SE-out"
},
/obj/structure/machinery/door_control{
+ access_modified = 1;
id = "OTStore";
name = "Shutters";
pixel_y = -24;
- access_modified = 1;
req_one_access_txt = "35"
},
/obj/structure/surface/rack,
@@ -3293,12 +3293,12 @@
/obj/structure/machinery/faxmachine/uscm/command,
/obj/item/device/megaphone,
/obj/structure/machinery/computer/cameras/almayer_brig{
- dir = 8;
desc = "Used to access the various cameras in the security brig.";
+ dir = 8;
+ layer = 2.99;
name = "brig cameras console";
- pixel_y = 12;
pixel_x = 17;
- layer = 2.99
+ pixel_y = 12
},
/turf/open/floor/almayer/plate,
/area/almayer/command/cic)
@@ -12176,8 +12176,8 @@
/area/almayer/hallways/lower/starboard_midship_hallway)
"bMg" = (
/obj/structure/pipes/vents/pump/no_boom/gas{
- vent_tag = "Synth Bay";
- dir = 8
+ dir = 8;
+ vent_tag = "Synth Bay"
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -16114,8 +16114,8 @@
desc = "A pneumatic delivery unit.";
icon_state = "delivery_engi";
name = "Returns";
- pixel_y = 28;
- pixel_x = 25
+ pixel_x = 25;
+ pixel_y = 28
},
/obj/structure/surface/rack,
/turf/open/floor/almayer/aicore/no_build,
@@ -16407,54 +16407,10 @@
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
"cOY" = (
-/obj/item/clothing/under/blackskirt{
- desc = "A stylish skirt, in a business-black and red colour scheme.";
- name = "liaison's skirt"
- },
-/obj/item/clothing/under/suit_jacket/charcoal{
- desc = "A professional black suit and blue tie. A combination popular among government agents and corporate Yes-Men alike.";
- name = "liaison's black suit"
- },
-/obj/item/clothing/under/suit_jacket/navy{
- desc = "A navy suit and red tie, intended for the Almayer's finest. And accountants.";
- name = "liaison's navy suit"
- },
-/obj/item/clothing/under/suit_jacket/trainee,
-/obj/item/clothing/under/liaison_suit/charcoal,
-/obj/item/clothing/under/liaison_suit/blazer,
-/obj/item/clothing/suit/storage/snow_suit/liaison,
-/obj/item/clothing/gloves/black,
-/obj/item/clothing/gloves/marine/dress,
-/obj/item/clothing/glasses/sunglasses/big,
-/obj/item/clothing/accessory/blue,
-/obj/item/clothing/accessory/red,
/obj/structure/machinery/status_display{
pixel_x = -32
},
-/obj/item/clothing/accessory/black,
-/obj/item/clothing/accessory/green,
-/obj/item/clothing/accessory/gold,
-/obj/item/clothing/accessory/purple,
-/obj/item/clothing/under/liaison_suit/corporate_formal,
-/obj/item/clothing/under/liaison_suit/field,
-/obj/item/clothing/under/liaison_suit/ivy,
-/obj/item/clothing/under/liaison_suit/blue,
-/obj/item/clothing/under/liaison_suit/brown,
-/obj/item/clothing/under/liaison_suit/black,
-/obj/item/clothing/suit/storage/jacket/marine/vest,
-/obj/item/clothing/suit/storage/jacket/marine/vest/grey,
-/obj/item/clothing/suit/storage/jacket/marine/vest/tan,
-/obj/item/clothing/suit/storage/jacket/marine/bomber,
-/obj/item/clothing/suit/storage/jacket/marine/bomber/red,
-/obj/item/clothing/suit/storage/jacket/marine/bomber/grey,
-/obj/item/clothing/suit/storage/jacket/marine/corporate,
-/obj/item/clothing/suit/storage/jacket/marine/corporate/black,
-/obj/item/clothing/suit/storage/jacket/marine/corporate/blue,
-/obj/item/clothing/suit/storage/jacket/marine/corporate/brown,
-/obj/item/clothing/suit/storage/jacket/marine/corporate/formal,
-/obj/structure/closet/cabinet{
- storage_capacity = 35
- },
+/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison,
/turf/open/floor/wood/ship,
/area/almayer/command/corporateliaison)
"cPg" = (
@@ -17730,8 +17686,8 @@
/obj/structure/machinery/door_control{
id = "ARES JoeCryo";
name = "ARES WorkingJoe Bay Shutters";
- req_one_access_txt = "91;92";
- pixel_x = 24
+ pixel_x = 24;
+ req_one_access_txt = "91;92"
},
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
autoname = 0;
@@ -18019,9 +17975,9 @@
layer = 3.3
},
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
autoname = 0;
- c_tag = "AI - Secondary Processors"
+ c_tag = "AI - Secondary Processors";
+ dir = 8
},
/turf/open/floor/almayer/aicore/no_build/ai_floor2,
/area/almayer/command/airoom)
@@ -19567,10 +19523,10 @@
req_one_access_txt = "90;91;92"
},
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 4;
- pixel_y = -8;
autoname = 0;
- c_tag = "AI - Main Staircase"
+ c_tag = "AI - Main Staircase";
+ dir = 4;
+ pixel_y = -8
},
/obj/effect/step_trigger/clone_cleaner,
/turf/open/floor/almayer/aicore/no_build/ai_silver/west,
@@ -19832,8 +19788,8 @@
pixel_y = 10
},
/obj/structure/machinery/computer/cameras/almayer_brig{
- dir = 4;
desc = "Used to access the various cameras in the security brig.";
+ dir = 4;
name = "brig cameras console";
pixel_y = -11
},
@@ -20216,13 +20172,13 @@
desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas.";
icon_state = "multitool_big";
name = "\improper Oversized Security Access Tuner";
- pixel_y = 11;
- pixel_x = 4
+ pixel_x = 4;
+ pixel_y = 11
},
/obj/item/stack/sheet/cardboard/medium_stack{
- pixel_y = -6;
+ layer = 3.01;
pixel_x = -7;
- layer = 3.01
+ pixel_y = -6
},
/turf/open/floor/almayer,
/area/almayer/squads/alpha_bravo_shared)
@@ -20903,9 +20859,9 @@
"eGr" = (
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
autoname = 0;
- c_tag = "AI - Records"
+ c_tag = "AI - Records";
+ dir = 8
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -21261,9 +21217,9 @@
/obj/structure/machinery/door_control{
id = "ARES StairsLock";
name = "ARES Exterior Lockdown";
+ pixel_x = 6;
pixel_y = -24;
- req_one_access_txt = "91;92";
- pixel_x = 6
+ req_one_access_txt = "91;92"
},
/obj/structure/surface/table/reinforced/almayer_B{
indestructible = 1;
@@ -21342,10 +21298,10 @@
pixel_x = 1
},
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
- pixel_y = 2;
autoname = 0;
- c_tag = "AI - Reception Exterior"
+ c_tag = "AI - Reception Exterior";
+ dir = 8;
+ pixel_y = 2
},
/turf/open/floor/almayer/silver/east,
/area/almayer/hallways/upper/midship_hallway)
@@ -22220,8 +22176,8 @@
/area/almayer/medical/containment/cell/cl)
"flf" = (
/obj/structure/pipes/vents/pump/no_boom/gas{
- vent_tag = "Records";
- dir = 1
+ dir = 1;
+ vent_tag = "Records"
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -22237,9 +22193,9 @@
/area/almayer/maint/upper/u_a_p)
"flL" = (
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
autoname = 0;
- c_tag = "AI - SynthBay"
+ c_tag = "AI - SynthBay";
+ dir = 8
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -22950,10 +22906,10 @@
/area/almayer/hallways/lower/repair_bay)
"fCI" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
+ dir = 4;
id = "ARES JoeCryo";
name = "\improper ARES Synth Bay Shutters";
- plane = -7;
- dir = 4
+ plane = -7
},
/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
dir = 4
@@ -23587,9 +23543,9 @@
/area/almayer/maint/hull/lower/l_f_s)
"fQD" = (
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
autoname = 0;
- c_tag = "AI - Core Chamber"
+ c_tag = "AI - Core Chamber";
+ dir = 8
},
/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3,
/area/almayer/command/airoom)
@@ -25222,10 +25178,10 @@
"gDh" = (
/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
access_modified = 1;
+ dir = 1;
name = "\improper Security Vault";
req_access = null;
- req_one_access_txt = "91;92";
- dir = 1
+ req_one_access_txt = "91;92"
},
/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore{
plane = -6
@@ -29230,9 +29186,9 @@
plane = -7
},
/obj/structure/disposalpipe/up/almayer{
+ dir = 2;
id = "ares_vault_in";
- name = "aicore";
- dir = 2
+ name = "aicore"
},
/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown,
/turf/open/floor/almayer/no_build/test_floor4,
@@ -30441,8 +30397,8 @@
},
/obj/structure/machinery/computer/secure_data{
dir = 4;
- pixel_y = 23;
- layer = 2.99
+ layer = 2.99;
+ pixel_y = 23
},
/turf/open/floor/almayer/red/west,
/area/almayer/shipboard/brig/processing)
@@ -31476,15 +31432,15 @@
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/secure_data{
dir = 4;
- pixel_y = 19;
- layer = 2.99
+ layer = 2.99;
+ pixel_y = 19
},
/obj/structure/machinery/computer/cameras/almayer_brig{
- dir = 4;
desc = "Used to access the various cameras in the security brig.";
+ dir = 4;
+ layer = 2.99;
name = "brig cameras console";
- pixel_y = 5;
- layer = 2.99
+ pixel_y = 5
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/chief_mp_office)
@@ -31928,9 +31884,9 @@
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/surface/table/reinforced/almayer_blend,
/obj/item/desk_bell{
+ anchored = 1;
pixel_x = -6;
- pixel_y = 10;
- anchored = 1
+ pixel_y = 10
},
/turf/open/floor/almayer/test_floor4,
/area/almayer/squads/req)
@@ -37050,13 +37006,13 @@
pixel_y = 10
},
/obj/item/stack/cable_coil{
- pixel_y = 1;
- pixel_x = 8
+ pixel_x = 8;
+ pixel_y = 1
},
/obj/item/stack/sheet/cardboard/small_stack{
- pixel_y = 2;
+ layer = 3.01;
pixel_x = -3;
- layer = 3.01
+ pixel_y = 2
},
/turf/open/floor/almayer,
/area/almayer/squads/alpha_bravo_shared)
@@ -38735,9 +38691,9 @@
pixel_x = -32
},
/obj/structure/machinery/light{
+ alpha = 0;
dir = 8;
- pixel_x = -32;
- alpha = 0
+ pixel_x = -32
},
/turf/open/floor/almayer/silver/west,
/area/almayer/command/computerlab)
@@ -39336,8 +39292,8 @@
"mAe" = (
/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable,
/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown{
- plane = -6;
- dir = 4
+ dir = 4;
+ plane = -6
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -39466,10 +39422,10 @@
"mCx" = (
/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
access_modified = 1;
+ dir = 1;
name = "\improper AI Reception";
req_access = null;
- req_one_access_txt = "91;92";
- dir = 1
+ req_one_access_txt = "91;92"
},
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -40363,10 +40319,10 @@
req_one_access_txt = "90;91;92"
},
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
- pixel_y = 2;
+ autoname = 0;
c_tag = "AI - Main Corridor";
- autoname = 0
+ dir = 8;
+ pixel_y = 2
},
/turf/open/floor/almayer/aicore/no_build/ai_silver/east,
/area/almayer/command/airoom)
@@ -40668,8 +40624,8 @@
/obj/structure/machinery/door_control{
id = "ARES JoeCryo";
name = "ARES WorkingJoe Bay Shutters";
- req_one_access_txt = "91;92";
- pixel_x = -24
+ pixel_x = -24;
+ req_one_access_txt = "91;92"
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -42029,8 +41985,8 @@
},
/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
dir = 4;
- pixel_y = -12;
- name = "Remote dropship navigation computer"
+ name = "Remote dropship navigation computer";
+ pixel_y = -12
},
/turf/open/floor/almayer/redfull,
/area/almayer/living/offices/flight)
@@ -43098,10 +43054,10 @@
/area/almayer/hallways/upper/midship_hallway)
"nZm" = (
/obj/structure/machinery/door_control{
+ access_modified = 1;
id = "OTStore";
name = "Shutters";
pixel_y = 24;
- access_modified = 1;
req_one_access_txt = "35"
},
/obj/effect/decal/warning_stripes{
@@ -43409,8 +43365,8 @@
unslashable = 1
},
/obj/structure/machinery/computer/working_joe{
- layer = 3.3;
dir = 4;
+ layer = 3.3;
pixel_y = 6
},
/turf/open/floor/almayer/aicore/no_build,
@@ -44489,8 +44445,8 @@
/area/almayer/command/cichallway)
"oBD" = (
/obj/structure/pipes/vents/pump/no_boom/gas{
- vent_tag = "Access Hall";
- dir = 8
+ dir = 8;
+ vent_tag = "Access Hall"
},
/turf/open/floor/almayer/aicore/no_build/ai_silver/east,
/area/almayer/command/airoom)
@@ -44689,8 +44645,8 @@
"oEA" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/weapon/gun/shotgun/pump{
- starting_attachment_types = list(/obj/item/attachable/stock/shotgun);
- pixel_y = 9
+ pixel_y = 9;
+ starting_attachment_types = list(/obj/item/attachable/stock/shotgun)
},
/obj/item/stack/sheet/cardboard/small_stack{
layer = 3.01
@@ -45799,8 +45755,8 @@
"pax" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/pipes/vents/pump/no_boom/gas{
- vent_tag = "Reception";
- dir = 8
+ dir = 8;
+ vent_tag = "Reception"
},
/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3,
/area/almayer/command/airoom)
@@ -46284,8 +46240,8 @@
"pmV" = (
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/obj/structure/machinery/computer/tech_control{
- pixel_y = 16;
- density = 0
+ density = 0;
+ pixel_y = 16
},
/turf/open/floor/almayer/no_build/ai_floors,
/area/almayer/command/airoom)
@@ -48477,9 +48433,9 @@
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/surface/table/reinforced/almayer_blend/north,
/obj/item/desk_bell{
+ anchored = 1;
pixel_x = -6;
- pixel_y = -8;
- anchored = 1
+ pixel_y = -8
},
/turf/open/floor/almayer/test_floor4,
/area/almayer/squads/req)
@@ -48824,9 +48780,9 @@
/area/almayer/maint/hull/lower/l_f_p)
"qpY" = (
/obj/structure/machinery/cryopod/right{
+ dir = 4;
layer = 3.1;
- pixel_y = 13;
- dir = 4
+ pixel_y = 13
},
/turf/open/floor/almayer/aicore/no_build/ai_cargo,
/area/almayer/command/airoom)
@@ -51696,8 +51652,8 @@
desc = "A pneumatic delivery unit.";
icon_state = "delivery_engi";
name = "Security Vault";
- pixel_y = 28;
- pixel_x = -24
+ pixel_x = -24;
+ pixel_y = 28
},
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -56014,9 +55970,9 @@
/area/almayer/maint/hull/lower/stern)
"tmV" = (
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
autoname = 0;
- c_tag = "AI - SecVault"
+ c_tag = "AI - SecVault";
+ dir = 8
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -56131,9 +56087,9 @@
req_access_txt = "8"
},
/obj/item/desk_bell{
+ anchored = 1;
pixel_x = -6;
- pixel_y = 10;
- anchored = 1
+ pixel_y = 10
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
/turf/open/floor/almayer/sterile_green,
@@ -56771,9 +56727,9 @@
desc = "An outlet for the pneumatic delivery system.";
icon_state = "delivery_outlet";
name = "returns outlet";
+ pixel_x = -7;
pixel_y = 28;
- range = 0;
- pixel_x = -7
+ range = 0
},
/turf/open/floor/almayer/no_build/test_floor4,
/area/almayer/command/airoom)
@@ -56871,9 +56827,9 @@
/area/almayer/hallways/upper/port)
"tCC" = (
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 1;
+ autoname = 0;
c_tag = "AI - Reception Interior";
- autoname = 0
+ dir = 1
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -59887,15 +59843,15 @@
unslashable = 1
},
/obj/item/paper_bin/uscm{
- pixel_y = 6;
- pixel_x = -12
+ pixel_x = -12;
+ pixel_y = 6
},
/obj/item/tool/pen{
pixel_x = -14
},
/obj/structure/machinery/aicore_lockdown{
- pixel_y = 4;
- pixel_x = 3
+ pixel_x = 3;
+ pixel_y = 4
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -60988,13 +60944,13 @@
unslashable = 1
},
/obj/structure/machinery/computer/working_joe{
- layer = 3.3;
- dir = 8
+ dir = 8;
+ layer = 3.3
},
/obj/item/desk_bell/ares{
- pixel_y = 14;
+ anchored = 1;
pixel_x = -5;
- anchored = 1
+ pixel_y = 14
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -61054,14 +61010,14 @@
"vqI" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/camera_film{
+ layer = 3.03;
pixel_x = 4;
- pixel_y = 1;
- layer = 3.03
+ pixel_y = 1
},
/obj/item/stack/sheet/cardboard/small_stack{
+ layer = 3.02;
pixel_x = -5;
- pixel_y = 3;
- layer = 3.02
+ pixel_y = 3
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
@@ -61743,9 +61699,9 @@
layer = 3.3
},
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 4;
+ autoname = 0;
c_tag = "AI - Primary Processors";
- autoname = 0
+ dir = 4
},
/turf/open/floor/almayer/aicore/no_build/ai_floor2,
/area/almayer/command/airoom)
@@ -65788,8 +65744,8 @@
"xeU" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "\improper Laundry Room";
- req_one_access = list(19,7);
- req_access = list()
+ req_access = list();
+ req_one_access = list(19,7)
},
/turf/open/floor/almayer/test_floor4,
/area/almayer/engineering/laundry)
@@ -66027,8 +65983,8 @@
pixel_y = 27
},
/obj/structure/machinery/computer/cameras/almayer_brig{
- dir = 4;
desc = "Used to access the various cameras in the security brig.";
+ dir = 4;
name = "brig cameras console"
},
/turf/open/floor/almayer/red/west,
@@ -66178,9 +66134,9 @@
},
/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
dir = 8;
+ name = "Remote dropship navigation computer";
pixel_y = 12;
- shuttleId = "dropship_alamo";
- name = "Remote dropship navigation computer"
+ shuttleId = "dropship_alamo"
},
/turf/open/floor/almayer/redfull,
/area/almayer/living/offices/flight)
@@ -66597,8 +66553,8 @@
/area/almayer/living/briefing)
"xwU" = (
/obj/structure/pipes/vents/pump/no_boom/gas{
- vent_tag = "Comms";
- dir = 1
+ dir = 1;
+ vent_tag = "Comms"
},
/turf/open/floor/almayer/aicore/no_build/ai_plates,
/area/almayer/command/airoom)
diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm
index c52f388356c8..a3cc4e7a02ec 100644
--- a/maps/templates/lazy_templates/pizza_ert_station.dmm
+++ b/maps/templates/lazy_templates/pizza_ert_station.dmm
@@ -1391,7 +1391,7 @@
/area/adminlevel/ert_station/pizza_station)
"sp" = (
/obj/structure/surface/table/reinforced,
-/obj/item/weapon/pizza_cutter,
+/obj/item/tool/kitchen/pizzacutter,
/turf/open/floor/prison/kitchen,
/area/adminlevel/ert_station/pizza_station)
"sx" = (
@@ -2986,7 +2986,7 @@
"MB" = (
/obj/structure/surface/table/reinforced,
/obj/item/pizzabox/meat,
-/obj/item/weapon/pizza_cutter,
+/obj/item/tool/kitchen/pizzacutter,
/turf/open/floor/cmo,
/area/adminlevel/ert_station/pizza_station)
"MK" = (