diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
index 88d59beae417..b6e2af87cc2c 100644
--- a/code/__DEFINES/equipment.dm
+++ b/code/__DEFINES/equipment.dm
@@ -48,6 +48,8 @@
#define USES_SEEING (1<<19)
// Can be quick drawn
#define QUICK_DRAWABLE (1<<20)
+// If object should utilize icon state indexes for map colors (s_ d_ etc) in select_gamemode_skin
+#define MAP_COLOR_INDEX (1<<21)
//==========================================================================================
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 54546a6f046e..6fedf8bdfce6 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -313,24 +313,24 @@
#define CAN_HOLD_ONE_HAND 2
GLOBAL_LIST_INIT(default_onmob_icons, list(
- WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_0.dmi',
- WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_0.dmi',
- WEAR_WAIST = 'icons/mob/humans/onmob/belt.dmi',
- WEAR_BACK = 'icons/mob/humans/onmob/back.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/items_lefthand_64.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/items_righthand_64.dmi',
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks.dmi',
WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
WEAR_EYES = 'icons/mob/humans/onmob/eyes.dmi',
- WEAR_ID = 'icons/mob/mob.dmi',
- WEAR_BODY = 'icons/mob/humans/onmob/uniform_0.dmi',
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_0.dmi',
- WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi',
+ WEAR_ID = 'icons/mob/humans/onmob/ids.dmi',
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
WEAR_FEET = 'icons/mob/humans/onmob/feet.dmi',
- WEAR_FACE = 'icons/mob/humans/onmob/mask.dmi',
- WEAR_HANDCUFFED = 'icons/mob/mob.dmi',
- WEAR_LEGCUFFED = 'icons/mob/mob.dmi',
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks.dmi',
+ WEAR_HANDCUFFED = 'icons/mob/humans/onmob/cuffs.dmi',
+ WEAR_LEGCUFFED = 'icons/mob/humans/onmob/cuffs.dmi',
WEAR_HANDS = 'icons/mob/humans/onmob/hands.dmi',
- WEAR_J_STORE = 'icons/mob/humans/onmob/suit_slot.dmi',
- WEAR_ACCESSORIES = 'icons/mob/humans/onmob/ties.dmi'
+ WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/suit_storage/misc.dmi',
+ WEAR_ACCESSORIES = 'icons/mob/humans/onmob/clothing/accessory/ties.dmi'
))
GLOBAL_LIST_INIT(default_xeno_onmob_icons, list(
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 069bf49f8d37..19e7be56b88a 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -611,79 +611,79 @@ GLOBAL_DATUM(action_purple_power_up, /image)
/proc/get_busy_icon(busy_type)
if(busy_type == BUSY_ICON_GENERIC)
if(!GLOB.busy_indicator_clock)
- GLOB.busy_indicator_clock = image('icons/mob/mob.dmi', null, "busy_generic", "pixel_y" = 22)
+ GLOB.busy_indicator_clock = image('icons/mob/do_afters.dmi', null, "busy_generic", "pixel_y" = 22)
GLOB.busy_indicator_clock.layer = FLY_LAYER
GLOB.busy_indicator_clock.plane = ABOVE_GAME_PLANE
return GLOB.busy_indicator_clock
else if(busy_type == BUSY_ICON_MEDICAL)
if(!GLOB.busy_indicator_medical)
- GLOB.busy_indicator_medical = image('icons/mob/mob.dmi', null, "busy_medical", "pixel_y" = 0) //This shows directly on top of the mob, no offset!
+ GLOB.busy_indicator_medical = image('icons/mob/do_afters.dmi', null, "busy_medical", "pixel_y" = 0) //This shows directly on top of the mob, no offset!
GLOB.busy_indicator_medical.layer = FLY_LAYER
GLOB.busy_indicator_medical.plane = ABOVE_GAME_PLANE
return GLOB.busy_indicator_medical
else if(busy_type == BUSY_ICON_BUILD)
if(!GLOB.busy_indicator_build)
- GLOB.busy_indicator_build = image('icons/mob/mob.dmi', null, "busy_build", "pixel_y" = 22)
+ GLOB.busy_indicator_build = image('icons/mob/do_afters.dmi', null, "busy_build", "pixel_y" = 22)
GLOB.busy_indicator_build.layer = FLY_LAYER
GLOB.busy_indicator_build.plane = ABOVE_GAME_PLANE
return GLOB.busy_indicator_build
else if(busy_type == BUSY_ICON_FRIENDLY)
if(!GLOB.busy_indicator_friendly)
- GLOB.busy_indicator_friendly = image('icons/mob/mob.dmi', null, "busy_friendly", "pixel_y" = 22)
+ GLOB.busy_indicator_friendly = image('icons/mob/do_afters.dmi', null, "busy_friendly", "pixel_y" = 22)
GLOB.busy_indicator_friendly.layer = FLY_LAYER
GLOB.busy_indicator_friendly.plane = ABOVE_GAME_PLANE
return GLOB.busy_indicator_friendly
else if(busy_type == BUSY_ICON_HOSTILE)
if(!GLOB.busy_indicator_hostile)
- GLOB.busy_indicator_hostile = image('icons/mob/mob.dmi', null, "busy_hostile", "pixel_y" = 22)
+ GLOB.busy_indicator_hostile = image('icons/mob/do_afters.dmi', null, "busy_hostile", "pixel_y" = 22)
GLOB.busy_indicator_hostile.layer = FLY_LAYER
GLOB.busy_indicator_hostile.plane = ABOVE_GAME_PLANE
return GLOB.busy_indicator_hostile
else if(busy_type == EMOTE_ICON_HIGHFIVE)
if(!GLOB.emote_indicator_highfive)
- GLOB.emote_indicator_highfive = image('icons/mob/mob.dmi', null, "emote_highfive", "pixel_y" = 22)
+ GLOB.emote_indicator_highfive = image('icons/mob/do_afters.dmi', null, "emote_highfive", "pixel_y" = 22)
GLOB.emote_indicator_highfive.layer = FLY_LAYER
GLOB.emote_indicator_highfive.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_highfive
else if(busy_type == EMOTE_ICON_FISTBUMP)
if(!GLOB.emote_indicator_fistbump)
- GLOB.emote_indicator_fistbump = image('icons/mob/mob.dmi', null, "emote_fistbump", "pixel_y" = 22)
+ GLOB.emote_indicator_fistbump = image('icons/mob/do_afters.dmi', null, "emote_fistbump", "pixel_y" = 22)
GLOB.emote_indicator_fistbump.layer = FLY_LAYER
GLOB.emote_indicator_fistbump.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_fistbump
else if(busy_type == EMOTE_ICON_ROCK_PAPER_SCISSORS)
if(!GLOB.emote_indicator_rock_paper_scissors)
- GLOB.emote_indicator_rock_paper_scissors = image('icons/mob/mob.dmi', null, "emote_rps", "pixel_y" = 22)
+ GLOB.emote_indicator_rock_paper_scissors = image('icons/mob/do_afters.dmi', null, "emote_rps", "pixel_y" = 22)
GLOB.emote_indicator_rock_paper_scissors.layer = FLY_LAYER
GLOB.emote_indicator_rock_paper_scissors.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_rock_paper_scissors
else if(busy_type == EMOTE_ICON_ROCK)
if(!GLOB.emote_indicator_rock)
- GLOB.emote_indicator_rock = image('icons/mob/mob.dmi', null, "emote_rock", "pixel_y" = 22)
+ GLOB.emote_indicator_rock = image('icons/mob/do_afters.dmi', null, "emote_rock", "pixel_y" = 22)
GLOB.emote_indicator_rock.layer = FLY_LAYER
GLOB.emote_indicator_rock.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_rock
else if(busy_type == EMOTE_ICON_PAPER)
if(!GLOB.emote_indicator_paper)
- GLOB.emote_indicator_paper = image('icons/mob/mob.dmi', null, "emote_paper", "pixel_y" = 22)
+ GLOB.emote_indicator_paper = image('icons/mob/do_afters.dmi', null, "emote_paper", "pixel_y" = 22)
GLOB.emote_indicator_paper.layer = FLY_LAYER
GLOB.emote_indicator_paper.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_paper
else if(busy_type == EMOTE_ICON_SCISSORS)
if(!GLOB.emote_indicator_scissors)
- GLOB.emote_indicator_scissors = image('icons/mob/mob.dmi', null, "emote_scissors", "pixel_y" = 22)
+ GLOB.emote_indicator_scissors = image('icons/mob/do_afters.dmi', null, "emote_scissors", "pixel_y" = 22)
GLOB.emote_indicator_scissors.layer = FLY_LAYER
GLOB.emote_indicator_scissors.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_scissors
else if(busy_type == EMOTE_ICON_HEADBUTT)
if(!GLOB.emote_indicator_headbutt)
- GLOB.emote_indicator_headbutt = image('icons/mob/mob.dmi', null, "emote_headbutt", "pixel_y" = 22)
+ GLOB.emote_indicator_headbutt = image('icons/mob/do_afters.dmi', null, "emote_headbutt", "pixel_y" = 22)
GLOB.emote_indicator_headbutt.layer = FLY_LAYER
GLOB.emote_indicator_headbutt.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_headbutt
else if(busy_type == EMOTE_ICON_TAILSWIPE)
if(!GLOB.emote_indicator_tailswipe)
- GLOB.emote_indicator_tailswipe = image('icons/mob/mob.dmi', null, "emote_tailswipe", "pixel_y" = 22)
+ GLOB.emote_indicator_tailswipe = image('icons/mob/do_afters.dmi', null, "emote_tailswipe", "pixel_y" = 22)
GLOB.emote_indicator_tailswipe.layer = FLY_LAYER
GLOB.emote_indicator_tailswipe.plane = ABOVE_GAME_PLANE
return GLOB.emote_indicator_tailswipe
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index c90f970d4471..2fd4142bf048 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -154,6 +154,7 @@ DEFINE_BITFIELD(flags_atom, list(
"USES_HEARING" = USES_HEARING,
"HTML_USE_INITAL_ICON" = HTML_USE_INITAL_ICON,
"QUICK_DRAWABLE" = QUICK_DRAWABLE,
+ "MAP_COLOR_INDEX" = MAP_COLOR_INDEX,
))
DEFINE_BITFIELD(turf_flags, list(
diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
index dadf5d597255..b97c615f31ad 100644
--- a/code/_globalvars/global_lists.dm
+++ b/code/_globalvars/global_lists.dm
@@ -505,8 +505,7 @@ GLOBAL_LIST_INIT(hj_emotes, setup_hazard_joe_emotes())
HUD_ORANGE = new /datum/custom_hud/orange(),
HUD_RED = new /datum/custom_hud/red(),
HUD_WHITE = new /datum/custom_hud/white(),
- HUD_ALIEN = new /datum/custom_hud/alien(),
- HUD_ROBOT = new /datum/custom_hud/robot()
+ HUD_ALIEN = new /datum/custom_hud/alien()
)
/proc/setup_human_huds()
diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
index a99129d09bcd..f256cd8891c1 100644
--- a/code/_onclick/hud/ghost.dm
+++ b/code/_onclick/hud/ghost.dm
@@ -24,22 +24,6 @@
ghost.minimap.action_activate()
-// /atom/movable/screen/ghost/follow_xeno
-// name = "Follow Xeno"
-// icon_state = "follow_xeno"
-
-// /atom/movable/screen/ghost/follow_xeno/Click()
-// var/mob/dead/observer/G = usr
-// G.follow_xeno()
-
-// /atom/movable/screen/ghost/follow_human
-// name = "Follow Humans"
-// icon_state = "follow_human"
-
-// /atom/movable/screen/ghost/follow_human/Click()
-// var/mob/dead/observer/G = usr
-// G.follow_human()
-
/atom/movable/screen/ghost/reenter_corpse
name = "Reenter corpse"
icon_state = "reenter_corpse"
diff --git a/code/datums/custom_hud.dm b/code/datums/custom_hud.dm
index 9a009532ef35..d9abdbf36097 100644
--- a/code/datums/custom_hud.dm
+++ b/code/datums/custom_hud.dm
@@ -162,19 +162,3 @@
var/ui_alienplasmadisplay = "EAST-1:28,6:13"
var/ui_alienarmordisplay = "EAST-1:28,5:13"
var/ui_mark_locator = "EAST-1:28,10:13"
-
-/datum/custom_hud/robot
- ui_style_icon = 'icons/mob/hud/screen1_robot.dmi'
-
- var/ui_inv1 = "WEST+5:16,1:5"
- var/ui_inv2 = "WEST+6:16,1:5"
- var/ui_inv3 = "WEST+7:16,1:5"
- var/ui_borg_store = "WEST+8:16,1:5"
-
- var/ui_borg_pull = "EAST-3:24,2:7"
- var/ui_borg_module = "EAST-2:26,2:7"
- var/ui_borg_panel = "EAST-1:28,2:7"
-
- var/ui_toxin = "EAST-1:28,13:27"
- var/ui_borg_health = "EAST-1:28,6:13"
- var/ui_borg_temp = "EAST-1:28,10:21"
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 44e8924ef68d..c2a7f7c2d7c4 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -412,7 +412,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
eyes_s.Blend(facial_s, ICON_OVERLAY)
var/icon/clothes_s = null
- clothes_s = new /icon('icons/mob/humans/onmob/uniform_0.dmi', "marine_underpants_s")
+ clothes_s = new /icon('icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi', "marine_underpants_s")
clothes_s.Blend(new /icon('icons/mob/humans/onmob/feet.dmi', "black"), ICON_UNDERLAY)
preview_icon.Blend(eyes_s, ICON_OVERLAY)
if(clothes_s)
diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
index aeede447e0f9..1ab1d6ccf598 100644
--- a/code/datums/supply_packs/black_market.dm
+++ b/code/datums/supply_packs/black_market.dm
@@ -605,8 +605,7 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat
/obj/item/reagent_container/food/snacks/grown/ambrosiadeus,
/obj/item/reagent_container/food/snacks/grown/ambrosiavulgaris,
/obj/item/clothing/accessory/horrible,
- /obj/item/storage/belt/marine/quackers,
- /obj/item/storage/belt/shotgun/full/quackers,
+ /obj/item/storage/belt/quackers,
/obj/item/pamphlet/skill/powerloader,
/obj/item/pamphlet/language/russian,
/obj/item/pamphlet/language/japanese,
diff --git a/code/game/gamemodes/colonialmarines/huntergames.dm b/code/game/gamemodes/colonialmarines/huntergames.dm
index 5aa4c033883a..12a5fc9615ff 100644
--- a/code/game/gamemodes/colonialmarines/huntergames.dm
+++ b/code/game/gamemodes/colonialmarines/huntergames.dm
@@ -281,17 +281,14 @@
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET)
H.remove_language(LANGUAGE_ENGLISH)
H.add_language(LANGUAGE_RUSSIAN)
- if(7) //Highlander!
- H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), WEAR_BODY)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), WEAR_FEET)
- if(8) //Assassin!
+ if(7) //Assassin!
H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET)
- if(9) //Corporate guy
+ if(8) //Corporate guy
H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(H), WEAR_JACKET)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET)
- if(10) //Colonial Marshal
+ if(9) //Colonial Marshal
H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET)
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 8d4b27778c69..4c2013f24faa 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -1,6 +1,6 @@
/obj/structure/machinery/ignition_switch
name = "ignition switch"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/stationobjs.dmi'
icon_state = "launcherbtt"
desc = "A remote control switch for a mounted igniter."
var/id = null
@@ -13,7 +13,7 @@
/obj/structure/machinery/flasher_button
name = "flasher button"
desc = "A remote control switch for a mounted flasher."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/stationobjs.dmi'
icon_state = "launcherbtt"
var/id = null
var/active = 0
@@ -26,7 +26,7 @@
desc = "Burn baby burn!"
name = "crematorium igniter"
icon = 'icons/obj/structures/machinery/power.dmi'
- icon_state = "crema_switch"
+ icon_state = "light0"
anchored = TRUE
req_access = list(ACCESS_MARINE_MEDBAY)
var/on = 0
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 9288033d61d5..396bef4f8fa0 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -91,15 +91,6 @@
icon_state = "woodtable"
table_prefix = "wood"
-/obj/structure/holostool
- name = "stool"
- desc = "Apply butt."
- icon = 'icons/obj/objects.dmi'
- icon_state = "stool"
- anchored = TRUE
- flags_atom = FPRINT
-
-
/obj/item/clothing/gloves/boxing/hologlove
name = "boxing gloves"
desc = "Because you really needed another excuse to punch your crewmates."
diff --git a/code/game/machinery/mining.dm b/code/game/machinery/mining.dm
index 97ba4a804f1d..e061b222b2d5 100644
--- a/code/game/machinery/mining.dm
+++ b/code/game/machinery/mining.dm
@@ -1,6 +1,6 @@
/obj/structure/machinery/mineral/processing_unit
name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron...
- icon = 'icons/obj/structures/machinery/mining_machines.dmi'
+ icon = 'icons/obj/structures/props/stationobjs.dmi'
icon_state = "furnace"
density = TRUE
anchored = TRUE
diff --git a/code/game/machinery/scoreboard.dm b/code/game/machinery/scoreboard.dm
index 0810ae26cbf4..96a359425c87 100644
--- a/code/game/machinery/scoreboard.dm
+++ b/code/game/machinery/scoreboard.dm
@@ -47,7 +47,7 @@
/obj/structure/machinery/scoreboard_button
name = "scoreboard button"
desc = "A remote control button to reset a scoreboard."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/stationobjs.dmi'
icon_state = "launcherbtt"
var/id = null
var/active = 0
diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm
index 476e9f160ec2..e704ffcf8277 100644
--- a/code/game/machinery/vending/vendor_types/medical.dm
+++ b/code/game/machinery/vending/vendor_types/medical.dm
@@ -54,7 +54,7 @@
/obj/structure/restock_cart
name = "restock cart"
desc = "A rather heavy cart filled with various supplies to restock a vendor with."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/liquid_tanks.dmi'
icon_state = "tank_normal" // Temporary
var/overlay_color = rgb(252, 186, 3) // Temporary
@@ -82,7 +82,6 @@
/obj/structure/restock_cart/medical
name = "\improper Wey-Yu restock cart"
desc = "A rather heavy cart filled with various supplies to restock a vendor with. Provided by Wey-Yu Pharmaceuticals Division(TM)."
- icon = 'icons/obj/objects.dmi'
icon_state = "tank_normal" // Temporary
supplies_remaining = 20
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 1214b141da15..fe12602dee69 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -103,9 +103,6 @@
// if ( istype(W,/obj/item/clothing/suit/powered ) )
// to_chat(user, "This item does not fit.")
// return
- if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) )
- to_chat(user, "This item does not fit.")
- return
if ( istype(W,/obj/item/clothing/suit/bomb_suit ) )
to_chat(user, "This item does not fit.")
return
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 5969914eb743..4d99720a4449 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -98,6 +98,7 @@
alpha = 80
appearance_flags = RESET_ALPHA | TILE_BOUND | PIXEL_SCALE
garbage = FALSE
+
/obj/effect/decal/cleanable/cobweb2/dynamic/Initialize(mapload, targetdir, webscale = 1.0)
alpha += floor(webscale * 120)
var/angle = dir2angle(targetdir)
diff --git a/code/game/objects/effects/decals/kutjevo_decals.dm b/code/game/objects/effects/decals/kutjevo_decals.dm
index 91c0de52ccd4..5a5c013f34ef 100644
--- a/code/game/objects/effects/decals/kutjevo_decals.dm
+++ b/code/game/objects/effects/decals/kutjevo_decals.dm
@@ -1,5 +1,4 @@
/obj/effect/decal/kutjevo_decals
- icon = 'icons/effects/kutjevo_decals.dmi'
layer = TURF_LAYER
/obj/effect/decal/kutjevo_decals/catwalk
diff --git a/code/game/objects/effects/landmarks/itemspawner.dm b/code/game/objects/effects/landmarks/itemspawner.dm
index 6858ed6b055a..96423a50a416 100644
--- a/code/game/objects/effects/landmarks/itemspawner.dm
+++ b/code/game/objects/effects/landmarks/itemspawner.dm
@@ -21,22 +21,6 @@
new /obj/item/clothing/head/helmet/gladiator(src.loc)
return INITIALIZE_HINT_QDEL
-/obj/effect/landmark/costume/madscientist/Initialize()
- . = ..()
- new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
- new /obj/item/clothing/head/flatcap(src.loc)
- new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
- new /obj/item/clothing/glasses/gglasses(src.loc)
- return INITIALIZE_HINT_QDEL
-
-/obj/effect/landmark/costume/elpresidente/Initialize()
- . = ..()
- new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
- new /obj/item/clothing/head/flatcap(src.loc)
- new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
- new /obj/item/clothing/shoes/jackboots(src.loc)
- return INITIALIZE_HINT_QDEL
-
/obj/effect/landmark/costume/butler/Initialize()
. = ..()
new /obj/item/clothing/suit/storage/wcoat(src.loc)
@@ -44,21 +28,6 @@
new /obj/item/clothing/head/that(src.loc)
return INITIALIZE_HINT_QDEL
-/obj/effect/landmark/costume/scratch/Initialize()
- . = ..()
- new /obj/item/clothing/gloves/white(src.loc)
- new /obj/item/clothing/shoes/white(src.loc)
- new /obj/item/clothing/under/scratch(src.loc)
- if (prob(30))
- new /obj/item/clothing/head/cueball(src.loc)
- return INITIALIZE_HINT_QDEL
-
-/obj/effect/landmark/costume/highlander/Initialize()
- . = ..()
- new /obj/item/clothing/under/kilt(src.loc)
- new /obj/item/clothing/head/beret(src.loc)
- return INITIALIZE_HINT_QDEL
-
/obj/effect/landmark/costume/prig/Initialize()
. = ..()
new /obj/item/clothing/suit/storage/wcoat(src.loc)
@@ -71,12 +40,6 @@
new /obj/item/clothing/mask/fakemoustache(src.loc)
return INITIALIZE_HINT_QDEL
-/obj/effect/landmark/costume/plaguedoctor/Initialize()
- . = ..()
- new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
- new /obj/item/clothing/head/plaguedoctorhat(src.loc)
- return INITIALIZE_HINT_QDEL
-
/obj/effect/landmark/costume/pirate/Initialize()
. = ..()
new /obj/item/clothing/under/pirate(src.loc)
@@ -86,8 +49,3 @@
new /obj/item/clothing/glasses/eyepatch(src.loc)
return INITIALIZE_HINT_QDEL
-/obj/effect/landmark/costume/commie/Initialize()
- . = ..()
- new /obj/item/clothing/under/soviet(src.loc)
- new /obj/item/clothing/head/ushanka(src.loc)
- return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 4bf3da23dc13..db42bb9c8ea8 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -2,7 +2,7 @@
/obj/effect/spresent
name = "strange present"
desc = "It's a ... present?"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/gifts.dmi'
icon_state = "strangepresent"
density = TRUE
anchored = FALSE
diff --git a/code/game/objects/effects/spawners/wo_spawners/supplies.dm b/code/game/objects/effects/spawners/wo_spawners/supplies.dm
index 612950418a70..f5b4855daa0b 100644
--- a/code/game/objects/effects/spawners/wo_spawners/supplies.dm
+++ b/code/game/objects/effects/spawners/wo_spawners/supplies.dm
@@ -107,10 +107,10 @@
/obj/effect/landmark/wo_supplies/storage
icon_state = null
+ icon = 'icons/obj/items/clothing/accessory/webbings.dmi'
amount = list(1,5)
/obj/effect/landmark/wo_supplies/storage/webbing
- icon = 'icons/obj/items/clothing/ties.dmi'
icon_state = "webbing"
stuff = list(/obj/item/clothing/accessory/storage/webbing)
@@ -137,11 +137,11 @@
/obj/effect/landmark/wo_supplies/storage/m37holster
icon_state = "m37_holster"
- icon = 'icons/obj/items/storage/holsters.dmi'
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi'
stuff = list(/obj/item/storage/large_holster/m37)
/obj/effect/landmark/wo_supplies/storage/belts
- icon = 'icons/obj/items/clothing/belts.dmi'
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
amount = list(1,3)
/obj/effect/landmark/wo_supplies/storage/belts/grenade
@@ -157,22 +157,27 @@
/obj/effect/landmark/wo_supplies/storage/belts/m41abelt
icon_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
stuff = list(/obj/item/storage/belt/marine)
/obj/effect/landmark/wo_supplies/storage/belts/knifebelt
icon_state = "knifebelt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
stuff = list(/obj/item/storage/belt/knifepouch)
/obj/effect/landmark/wo_supplies/storage/belts/shotgunbelt
icon_state = "shotgunbelt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
stuff = list(/obj/item/storage/belt/shotgun)
/obj/effect/landmark/wo_supplies/storage/belts/m44belt
icon_state = "m44r_holster"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
stuff = list(/obj/item/storage/belt/gun/m44)
/obj/effect/landmark/wo_supplies/storage/belts/m4a3belt
icon_state = "m4a3_holster"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
stuff = list(/obj/item/storage/belt/gun/m4a3)
/obj/effect/landmark/wo_supplies/storage/belts/m39holster
@@ -184,6 +189,7 @@
/obj/effect/landmark/wo_supplies/storage/belts/lifesaver
icon_state = "medicbag"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
stuff = list(/obj/item/storage/belt/medical/lifesaver/full)
@@ -195,7 +201,7 @@
amount = list(1,5)
/obj/effect/landmark/wo_supplies/ammo/powerpack
- icon = 'icons/obj/items/clothing/backpacks.dmi'
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi'
icon_state = "powerpack"
stuff = list(/obj/item/smartgun_battery)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0d6704207629..931a9a88891b 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1,6 +1,5 @@
/obj/item
name = "item"
- icon = 'icons/obj/items/items.dmi'
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
layer = ITEM_LAYER
light_system = MOVABLE_LIGHT
@@ -169,6 +168,9 @@
/// Special storages this item prioritizes
var/list/preferred_storage
+ /// PLACEHOLDER
+ var/list/garb_icon
+
/obj/item/Initialize(mapload, ...)
. = ..()
@@ -254,19 +256,41 @@ cases. Override_icon_state should be a list.*/
new_icon_state = override_icon_state[SSmapping.configs[GROUND_MAP].map_name]
if(LAZYLEN(override_protection))
new_protection = override_protection[SSmapping.configs[GROUND_MAP].map_name]
- switch(SSmapping.configs[GROUND_MAP].camouflage_type)
- if("snow")
- icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
- item_state = new_item_state ? new_item_state : "s_" + item_state
- if("desert")
- icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
- item_state = new_item_state ? new_item_state : "d_" + item_state
- if("classic")
- icon_state = new_icon_state ? new_icon_state : "c_" + icon_state
- item_state = new_item_state ? new_item_state : "c_" + item_state
if(new_protection)
min_cold_protection_temperature = new_protection
+ if(flags_atom & MAP_COLOR_INDEX)
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("snow")
+ icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
+ item_state = new_item_state ? new_item_state : "s_" + item_state
+ if("desert")
+ icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
+ item_state = new_item_state ? new_item_state : "d_" + item_state
+ if("classic")
+ icon_state = new_icon_state ? new_icon_state : "c_" + icon_state
+ item_state = new_item_state ? new_item_state : "c_" + item_state
+ if("urban")
+ icon_state = new_icon_state ? new_icon_state : "u_" + icon_state
+ item_state = new_item_state ? new_item_state : "u_" + item_state
+ else
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ item_icons[WEAR_L_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi'
+ item_icons[WEAR_R_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ if("snow")
+ item_icons[WEAR_L_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi'
+ item_icons[WEAR_R_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ if("desert")
+ item_icons[WEAR_L_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi'
+ item_icons[WEAR_R_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi'
+ if("classic")
+ item_icons[WEAR_L_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi'
+ item_icons[WEAR_R_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi'
+ if("urban")
+ item_icons[WEAR_L_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi'
+ item_icons[WEAR_R_HAND] = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi'
+
/obj/item/get_examine_text(mob/user)
. = list()
var/size
diff --git a/code/game/objects/items/XMAS.dm b/code/game/objects/items/XMAS.dm
index b10ea2035d96..492d068871e0 100644
--- a/code/game/objects/items/XMAS.dm
+++ b/code/game/objects/items/XMAS.dm
@@ -4,7 +4,7 @@
/obj/item/m_gift //Marine Gift
name = "Present"
desc = "One, standard issue USCM Present"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/gifts.dmi'
icon_state = "gift1"
item_state = "gift1"
diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm
index 7d2dc00a9983..07de74947ee7 100644
--- a/code/game/objects/items/ashtray.dm
+++ b/code/game/objects/items/ashtray.dm
@@ -1,5 +1,5 @@
/obj/item/ashtray
- icon = 'icons/obj/items/ashtray.dmi'
+ icon = 'icons/obj/items/smoking/ashtray.dmi'
var/max_butts = 0
var/empty_desc = ""
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 9b0cf37299eb..d56678e332bb 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -31,8 +31,8 @@
/obj/item/bodybag/cryobag
name = "stasis bag"
desc = "A folded, reusable bag designed to prevent additional damage to an occupant."
- icon = 'icons/obj/cryobag.dmi'
- icon_state = "bodybag_folded"
+ icon = 'icons/obj/bodybag.dmi'
+ icon_state = "cryobag_folded"
unfolded_path = /obj/structure/closet/bodybag/cryobag
matter = list("plastic" = 7500)
var/used = 0
@@ -209,7 +209,10 @@
name = "stasis bag"
bag_name = "stasis bag"
desc = "A reusable plastic bag designed to prevent additional damage to an occupant."
- icon = 'icons/obj/cryobag.dmi'
+ icon = 'icons/obj/bodybag.dmi'
+ icon_state = "cryobag_closed"
+ icon_closed = "cryobag_closed"
+ icon_opened = "cryobag_open"
item_path = /obj/item/bodybag/cryobag
store_items = FALSE
/// the mob in stasis
@@ -366,6 +369,6 @@
/obj/item/trash/used_stasis_bag
name = "used stasis bag"
- icon = 'icons/obj/cryobag.dmi'
- icon_state = "bodybag_used"
+ icon = 'icons/obj/bodybag.dmi'
+ icon_state = "cryobag_used"
desc = "It's been ripped open. You will need to find a machine capable of recycling it."
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index 2d02cbd82f9e..209d5664b39f 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -2,7 +2,7 @@
gender = PLURAL
name = "facepaint"
desc = "Paint, for your face. Wipe it off your face with some paper if you need to. This one is a deep, forest green."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/paint.dmi'
icon_state = "camo"
var/paint_type = "green"
w_class = SIZE_TINY
@@ -150,7 +150,7 @@
/obj/item/k9_name_changer
name = "K9 name implanter"
desc = "Syncs the implanted W-Y Serial Chip to the unit's preferred name."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/economy.dmi'
icon_state = "efundcard"
w_class = SIZE_TINY
diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
index 37e722a37773..b81a5bc59c5e 100644
--- a/code/game/objects/items/devices/binoculars.dm
+++ b/code/game/objects/items/devices/binoculars.dm
@@ -6,12 +6,16 @@
icon_state = "binoculars"
pickup_sound = 'sound/handling/wirecutter_pickup.ogg'
drop_sound = 'sound/handling/wirecutter_drop.ogg'
- flags_atom = FPRINT|CONDUCT
+ flags_atom = FPRINT|CONDUCT|MAP_COLOR_INDEX
force = 5
w_class = SIZE_SMALL
throwforce = 5
throw_range = 15
throw_speed = SPEED_VERY_FAST
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi',
+ )
/// If FALSE won't change icon_state to a camo marine bino.
var/uses_camo = TRUE
var/tile_offset = 11
@@ -19,8 +23,6 @@
var/hvh_tile_offset = 6 //same as miniscopes
var/hvh_zoom_viewsize = 7
- //matter = list("metal" = 50,"glass" = 50)
-
/obj/item/device/binoculars/Initialize()
. = ..()
if(!uses_camo)
diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm
index 6c00364642da..7402070e236d 100644
--- a/code/game/objects/items/devices/coins.dm
+++ b/code/game/objects/items/devices/coins.dm
@@ -1,7 +1,7 @@
//*****************************Coin********************************/
/obj/item/coin
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/economy.dmi'
name = "Coin"
icon_state = "coin"
flags_atom = FPRINT|CONDUCT
@@ -86,7 +86,7 @@
to_chat(user, SPAN_NOTICE("There already is a string attached to this coin."))
return
if (CC.use(1))
- overlays += image('icons/obj/items/items.dmi',"coin_string_overlay")
+ overlays += image('icons/obj/items/economy.dmi',"coin_string_overlay")
string_attached = 1
to_chat(user, SPAN_NOTICE("You attach a string to the coin."))
else
diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm
deleted file mode 100644
index 30766ec86144..000000000000
--- a/code/game/objects/items/devices/debugger.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/obj/item/device/debugger
- name = "debugger"
- desc = "Used to debug electronic equipment."
- icon_state = "hacktool-g"
- flags_atom = FPRINT|CONDUCT
- force = 5
- w_class = SIZE_SMALL
- throwforce = 5
- throw_range = 15
- throw_speed = SPEED_VERY_FAST
- desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-
- matter = list("metal" = 50,"glass" = 20)
-
-
- var/obj/structure/machinery/telecomms/buffer // simple machine buffer for device linkage
-
-/obj/item/device/debugger/is_used_on(obj/O, mob/user)
- if(istype(O, /obj/structure/machinery/power/apc))
- to_chat(user, SPAN_NOTICE(" The device's software appears to be fine."))
- return 1
- if(istype(O, /obj/structure/machinery/door))
- var/obj/structure/machinery/door/D = O
- if(D.operating == -1)
- to_chat(user, SPAN_DANGER("There is a software error with the device."))
- else
- to_chat(user, SPAN_NOTICE(" The device's software appears to be fine."))
- return 1
- else if(istype(O, /obj/structure/machinery))
- to_chat(user, SPAN_NOTICE(" The device's software appears to be fine."))
- return 1
diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm
index 2debcf82d7d0..666893b16fd2 100644
--- a/code/game/objects/items/devices/defibrillator.dm
+++ b/code/game/objects/items/devices/defibrillator.dm
@@ -3,6 +3,7 @@
desc = "A handheld emergency defibrillator, used to restore fibrillating patients. Can optionally bring people back from the dead."
icon_state = "defib"
item_state = "defib"
+ icon = 'icons/obj/items/experimental_tools.dmi'
flags_atom = FPRINT|CONDUCT
flags_item = NOBLUDGEON
flags_equip_slot = SLOT_WAIST
@@ -23,6 +24,7 @@
var/datum/effect_system/spark_spread/sparks = new
var/defib_cooldown = 0 //Cooldown for toggling the defib
var/shock_cooldown = 0 //cooldown for shocking someone - separate to toggling
+ var/base_icon_state = "defib" //used for overlays of charge
/mob/living/carbon/human/proc/check_tod()
if(!undefibbable && world.time <= timeofdeath + revive_grace_period)
@@ -52,15 +54,15 @@
if(dcell && dcell.charge)
switch(floor(dcell.charge * 100 / dcell.maxcharge))
if(67 to INFINITY)
- overlays += "+full"
+ overlays += "+[base_icon_state]full"
if(34 to 66)
- overlays += "+half"
+ overlays += "+[base_icon_state]half"
if(3 to 33)
- overlays += "+low"
+ overlays += "+[base_icon_state]low"
if(0 to 3)
- overlays += "+empty"
+ overlays += "+[base_icon_state]empty"
else
- overlays += "+empty"
+ overlays += "+[base_icon_state]empty"
/obj/item/device/defibrillator/get_examine_text(mob/user)
. = ..()
@@ -253,6 +255,7 @@
icon = 'icons/obj/items/experimental_tools.dmi'
icon_state = "compact_defib"
item_state = "defib"
+ base_icon_state = "compact_defib"
w_class = SIZE_MEDIUM
blocked_by_suit = FALSE
min_heart_damage_dealt = 0
@@ -266,5 +269,6 @@
icon = 'icons/obj/items/experimental_tools.dmi'
icon_state = "compact_defib"
item_state = "defib"
+ base_icon_state = "compact_defib"
w_class = SIZE_SMALL
charge_cost = 99
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index ee74a83613c3..97aba1807f23 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -160,25 +160,3 @@
M.apply_effect(10, WEAKEN)
M.visible_message(SPAN_DISARM("[M] is blinded by \the [src]!"))
-/obj/item/device/flash/synthetic
- name = "synthetic flash"
- desc = "When a problem arises, SCIENCE is the solution. Only good for one use."
- icon_state = "sflash"
-
-/obj/item/device/flash/synthetic/attack(mob/living/M as mob, mob/user as mob)
- ..()
- if(!broken)
- broken = TRUE
- to_chat(user, SPAN_DANGER("The bulb has burnt out!"))
- update_icon()
-
-/obj/item/device/flash/synthetic/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
- ..()
- if(!broken)
- broken = TRUE
- to_chat(user, SPAN_DANGER("The bulb has burnt out!"))
- update_icon()
-
-/obj/item/device/flash/old
- name = "old-looking flash"
- icon_state = "flash_old"
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index f155233a6a96..08f8e4a1365e 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -3,6 +3,7 @@
desc = "A device used to project your voice. Loudly."
icon_state = "megaphone"
item_state = "megaphone"
+ icon = 'icons/obj/items/tools.dmi'
w_class = SIZE_SMALL
flags_atom = FPRINT|CONDUCT
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 0017e41219e5..6e57baee4533 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -7,6 +7,7 @@
desc = "A small 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."
icon_state = "multitool"
item_state = "multitool"
+ icon = 'icons/obj/items/tools.dmi'
pickup_sound = 'sound/handling/multitool_pickup.ogg'
drop_sound = 'sound/handling/multitool_drop.ogg'
flags_atom = FPRINT|CONDUCT
diff --git a/code/game/objects/items/devices/personal_data_transmitter.dm b/code/game/objects/items/devices/personal_data_transmitter.dm
index c5bcdd739608..fa2e6c26d797 100644
--- a/code/game/objects/items/devices/personal_data_transmitter.dm
+++ b/code/game/objects/items/devices/personal_data_transmitter.dm
@@ -145,6 +145,12 @@
/obj/item/clothing/accessory/pdt_bracelet
name = "\improper PDT bracelet"
desc = "A personal data transmitter bracelet, also known as a PDT, is a form of personal locator typically surgically implanted into the body of extrasolar colonists, among others. Its purpose is to allow rapid location of the associated personnel anywhere within a certain radius of the receiving equipment, sometimes up to 30km distance. This bracelet forms part of the PDT/L variant, which is a wearable version of the PDT technology. Both it and the linked locator tube share a serial number for ease of detection in case of mixup."
+ icon = 'icons/obj/items/clothing/accessory/watches.dmi'
+ icon_state = ""
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/watches.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/watches.dmi'
+ )
var/dummy_icon_state = "pdt_watch"
var/copied_serial_number = null
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index e2a77e4b8977..4d2c4890fec5 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -478,6 +478,7 @@ K9 SCANNER
desc = "A security access tuner with wires and electrical pins sticking out at odd angles. A handwritten label on the bottom says something about the ASRS system."
icon_state = "bm_hacker"
item_state = "analyzer"
+ icon = 'icons/obj/items/tools.dmi'
w_class = SIZE_SMALL
flags_atom = FPRINT
flags_equip_slot = SLOT_WAIST
diff --git a/code/game/objects/items/devices/vulture_spotter.dm b/code/game/objects/items/devices/vulture_spotter.dm
index 81ea4fa5dfdc..fc4674c678e3 100644
--- a/code/game/objects/items/devices/vulture_spotter.dm
+++ b/code/game/objects/items/devices/vulture_spotter.dm
@@ -3,6 +3,7 @@
desc = "A scope that, when mounted on a tripod, allows a user to assist the M707's firer in target acquisition."
icon_state = "vulture_scope"
item_state = "electronic"
+ icon = 'icons/obj/items/binoculars.dmi'
flags_atom = FPRINT|CONDUCT
unacidable = TRUE
explo_proof = TRUE
@@ -25,6 +26,7 @@
desc = "A tripod, meant for stabilizing a spotting scope for the M707 anti-materiel rifle."
icon_state = "vulture_tripod"
item_state = "electronic"
+ icon = 'icons/obj/items/binoculars.dmi'
flags_atom = FPRINT|CONDUCT
unacidable = TRUE
explo_proof = TRUE
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 07196a3e1bb9..56c09cb4acc2 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -2,11 +2,14 @@
name = "\improper whistle"
desc = "A metal pea-whistle. Can be blown while held, or worn in the mouth"
icon_state = "whistle"
+ icon = 'icons/obj/items/tools.dmi'
w_class = SIZE_TINY
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_FACE
actions_types = list(/datum/action/item_action/toggle/use)
-
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi'
+ )
var/volume = 60
var/spam_cooldown_time = 10 SECONDS
COOLDOWN_DECLARE(spam_cooldown)
diff --git a/code/game/objects/items/frames/frame.dm b/code/game/objects/items/frames/frame.dm
index 06b1c14e46c8..5652ba914897 100644
--- a/code/game/objects/items/frames/frame.dm
+++ b/code/game/objects/items/frames/frame.dm
@@ -9,7 +9,7 @@
/obj/item/frame/apc
name = "\improper APC frame"
desc = "Used for repairing or building APCs"
- icon = 'icons/obj/structures/machinery/apc_repair.dmi'
+ icon = 'icons/obj/structures/machinery/apc.dmi'
icon_state = "apc_frame"
flags_atom = FPRINT|CONDUCT
diff --git a/code/game/objects/items/frames/table_rack.dm b/code/game/objects/items/frames/table_rack.dm
index 95ab43869774..7a7bfa398a82 100644
--- a/code/game/objects/items/frames/table_rack.dm
+++ b/code/game/objects/items/frames/table_rack.dm
@@ -9,7 +9,7 @@
name = "tan table parts"
desc = "A kit for a table, including a large, flat metal surface and four legs. Some assembly required."
gender = PLURAL
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/table_parts.dmi'
icon_state = "tan_table_parts"
item_state = "tan_table_parts"
matter = list("metal" = 7500) //A table, takes two sheets to build
@@ -79,7 +79,7 @@
/obj/item/frame/table/reinforced
name = "reinforced table parts"
desc = "A kit for a table, including a large, flat metal surface and four legs. This kit has side panels. Some assembly required."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/table_parts.dmi'
icon_state = "reinf_tableparts"
matter = list("metal" = 15000) //A reinforced table. Two sheets of metal and four rods
table_type = /obj/structure/surface/table/reinforced
@@ -181,7 +181,7 @@
name = "rack parts"
gender = PLURAL
desc = "A kit for a storage rack with multiple metal shelves. Relatively cheap, useful for mass storage. Some assembly required."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/table_parts.dmi'
icon_state = "rack_parts"
flags_atom = FPRINT|CONDUCT
matter = list("metal" = 3750) //A big storage shelf, takes five sheets to build
diff --git a/code/game/objects/items/gift_wrappaper.dm b/code/game/objects/items/gift_wrappaper.dm
index ea2c19639b7a..82d4871fc4c0 100644
--- a/code/game/objects/items/gift_wrappaper.dm
+++ b/code/game/objects/items/gift_wrappaper.dm
@@ -10,7 +10,7 @@
/obj/item/a_gift
name = "gift"
desc = "PRESENTS!!!! eek!"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/gifts.dmi'
icon_state = "gift1"
item_state = "gift1"
@@ -118,7 +118,7 @@
/obj/item/wrapping_paper
name = "wrapping paper"
desc = "You can use this to wrap items in."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "wrap_paper"
var/amount = 20
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index af71b806ed42..d0aded6a9c13 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -1,4 +1,5 @@
/obj/item/restraint
+ icon = 'icons/obj/items/security.dmi'
/// SLOT_HANDS or SLOT_LEGS, for handcuffs or legcuffs
var/target_zone = SLOT_HANDS
/// How long to break out
@@ -65,7 +66,6 @@
name = "handcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
- icon = 'icons/obj/items/items.dmi'
icon_state = "handcuff"
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_WAIST
@@ -78,8 +78,9 @@
/obj/item/restraint/handcuffs/get_mob_overlay(mob/user_mob, slot)
var/image/ret = ..()
- var/image/handcuffs = overlay_image('icons/mob/mob.dmi', "handcuff1", color, RESET_COLOR)
- ret.overlays += handcuffs
+ if(slot == WEAR_HANDCUFFS)
+ var/image/handcuffs = overlay_image('icons/mob/humans/onmob/cuffs.dmi', "handcuff1", color, RESET_COLOR)
+ ret.overlays += handcuffs
return ret
@@ -195,7 +196,7 @@
name = "xeno restraints"
desc = "Use this to hold xenomorphic creatures safely."
gender = PLURAL
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/security.dmi'
icon_state = "handcuff"
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_WAIST
diff --git a/code/game/objects/items/handheld_distress_beacon.dm b/code/game/objects/items/handheld_distress_beacon.dm
index a6152b648c63..f621a5043c0d 100644
--- a/code/game/objects/items/handheld_distress_beacon.dm
+++ b/code/game/objects/items/handheld_distress_beacon.dm
@@ -3,7 +3,7 @@
/obj/item/handheld_distress_beacon
name = "\improper PMC handheld distress beacon"
desc = "A standard handheld distress beacon. Generally used by teams who may be out of regular communications range but must signal for assistance. This one is branded with a Weyland Yutani symbol and sold en masse to colonies across the Neroid Sector."
- icon = 'icons/obj/items/handheld_distress_beacon.dmi'
+ icon = 'icons/obj/items/devices.dmi'
icon_state = "beacon_inactive"
w_class = SIZE_SMALL
diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm
index 67d23ad5b45d..b76699bfc5bc 100644
--- a/code/game/objects/items/implants/implantcase.dm
+++ b/code/game/objects/items/implants/implantcase.dm
@@ -3,7 +3,7 @@
/obj/item/implantcase
name = "Glass Case"
desc = "A case containing an implant."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/syringe.dmi'
icon_state = "implantcase-0"
item_state = "implantcase"
throw_speed = SPEED_FAST
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
deleted file mode 100644
index bcec5100aae4..000000000000
--- a/code/game/objects/items/implants/implantchair.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-/obj/structure/machinery/implantchair
- name = "loyalty implanter"
- desc = "Used to implant occupants with loyalty implants."
- icon = 'icons/obj/structures/machinery/implantchair.dmi'
- icon_state = "implantchair"
- density = TRUE
- opacity = FALSE
- anchored = TRUE
-
- var/ready = 1
- var/malfunction = 0
- var/list/obj/item/implant/loyalty/implant_list = list()
- var/max_implants = 5
- var/injection_cooldown = 600
- var/replenish_cooldown = 6000
- var/replenishing = 0
- var/mob/living/carbon/occupant = null
- var/injecting = 0
-
-/obj/structure/machinery/implantchair/New()
- ..()
- add_implants()
-
-
-/obj/structure/machinery/implantchair/attack_hand(mob/user as mob)
- user.set_interaction(src)
- var/health_text = ""
- if(src.occupant)
- if(src.occupant.health <= -100)
- health_text = "Dead"
- else if(src.occupant.health < 0)
- health_text = "[round(src.occupant.health,0.1)]"
- else
- health_text = "[round(src.occupant.health,0.1)]"
-
- var/dat ="Implanter Status
"
-
- dat +="Current occupant: [src.occupant ? "
Name: [src.occupant]
Health: [health_text]
" : "None"]
"
- dat += "Implants: [length(src.implant_list) ? "[length(implant_list)]" : "Replenish"]
"
- if(src.occupant)
- dat += "[src.ready ? "Implant" : "Recharging"]
"
- user.set_interaction(src)
- user << browse(dat, "window=implant")
- onclose(user, "implant")
-
-
-/obj/structure/machinery/implantchair/Topic(href, href_list)
- . = ..()
- if(.)
- return
- if((get_dist(src, usr) <= 1) || isRemoteControlling(usr))
- if(href_list["implant"])
- if(src.occupant)
- injecting = 1
- go_out()
- ready = 0
- spawn(injection_cooldown)
- ready = 1
-
- if(href_list["replenish"])
- ready = 0
- spawn(replenish_cooldown)
- add_implants()
- ready = 1
-
- src.updateUsrDialog()
- src.add_fingerprint(usr)
- return
-
-/obj/structure/machinery/implantchair/attackby(obj/item/I, mob/user as mob)
- if(istype(I, /obj/item/grab))
- var/obj/item/grab/G = I
- if(ismob(G.grabbed_thing))
- put_mob(G.grabbed_thing)
- return
- updateUsrDialog()
- return
-
-
-/obj/structure/machinery/implantchair/proc/go_out(mob/M)
- if(!( src.occupant ))
- return
- if(M == occupant) // so that the guy inside can't eject himself -Agouri
- return
- if (src.occupant.client)
- src.occupant.client.eye = src.occupant.client.mob
- src.occupant.client.perspective = MOB_PERSPECTIVE
- src.occupant.forceMove(src.loc)
- if(injecting)
- implant(src.occupant)
- injecting = 0
- src.occupant = null
- icon_state = "implantchair"
- return
-
-
-/obj/structure/machinery/implantchair/proc/put_mob(mob/living/carbon/M as mob)
- if(!iscarbon(M))
- to_chat(usr, SPAN_DANGER("The [src.name] cannot hold this!"))
- return
- if(src.occupant)
- to_chat(usr, SPAN_DANGER("The [src.name] is already occupied!"))
- return
- M.forceMove(src)
- src.occupant = M
- src.add_fingerprint(usr)
- icon_state = "implantchair_on"
- return 1
-
-
-/obj/structure/machinery/implantchair/proc/implant(mob/M)
- if (!istype(M, /mob/living/carbon))
- return
- if(!length(implant_list)) return
- for(var/obj/item/implant/loyalty/imp in implant_list)
- if(!imp) continue
- if(istype(imp, /obj/item/implant/loyalty))
- for (var/mob/O in viewers(M, null))
- O.show_message(SPAN_DANGER("[M] has been implanted by the [src.name]."), SHOW_MESSAGE_VISIBLE)
-
- if(imp.implanted(M))
- imp.forceMove(M)
- imp.imp_in = M
- imp.implanted = 1
- implant_list -= imp
- break
- return
-
-/obj/structure/machinery/implantchair/proc/add_implants()
- for(var/i=0, i= (storage_slots-1))
-
- to_chat(user, SPAN_WARNING("[src] is full."))
- return FALSE
- return ..()
-
-/obj/item/storage/belt/gun/flaregun/handle_item_insertion(obj/item/new_item, prevent_warning = FALSE, mob/user)
-
- if(istype(new_item, /obj/item/device/flashlight/flare) && length(holstered_guns) < 1 && length(contents) >= (storage_slots-1))
- return FALSE
- return ..()
-
-/obj/item/storage/belt/gun/flaregun/has_room(obj/item/new_item, W_class_override = null)
-
- if(istype(new_item, /obj/item/device/flashlight/flare) && length(holstered_guns) < 1 && length(contents) >= (storage_slots-1))
- return FALSE //No slot open because gun in holster.
- return ..()
-
/obj/item/storage/belt/equipped(mob/user, slot)
switch(slot)
if(WEAR_WAIST, WEAR_J_STORE, WEAR_BACK)
@@ -71,13 +52,24 @@
desc = "Proves to the world that you are the strongest!"
icon_state = "championbelt"
item_state = "champion"
+ icon = 'icons/obj/items/clothing/belts/misc.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/misc.dmi'
+ )
storage_slots = 1
can_hold = list(/obj/item/clothing/mask/luchador)
-
-
-
-
+/obj/item/storage/belt/quackers
+ name = "Mr. Quackers"
+ desc = "What are we going to do today, Mr. Quackers?"
+ icon_state = "inflatable"
+ item_state = "inflatable"
+ icon = 'icons/obj/items/clothing/belts/misc.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/misc.dmi'
+ )
+ storage_slots = 1
+ can_hold = list(/obj/item/toy/bikehorn)
//============================//MARINE BELTS\\==================================\\
//=======================================================================\\
@@ -264,6 +256,10 @@
desc = "The M276 is the standard load-bearing equipment of the USCM. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies, and is common among medics. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them."
icon_state = "medicbag"
item_state = "medicbag"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ )
storage_slots = 21 //can hold 3 "rows" of very limited medical equipment, but it *should* give a decent boost to squad medics.
max_storage_space = 42
max_w_class = SIZE_SMALL
@@ -283,6 +279,25 @@
)
has_gamemode_skin = TRUE
+/obj/item/storage/belt/medical/lifesaver/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/classic.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/desert.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/urban.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi'
+
/obj/item/storage/belt/medical/lifesaver/full/fill_preset_inventory()
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
@@ -359,6 +374,12 @@
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."
icon_state = "medicbag_u"
item_state = "medicbag_u"
+ icon = 'icons/obj/items/clothing/belts/belts_by_faction/UPP.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_faction/UPP.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
has_gamemode_skin = FALSE
/obj/item/storage/belt/medical/lifesaver/upp/full/fill_preset_inventory()
@@ -424,9 +445,14 @@
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions."
icon_state = "securitybelt"
item_state = "security"//Could likely use a better one.
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
item_state_slots = list(
- WEAR_L_HAND = "s_marinebelt",
- WEAR_R_HAND = "s_marinebelt")
+ WEAR_L_HAND = "marinebelt",
+ WEAR_R_HAND = "marinebelt"
+ )
storage_slots = 7
max_w_class = SIZE_MEDIUM
max_storage_space = 21
@@ -452,21 +478,6 @@
/obj/item/device/clue_scanner,
)
-
-
-/obj/item/storage/belt/security/tactical
- name = "combat belt"
- desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
- icon_state = "swatbelt"
- item_state = "swatbelt"
- item_state_slots = list(
- WEAR_L_HAND = "upp_belt",
- WEAR_R_HAND = "upp_belt")
- storage_slots = 9
- max_w_class = SIZE_MEDIUM
- max_storage_space = 21
-
-
/obj/item/storage/belt/security/MP
name = "\improper M276 pattern military police rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is filled with an array of small pouches, meant to carry non-lethal equipment and restraints."
@@ -535,6 +546,10 @@
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This is the standard variant, designed for bulk ammunition-carrying operations."
icon_state = "marinebelt"
item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ )
w_class = SIZE_LARGE
storage_slots = 5
max_w_class = SIZE_MEDIUM
@@ -558,6 +573,25 @@
)
has_gamemode_skin = TRUE
+/obj/item/storage/belt/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/classic.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/desert.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/urban.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi'
+
/obj/item/storage/belt/marine/m41a/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/rifle (src)
@@ -676,21 +710,17 @@
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
-/obj/item/storage/belt/marine/quackers
- name = "Mr. Quackers"
- desc = "What are we going to do today, Mr. Quackers?"
- icon_state = "inflatable"
- item_state = "inflatable"
- item_state_slots = list(
- WEAR_L_HAND = "marinebelt",
- WEAR_R_HAND = "marinebelt")
- has_gamemode_skin = FALSE
-
/obj/item/storage/belt/marine/upp
name = "\improper Type 41 pattern load rig"
desc = "The Type 41 load rig is the standard-issue load-bearing equipment of the UPP military. The primary function of this belt is to provide easy access to mags for the Type 71 during operations. Despite being designed for the Type 71 weapon system, the pouches are modular enough to fit other types of ammo and equipment."
icon_state = "upp_belt"
item_state = "upp_belt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_faction/UPP.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_faction/UPP.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
has_gamemode_skin = FALSE
//version full of type 71 mags
@@ -716,9 +746,16 @@
desc = "The M804 heavygunner storage rig is an M276 pattern toolbelt rig modified to carry ammunition for heavy machinegun systems, and engineering tools for the gunner."
icon_state = "m2c_ammo_rig"
item_state = "m2c_ammo_rig"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
item_state_slots = list(
- WEAR_L_HAND = "s_marinebelt",
- WEAR_R_HAND = "s_marinebelt")
+ WEAR_L_HAND = "marinebelt",
+ WEAR_R_HAND = "marinebelt"
+ )
storage_slots = 7
max_w_class = SIZE_LARGE
max_storage_space = 30
@@ -741,6 +778,10 @@
desc = "An ammunition belt designed to hold shotgun shells or individual bullets."
icon_state = "shotgunbelt"
item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ )
w_class = SIZE_LARGE
storage_slots = 14 // Make it FLUSH with the UI. *scream
max_w_class = SIZE_SMALL
@@ -749,6 +790,22 @@
flap = FALSE
has_gamemode_skin = TRUE
+/obj/item/storage/belt/shotgun/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/classic.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/desert.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi'
+
/obj/item/storage/belt/shotgun/full/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/handful/shotgun/slug(src)
@@ -784,6 +841,12 @@
name = "two bore bandolier"
desc = "A leather bandolier designed to hold extremely heavy shells. Can be attached to armor, worn over the back, or attached to belt loops."
icon_state = "van_bandolier_5"
+ icon = 'icons/obj/items/clothing/belts/misc.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/misc.dmi',
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/misc.dmi',
+ WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/suit_storage/misc.dmi'
+ )
flags_equip_slot = SLOT_WAIST|SLOT_BACK
storage_slots = null
max_storage_space = 20
@@ -793,7 +856,7 @@
WEAR_J_STORE = "van_bandolier_10",
WEAR_BACK = "van_bandolier_10",
WEAR_WAIST = "van_bandolier_10"
- )
+ )
/obj/item/storage/belt/shotgun/van_bandolier/update_icon()
var/mob/living/carbon/human/user = loc
@@ -863,21 +926,15 @@
else
return ..()
-/obj/item/storage/belt/shotgun/full/quackers
- icon_state = "inflatable"
- item_state = "inflatable"
- item_state_slots = list(
- WEAR_L_HAND = "marinebelt",
- WEAR_R_HAND = "marinebelt")
- name = "Mrs. Quackers"
- desc = "She always did have a meaner temper."
- has_gamemode_skin = FALSE
-
/obj/item/storage/belt/knifepouch
name="\improper M276 pattern knife rig"
desc="The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is specially designed to store knives. Not commonly issued, but kept in service."
icon_state = "knifebelt"
item_state = "marinebelt" // aslo temp, maybe somebody update these icons with better ones?
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ )
w_class = SIZE_LARGE
storage_slots = 12
storage_flags = STORAGE_FLAGS_DEFAULT|STORAGE_USING_DRAWING_METHOD|STORAGE_ALLOW_QUICKDRAW
@@ -889,9 +946,26 @@
)
cant_hold = list()
flap = FALSE
+ has_gamemode_skin = TRUE
COOLDOWN_DECLARE(draw_cooldown)
+/obj/item/storage/belt/knifepouch/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/classic.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/desert.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi'
+
/obj/item/storage/belt/knifepouch/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/weapon/throwing_knife(src)
@@ -916,11 +990,17 @@
/obj/item/storage/belt/grenade
name="\improper M276 pattern M40 Grenade rig"
desc="The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is designed to carry bulk quantities of M40 pattern and AGM pattern Grenades."
- icon_state = "grenadebelt" // temp
+ icon_state = "grenadebelt"
item_state = "grenadebelt"
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
item_state_slots = list(
- WEAR_L_HAND = "s_marinebelt",
- WEAR_R_HAND = "s_marinebelt")
+ WEAR_L_HAND = "marinebelt",
+ WEAR_R_HAND = "marinebelt"
+ )
w_class = SIZE_LARGE
storage_slots = 12
max_w_class = SIZE_MEDIUM
@@ -989,6 +1069,10 @@
desc = "A belt-holster assembly that allows one to hold a pistol and two magazines."
icon_state = "m4a3_holster"
item_state = "marinebelt" //see post_skin_selection() - this is used for inhand states, the belt sprites use the same filename as the icon state.
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ )
use_sound = null
w_class = SIZE_LARGE
storage_slots = 5
@@ -1016,6 +1100,27 @@
/obj/item/ammo_magazine/pistol,
)
+/obj/item/storage/belt/gun/Initialize()
+ . = ..()
+ if(has_gamemode_skin)
+ select_gamemode_skin(type)
+
+/obj/item/storage/belt/gun/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/classic.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/desert.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons[WEAR_WAIST] = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi'
+
/obj/item/storage/belt/gun/post_skin_selection()
base_icon = icon_state
//Saving current inhands, since we'll be switching item_state around for belt onmobs.
@@ -1073,15 +1178,15 @@
sure that we don't have to do any extra calculations.
*/
playsound(src, drawSound, 7, TRUE)
- var/image/gun_underlay = image(icon, current_gun.base_gun_icon)
+ var/image/gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', current_gun.base_gun_icon)
if(gun_has_gamemode_skin)
switch(SSmapping.configs[GROUND_MAP].camouflage_type)
if("snow")
- gun_underlay = image(icon, "s_" + current_gun.base_gun_icon)
+ gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', "s_" + current_gun.base_gun_icon)
if("desert")
- gun_underlay = image(icon, "d_" + current_gun.base_gun_icon)
+ gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', "d_" + current_gun.base_gun_icon)
if("classic")
- gun_underlay = image(icon, "c_" + current_gun.base_gun_icon)
+ gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', "c_" + current_gun.base_gun_icon)
gun_underlay.pixel_x = holster_slots[slot]["icon_x"]
gun_underlay.pixel_y = holster_slots[slot]["icon_y"]
gun_underlay.color = current_gun.color
@@ -1179,7 +1284,6 @@
else
to_chat(user, SPAN_WARNING("[src] is full."))
-
/obj/item/storage/belt/gun/m4a3
name = "\improper M276 pattern general pistol holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version has a holster assembly that allows one to carry the most common pistols. It also contains side pouches that can store most pistol magazines."
@@ -1290,6 +1394,17 @@
name = "customized nailgun holster"
desc = "Combination of a M276 pistol holster and engineering toolbelt that have been cannibalized into a unique belt that can holster a compact nailgun and two spare nailgun magazines."
icon_state = "nailgun_holster"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_WAIST = "combatutility",
+ WEAR_L_HAND = "utility",
+ WEAR_R_HAND = "utility"
+ )
storage_slots = 3
can_hold = list(
/obj/item/weapon/gun/smg/nailgun/compact,
@@ -1306,7 +1421,13 @@
name = "\improper M276 pattern M39 holster rig"
desc = "Special issue variant of the M276 designed to holster a M39 submachine gun and two spare magazines. Uncommonly issued to USCM support and specialist personnel."
icon_state = "m39_armor"
- item_state = "s_marinebelt"
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
storage_slots = 3
max_w_class = 5
can_hold = list(
@@ -1416,6 +1537,13 @@
name = "custom-tooled gunslinger's belt"
desc = "It's always high noon somewhere."
icon_state = "gunslinger_holster"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
storage_slots = 6
can_hold = list(
/obj/item/weapon/gun/revolver,
@@ -1498,8 +1626,14 @@
/obj/item/storage/belt/gun/mateba
name = "\improper M276 pattern Mateba holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, along with five small pouches for speedloaders. This one is aging poorly, and seems to be surplus equipment. It's stamped '3rd 'Dust Raiders' Battalion'."
- icon_state = "s_cmateba_holster"
- item_state = "s_marinebelt"
+ icon_state = "cmateba_holster"
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
storage_slots = 7
max_w_class = SIZE_MEDIUM
can_hold = list(
@@ -1550,9 +1684,15 @@
desc = "The M276 is the standard load-bearing equipment of the USCM. \
It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, \
along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official."
-
icon_state = "amateba_holster"
- item_state = "s_marinebelt"
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ has_gamemode_skin = FALSE
/obj/item/storage/belt/gun/mateba/council/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/engraved())
@@ -1567,9 +1707,15 @@
desc = "The M276 is the standard load-bearing equipment of the USCM. \
It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, \
along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official."
-
icon_state = "amateba_holster"
- item_state = "s_marinebelt"
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ has_gamemode_skin = FALSE
/obj/item/storage/belt/gun/mateba/general/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/general())
@@ -1600,9 +1746,15 @@
desc = "The M276 is the standard load-bearing equipment of the USCM. \
It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, \
along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official."
-
icon_state = "amateba_holster"
- item_state = "s_marinebelt"
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ has_gamemode_skin = FALSE
/obj/item/storage/belt/gun/mateba/pmc/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/general())
@@ -1617,6 +1769,12 @@
desc = "This UPP-designed sidearm rig can very snugly and securely fit a Type-73, NP92, or a ZHNK-72, and their magazines or speedloaders. However, it lacks versatility in stored weaponry."
icon_state = "korovin_holster"
item_state = "upp_belt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_faction/UPP.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_faction/UPP.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
storage_slots = 7
can_hold = list(
/obj/item/weapon/gun/pistol/t73,
@@ -1726,7 +1884,13 @@
storage_slots = 17
max_storage_space = 20
icon_state = "m82f_holster"
- item_state = "s_marinebelt"
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
can_hold = list(
/obj/item/weapon/gun/flare,
/obj/item/device/flashlight/flare,
@@ -1736,6 +1900,26 @@
"icon_x" = -1,
"icon_y" = -3))
+/obj/item/storage/belt/gun/flaregun/dump_into(obj/item/storage/origin_storage, mob/user)
+
+ if(length(holstered_guns) < 1 && length(contents) >= (storage_slots-1))
+
+ to_chat(user, SPAN_WARNING("[src] is full."))
+ return FALSE
+ return ..()
+
+/obj/item/storage/belt/gun/flaregun/handle_item_insertion(obj/item/new_item, prevent_warning = FALSE, mob/user)
+
+ if(istype(new_item, /obj/item/device/flashlight/flare) && length(holstered_guns) < 1 && length(contents) >= (storage_slots-1))
+ return FALSE
+ return ..()
+
+/obj/item/storage/belt/gun/flaregun/has_room(obj/item/new_item, W_class_override = null)
+
+ if(istype(new_item, /obj/item/device/flashlight/flare) && length(holstered_guns) < 1 && length(contents) >= (storage_slots-1))
+ return FALSE //No slot open because gun in holster.
+ return ..()
+
/obj/item/storage/belt/gun/flaregun/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/flare())
for(var/i = 1 to storage_slots - 1)
@@ -1756,6 +1940,12 @@
name = "\improper Webley Mk VI gunbelt"
desc = "Finely-tooled British leather, a Webley, and six speedloaders of .455. More than enough to kill anything with legs."
icon_state = "m44r_holster"
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
storage_slots = 7
can_hold = list(
/obj/item/weapon/gun/revolver/m44/custom/webley,
@@ -1800,6 +1990,13 @@
/obj/item/storage/belt/gun/smartgunner/pmc
name = "\improper M802 pattern 'Dirty' smartgunner sidearm rig"
desc = "A modification of the standard M802 load-bearing equipment, designed to carry smartgun ammunition and a sidearm."
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ has_gamemode_skin = FALSE
can_hold = list(
/obj/item/device/flashlight/flare,
/obj/item/weapon/gun/flare,
@@ -1810,7 +2007,6 @@
/obj/item/ammo_magazine/pistol,
/obj/item/ammo_magazine/smartgun,
)
- has_gamemode_skin = TRUE
/obj/item/storage/belt/gun/smartgunner/pmc/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/vp78())
@@ -1822,6 +2018,13 @@
/obj/item/storage/belt/gun/smartgunner/whiteout
name = "\improper M802 pattern 'Terminator' smartgunner sidearm rig"
desc = "A modification of the standard M802 load-bearing equipment, designed to carry smartgun ammunition and a Mateba revolver."
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ has_gamemode_skin = FALSE
can_hold = list(
/obj/item/device/flashlight/flare,
/obj/item/weapon/gun/flare,
@@ -1832,7 +2035,6 @@
/obj/item/ammo_magazine/pistol,
/obj/item/ammo_magazine/smartgun,
)
- has_gamemode_skin = TRUE
/obj/item/storage/belt/gun/smartgunner/whiteout/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/pmc())
@@ -1844,6 +2046,13 @@
/obj/item/storage/belt/gun/smartgunner/clf
name = "\improper M802 pattern 'Freedom' smartgunner sidearm rig"
desc = "A modification of the standard M802 load-bearing equipment, designed to carry smartgun ammunition and a Mateba revolver. This one has the CLF logo carved over the manufacturing stamp."
+ icon = 'icons/obj/items/clothing/belts/belts_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
+ has_gamemode_skin = FALSE
can_hold = list(
/obj/item/device/flashlight/flare,
/obj/item/weapon/gun/flare,
@@ -1854,7 +2063,6 @@
/obj/item/ammo_magazine/pistol,
/obj/item/ammo_magazine/smartgun,
)
- has_gamemode_skin = TRUE
/obj/item/storage/belt/gun/smartgunner/clf/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba())
@@ -1883,6 +2091,17 @@
storage_slots = 9
icon_state = "combatutility"
item_state= "utility"
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_WAIST = "combatutility",
+ WEAR_L_HAND = "utility",
+ WEAR_R_HAND = "utility"
+ )
can_hold = list(
/obj/item/weapon/gun/pistol,
/obj/item/weapon/gun/revolver,
@@ -1933,7 +2152,8 @@
item_state = "tankbelt"
item_state_slots = list(
WEAR_L_HAND = "utility",
- WEAR_R_HAND = "utility")
+ WEAR_R_HAND = "utility"
+ )
storage_slots = 2 //can hold 2 only two large items such as Tank Ammo.
max_w_class = SIZE_LARGE
max_storage_space = 2
@@ -1955,10 +2175,14 @@
name = "\improper Souto belt"
desc = "Souto Man's trusty utility belt with breakaway Souto cans. They cannot be put back."
icon_state = "souto_man"
- item_state = "souto_man"
- item_state_slots = list(
- WEAR_L_HAND = "s_marinebelt",
- WEAR_R_HAND = "s_marinebelt")
+ item_state = "marinebelt"
+ icon = 'icons/obj/items/clothing/belts/misc.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/misc.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
flags_equip_slot = SLOT_WAIST
storage_flags = STORAGE_FLAGS_DEFAULT|STORAGE_USING_DRAWING_METHOD
storage_slots = 8
@@ -1984,6 +2208,16 @@
desc = "Good for carrying around extra ammo in the heat of the jungle. Made of special rot-resistant fabric."
icon_state = "rmc_ammo"
item_state = "rmc_ammo"
+ icon = 'icons/obj/items/clothing/belts/belts_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_faction/TWE.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "upp_belt",
+ WEAR_R_HAND = "upp_belt"
+ )
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
has_gamemode_skin = FALSE
@@ -2000,13 +2234,30 @@
desc = "The L75 is the standard load-bearing equipment of the RMC. It consists of a modular belt with various clips. This version is designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them."
icon_state = "rmc_medical"
item_state = "rmc_medical"
+ icon = 'icons/obj/items/clothing/belts/belts_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_faction/TWE.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "upp_belt",
+ WEAR_R_HAND = "upp_belt"
+ )
+ has_gamemode_skin = FALSE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
/obj/item/storage/belt/gun/l905
name = "\improper L905 gunbelt"
desc = "Finely-tooled leather, a L905, and six magazines. More than enough for the standard RMC commando."
icon_state = "rmc_pistol"
- item_state = "rmc_pistol"
+ item_state = "upp_belt"
+ icon = 'icons/obj/items/clothing/belts/belts_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_faction/TWE.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
storage_slots = 7
can_hold = list(
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 0647d214be97..e1b934c9011b 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -313,7 +313,7 @@
/obj/item/storage/box/monkeycubes
name = "monkey cube box"
desc = "Drymate brand monkey cubes. Just add water!"
- icon = 'icons/obj/items/food.dmi'
+ icon = 'icons/obj/items/storage/boxes.dmi'
icon_state = "monkeycubebox"
/obj/item/storage/box/monkeycubes/fill_preset_inventory()
@@ -485,7 +485,7 @@
/obj/item/storage/box/matches
name = "matchbox"
desc = "A small box of 'Space-Proof' premium matches."
- icon = 'icons/obj/items/cigarettes.dmi'
+ icon = 'icons/obj/items/smoking/matches.dmi'
icon_state = "matchbox"
item_state = "zippo"
w_class = SIZE_TINY
@@ -652,6 +652,10 @@
var/type_icon = "hedp"
var/grenade_type = /obj/item/explosive/grenade/high_explosive
has_gamemode_skin = TRUE
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
/obj/item/storage/box/nade_box/Initialize()
. = ..()
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 79d38603dc7e..d58ed91cce38 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -17,7 +17,7 @@
*/
/obj/item/storage/fancy
- icon = 'icons/obj/items/food.dmi'
+ icon = 'icons/obj/items/food/donuts.dmi'
icon_state = "donutbox"
name = "donut box"
desc = "A box where round, heavenly, holey pastries reside."
@@ -45,7 +45,7 @@
// EGG BOX
/obj/item/storage/fancy/egg_box
- icon = 'icons/obj/items/food.dmi'
+ icon = 'icons/obj/items/food/eggs.dmi'
icon_state = "eggbox"
icon_type = "egg"
name = "egg carton"
@@ -64,7 +64,7 @@
/obj/item/storage/fancy/candle_box
name = "candle pack"
desc = "A pack of red candles."
- icon = 'icons/obj/items/candle.dmi'
+ icon = 'icons/obj/items/storage/boxes.dmi'
icon_state = "candlebox5"
icon_type = "candle"
item_state = "candlebox5"
@@ -83,7 +83,7 @@
/obj/item/storage/fancy/crayons
name = "box of crayons"
desc = "A box of every flavor of crayon."
- icon = 'icons/obj/items/crayons.dmi'
+ icon = 'icons/obj/items/paint.dmi'
icon_state = "crayonbox"
w_class = SIZE_SMALL
storage_slots = 6
@@ -101,9 +101,9 @@
/obj/item/storage/fancy/crayons/update_icon()
overlays = list() //resets list
- overlays += image('icons/obj/items/crayons.dmi',"crayonbox")
+ overlays += image('icons/obj/items/paint.dmi',"crayonbox")
for(var/obj/item/toy/crayon/crayon in contents)
- overlays += image('icons/obj/items/crayons.dmi',crayon.colorName)
+ overlays += image('icons/obj/items/paint.dmi',crayon.colorName)
/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/toy/crayon))
@@ -119,7 +119,7 @@
// CIGARETTES BOX
/obj/item/storage/fancy/cigarettes
- icon = 'icons/obj/items/cigarettes.dmi'
+ icon = 'icons/obj/items/smoking/packets/normal.dmi'
icon_state = "cigpacket"
name = "cigarette packet"
desc = "A packet of cigarettes with a built-in lighter compartment."
@@ -176,12 +176,14 @@
name = "\improper Weyland-Yutani Gold packet"
desc = "Building Better Worlds, and rolling better cigarettes. These fancy cigarettes are Weyland-Yutani's entry into the market. Comes backed by a fierce legal team."
icon_state = "wypacket"
+ icon = 'icons/obj/items/smoking/packets/wy_gold.dmi'
item_state = "wypacket"
/obj/item/storage/fancy/cigarettes/lucky_strikes
name = "\improper Lucky Strikes Packet"
desc = "Lucky Strikes Means Fine Tobacco! 9/10 doctors agree on Lucky Strikes...as the leading cause of marine lung cancer."
icon_state = "lspacket"
+ icon = 'icons/obj/items/smoking/packets/lucky_strike.dmi'
item_state = "lspacket"
default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
@@ -189,6 +191,7 @@
name = "\improper Executive Select packet"
desc = "These cigarettes are the height of luxury. They're smooth, they're cool, and they smell like victory...and cigarette smoke."
icon_state = "blackpacket"
+ icon = 'icons/obj/items/smoking/packets/executive_select.dmi'
item_state = "blackpacket"
default_cig_type = /obj/item/clothing/mask/cigarette/bcigarette
@@ -196,18 +199,21 @@
name = "\improper Koorlander Gold packet"
desc = "Lovingly machine-rolled for YOUR pleasure. For when you want to look cool and the risk of a slow horrible death isn't really a factor."
icon_state = "kpacket"
+ icon = 'icons/obj/items/smoking/packets/koorlander.dmi'
item_state = "kpacket"
/obj/item/storage/fancy/cigarettes/arcturian_ace
name = "\improper Arcturian Ace packet"
desc = "An entry level brand of cigarettes with a bright blue packaging. You're guessing these aren't really good for you, but it doesn't matter when it's Arcturian baby!"
icon_state = "aapacket"
+ icon = 'icons/obj/items/smoking/packets/arcturian_ace.dmi'
item_state = "aapacket"
/obj/item/storage/fancy/cigarettes/lady_finger
name = "\improper Lady Fingers packet"
desc = "These intensely strong unfiltered menthol cigarettes don't seem very ladylike. They don't seem very fingerlike for that matter, either. Smoking may kill, but poor branding is almost as bad."
icon_state = "lfpacket"
+ icon = 'icons/obj/items/smoking/packets/lady_fingers.dmi'
item_state = "lfpacket"
default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
@@ -215,6 +221,7 @@
name = "\improper Lucky Strikes Mini Packet"
desc = "These four-packs of Luckies come in every MRE. They're not as good as the Habana Reals that come in the LACN MREs, but at least they're free."
icon_state = "ls4packet"
+ icon = 'icons/obj/items/smoking/packets/lucky_strike_mini.dmi'
item_state = "lspacket"
default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
storage_slots = 4
@@ -223,6 +230,7 @@
name = "\improper WeyYu Gold Military Trading Card packet"
desc = "Gotta collect 'em all, and smoke 'em all! This fancy military trading card version of Weyland Yutani Gold cigarette packs has one card that is apart of the 3 available 5-card sets."
icon_state = "collectpacket"
+ icon = 'icons/obj/items/smoking/packets/trading_card.dmi'
item_state = "collectpacket"
storage_slots = 21
can_hold = list(
@@ -266,7 +274,7 @@
desc = "A case for holding your cigars when you are not smoking them."
icon_state = "cigarcase"
item_state = "cigarcase"
- icon = 'icons/obj/items/cigarettes.dmi'
+ icon = 'icons/obj/items/smoking/cigars.dmi'
throwforce = 2
w_class = SIZE_SMALL
flags_equip_slot = SLOT_WAIST
@@ -327,6 +335,7 @@
desc = "A small book of cheap paper matches. Good luck getting them to light. Made by Lucky Strikes, but you'll be anything but lucky when you burn your hand trying to light a match on this."
icon_state = "mpacket"
item_state = "zippo"
+ icon = 'icons/obj/items/smoking/matches.dmi'
storage_slots = 6
can_hold = list()
icon_type = "match"
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 7a073042e122..1b663b53f4c6 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -4,7 +4,7 @@
name = "\improper Rifle Holster"
desc = "holster"
icon = 'icons/obj/items/storage/holsters.dmi'
- icon_state = "m37_holster"
+ icon_state = ""
w_class = SIZE_LARGE
flags_equip_slot = SLOT_BACK
max_w_class = SIZE_LARGE
@@ -14,7 +14,10 @@
///Icon/item states change based on contents; this stores base icon state.
var/base_icon
var/drawSound = 'sound/weapons/gun_rifle_draw.ogg'
-
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
/obj/item/storage/large_holster/post_skin_selection()
base_icon = icon_state
@@ -60,6 +63,10 @@
name = "\improper L44 M37A2 scabbard"
desc = "A large leather holster fitted for USCM-issue shotguns. It has harnesses that allow it to be secured to the back for easy storage."
icon_state = "m37_holster"
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/jungle.dmi'
+ )
max_w_class = SIZE_HUGE
can_hold = list(
/obj/item/weapon/gun/shotgun/pump,
@@ -68,6 +75,25 @@
)
has_gamemode_skin = TRUE
+/obj/item/storage/large_holster/m37/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/urban.dmi'
+
/obj/item/storage/large_holster/m37/full/fill_preset_inventory()
new /obj/item/weapon/gun/shotgun/pump(src)
@@ -77,6 +103,13 @@
icon_state = "machete_holster"
flags_equip_slot = SLOT_WAIST|SLOT_BACK
can_hold = list(/obj/item/weapon/sword/machete)
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/holster.dmi',
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/suit_storage/belts.dmi',
+ WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/suit_storage/belts.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi'
+ )
/obj/item/storage/large_holster/machete/full/fill_preset_inventory()
new /obj/item/weapon/sword/machete(src)
@@ -140,7 +173,7 @@
name = "\improper M276 pattern M39 holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This holster features a larger frame and stiff backboard to support a submachinegun. It's designed for the M39, but the clips are adjustable enough to fit most compact submachineguns. Due to its unorthodox design, it isn't a very common sight, and is only specially issued."
icon_state = "m39_holster"
- icon = 'icons/obj/items/clothing/belts.dmi'
+ icon = 'icons/obj/items/clothing/belts/belts.dmi'
flags_equip_slot = SLOT_WAIST
max_w_class = 5
can_hold = list(
@@ -203,7 +236,7 @@
/obj/item/storage/large_holster/fuelpack
name = "\improper Broiler-T flexible refueling system"
desc = "A specialized back harness that carries the Broiler-T flexible refueling system. Designed by and for USCM Pyrotechnicians."
- icon = 'icons/obj/items/clothing/backpacks.dmi'
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi'
icon_state = "flamethrower_broiler"
flags_atom = FPRINT|CONDUCT
var/obj/item/ammo_magazine/flamer_tank/large/fuel
@@ -223,7 +256,23 @@
fuelB = new /obj/item/ammo_magazine/flamer_tank/large/B()
fuelX = new /obj/item/ammo_magazine/flamer_tank/large/X()
active_fuel = fuel
- flamer_overlay = overlay_image('icons/obj/items/clothing/backpacks.dmi', "+m240t")
+ flamer_overlay = overlay_image('icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi', "+m240t")
+
+/obj/item/storage/large_holster/fuelpack/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi'
+ item_icons[WEAR_BACK] = 'icons/mob/humans/onmob/clothing/back/backpacks_by_map/snow.dmi'
/obj/item/storage/large_holster/fuelpack/Destroy()
QDEL_NULL(active_fuel)
@@ -259,7 +308,7 @@
var/image/ret = ..()
if(slot == WEAR_BACK)
if(length(contents))
- var/image/weapon_holstered = overlay_image('icons/mob/humans/onmob/back.dmi', "+m240t", color, RESET_COLOR)
+ var/image/weapon_holstered = overlay_image('icons/mob/humans/onmob/clothing/back/guns/flamers.dmi', "+m240t", color, RESET_COLOR)
ret.overlays += weapon_holstered
return ret
diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
index ab0e97393a33..850559c87ace 100644
--- a/code/game/objects/items/storage/misc.dm
+++ b/code/game/objects/items/storage/misc.dm
@@ -11,7 +11,7 @@
*/
/obj/item/storage/donut_box
- icon = 'icons/obj/items/food.dmi'
+ icon = 'icons/obj/items/food/donuts.dmi'
icon_state = "donutbox"
name = "\improper Yum! donuts"
desc = "A box of mouth-watering \"Yum!\" brand donuts."
@@ -43,7 +43,7 @@
var/i = 0
for(var/obj/item/reagent_container/food/snacks/donut/D in contents)
i++
- var/image/img = image('icons/obj/items/food.dmi', "[D.overlay_state]-[i]")
+ var/image/img = image('icons/obj/items/food/donuts.dmi', "[D.overlay_state]-[i]")
overlays += img
/obj/item/storage/donut_box/empty
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index 791bb27d58a4..c66d4e3c2aef 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -288,7 +288,7 @@
/obj/item/storage/pouch/pistol/proc/update_gun_icon()
if(current_gun)
playsound(src, drawSound, 15, TRUE)
- gun_underlay = image('icons/obj/items/clothing/belts.dmi', current_gun.base_gun_icon)
+ gun_underlay = image('icons/obj/items/clothing/belts/holstered_guns.dmi', current_gun.base_gun_icon)
gun_underlay.pixel_x = icon_x
gun_underlay.pixel_y = icon_y
gun_underlay.color = current_gun.color
diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm
index afdfbdfa2246..67cdcdc6fa4c 100644
--- a/code/game/objects/items/storage/smartpack.dm
+++ b/code/game/objects/items/storage/smartpack.dm
@@ -14,6 +14,10 @@
desc = "A joint project between the USCM and Wey-Yu. It is said to be top-class engineering and state of the art technology. Given to USCM deployed synthetic units and the intended usage involve assisting in battlefield support. Can be recharged by grabbing onto an APC and completing the circuit with one's fingers (procedure not advised for non-synthetic personnel). WARNING - User is advised to take precautions."
item_state = "smartpack"
icon_state = "smartpack"
+ icon = 'icons/obj/items/clothing/backpack/smartpack.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi'
+ )
has_gamemode_skin = FALSE
max_storage_space = 14
worn_accessible = TRUE
@@ -116,7 +120,7 @@
if(!light_on)
light = "+lamp_off"
- var/image/lamp = overlay_image('icons/mob/humans/onmob/back.dmi', light, color, RESET_COLOR)
+ var/image/lamp = overlay_image('icons/mob/humans/onmob/clothing/back/smartpack.dmi', light, color, RESET_COLOR)
ret.overlays += lamp
return ret
diff --git a/code/game/objects/items/tools/cleaning_tools.dm b/code/game/objects/items/tools/cleaning_tools.dm
index 9fab254a7153..84acb98f59bf 100644
--- a/code/game/objects/items/tools/cleaning_tools.dm
+++ b/code/game/objects/items/tools/cleaning_tools.dm
@@ -99,7 +99,7 @@
desc = "This cone is trying to warn you of something!"
icon_state = "cone"
icon = 'icons/obj/janitor.dmi'
- item_icons = 'icons/mob/humans/onmob/head_0.dmi'
+ // item_icons = 'icons/mob/humans/onmob/clothing/head/objects.dmi'
force = 1
throwforce = 3
throw_speed = SPEED_FAST
@@ -116,7 +116,7 @@
name = "soap"
desc = "A cheap bar of soap. Doesn't smell."
gender = PLURAL
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/janitor.dmi'
icon_state = "soap"
w_class = SIZE_TINY
throwforce = 0
diff --git a/code/game/objects/items/tools/experimental_tools.dm b/code/game/objects/items/tools/experimental_tools.dm
index 140a05a534b7..ef63374b7c4b 100644
--- a/code/game/objects/items/tools/experimental_tools.dm
+++ b/code/game/objects/items/tools/experimental_tools.dm
@@ -1,7 +1,7 @@
/obj/item/tool/crew_monitor
name = "crew monitor"
desc = "A tool used to get coordinates to deployed personnel. It was invented after it was found out 3/4 command officers couldn't read numbers."
- icon = 'icons/obj/items/experimental_tools.dmi'
+ icon = 'icons/obj/items/devices.dmi'
icon_state = "crew_monitor"
flags_equip_slot = SLOT_WAIST
w_class = SIZE_SMALL
@@ -42,6 +42,9 @@
var/pump_cost = 20
var/obj/item/cell/pdcell = null
movement_compensation = 0
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/objects.dmi',
+ )
/obj/item/clothing/suit/auto_cpr/Initialize(mapload, ...)
. = ..()
diff --git a/code/game/objects/items/tools/extinguisher.dm b/code/game/objects/items/tools/extinguisher.dm
index 75987116b290..3189146e419d 100644
--- a/code/game/objects/items/tools/extinguisher.dm
+++ b/code/game/objects/items/tools/extinguisher.dm
@@ -4,7 +4,7 @@
/obj/item/tool/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm
index 45097c57c153..9a9aa03efd23 100644
--- a/code/game/objects/items/tools/flame_tools.dm
+++ b/code/game/objects/items/tools/flame_tools.dm
@@ -93,7 +93,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/tool/match
name = "match"
desc = "A simple match stick, used for lighting fine smokables."
- icon = 'icons/obj/items/cigarettes.dmi'
+ icon = 'icons/obj/items/smoking/matches.dmi'
icon_state = "match"
var/burnt = 0
var/smoketime = 10 SECONDS
@@ -175,6 +175,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigoff"
throw_speed = SPEED_AVERAGE
item_state = "cigoff"
+ icon = 'icons/obj/items/smoking/cigarettes.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/smoking.dmi'
+ )
w_class = SIZE_TINY
flags_armor_protection = 0
flags_equip_slot = SLOT_EAR | SLOT_FACE
@@ -454,6 +458,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigar_off"
icon_on = "cigar_on"
icon_off = "cigar_off"
+ icon = 'icons/obj/items/smoking/cigars.dmi'
w_class = SIZE_SMALL
flags_equip_slot = SLOT_FACE
type_butt = /obj/item/trash/cigbutt/cigarbutt
@@ -567,7 +572,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A pipe, for smoking. Probably made of meershaum or something."
icon_state = "pipeoff"
item_state = "pipeoff"
- /// Note - these are in masks.dmi
+ icon = 'icons/obj/items/smoking/pipes.dmi'
icon_on = "pipeon"
icon_off = "pipeoff"
w_class = SIZE_SMALL
@@ -647,6 +652,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/electronic_cigarette
name = "electronic cigarette"
desc = "An electronic cigarette by The American Tobacco Company, who also made Lucky Strikes."
+ icon = 'icons/obj/items/smoking/cigarettes.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/smoking.dmi'
+ )
icon_state = "cigoff"
item_state = "cigoff"
w_class = SIZE_SMALL
@@ -673,6 +682,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/electronic_cigarette/cigar
name = "electronic cigar"
desc = "A luxury electronic cigar, with its labels scratched off. Where could this be from?"
+ icon = 'icons/obj/items/smoking/cigars.dmi'
icon_state = "cigar_off"
item_state = "cigar_off"
icon_on = "cigar_on"
@@ -684,7 +694,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/tool/lighter
name = "cheap lighter"
desc = "A cheap-as-free lighter."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/smoking/lighters.dmi'
icon_state = "lighter_g"
item_state = "lighter_g"
light_color = LIGHT_COLOR_LAVA
diff --git a/code/game/objects/items/tools/hydro_tools.dm b/code/game/objects/items/tools/hydro_tools.dm
index 045a5b864555..46f153579f74 100644
--- a/code/game/objects/items/tools/hydro_tools.dm
+++ b/code/game/objects/items/tools/hydro_tools.dm
@@ -76,7 +76,7 @@
/obj/item/tool/minihoe // -- Numbers
name = "mini hoe"
desc = "It's used for removing weeds or scratching your back."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "hoe"
item_state = "hoe"
flags_atom = FPRINT|CONDUCT
@@ -94,7 +94,7 @@
/obj/item/tool/hatchet
name = "hatchet"
desc = "A sharp hand hatchet, commonly used to cut things apart, be it timber or other objects. Often found in the hands of woodsmen, scouts, and looters."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/axes.dmi'
icon_state = "hatchet"
flags_atom = FPRINT|CONDUCT
force = MELEE_FORCE_NORMAL
@@ -113,7 +113,7 @@
/obj/item/tool/scythe
name = "scythe"
desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "scythe"
force = 13
throwforce = 5
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
index d5c7e371025d..30d91ece8830 100644
--- a/code/game/objects/items/tools/maintenance_tools.dm
+++ b/code/game/objects/items/tools/maintenance_tools.dm
@@ -17,7 +17,7 @@
/obj/item/tool/wrench
name = "wrench"
desc = "A wrench with many common uses. Can be usually found in your hand."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "wrench"
pickup_sound = 'sound/handling/wrench_pickup.ogg'
drop_sound = 'sound/handling/wrench_drop.ogg'
@@ -38,7 +38,7 @@
/obj/item/tool/screwdriver
name = "screwdriver"
desc = "You can be totally screwy with this."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "screwdriver"
pickup_sound = 'sound/handling/multitool_pickup.ogg'
drop_sound = 'sound/handling/screwdriver_drop.ogg'
@@ -119,7 +119,7 @@
name = "wirecutters"
gender = PLURAL
desc = "This cuts wires."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "cutters"
item_state = "cutters"
pickup_sound = 'sound/handling/wirecutter_pickup.ogg'
@@ -160,7 +160,7 @@
/obj/item/tool/weldingtool
name = "blowtorch"
desc = "A blowtorch for welding and cutting metals."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "welder"
pickup_sound = 'sound/handling/weldingtool_pickup.ogg'
drop_sound = 'sound/handling/weldingtool_drop.ogg'
@@ -468,7 +468,7 @@
/obj/item/tool/crowbar
name = "crowbar"
desc = "Used to remove floors and to pry open doors."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "crowbar"
pickup_sound = 'sound/handling/crowbar_pickup.ogg'
drop_sound = 'sound/handling/crowbar_drop.ogg'
@@ -486,7 +486,7 @@
preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY)
/obj/item/tool/crowbar/red
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "red_crowbar"
item_state = "red_crowbar"
@@ -679,7 +679,7 @@ Welding backpack
name = "Welding kit"
desc = "A heavy-duty, portable welding fluid carrier."
flags_equip_slot = SLOT_BACK
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tank.dmi'
icon_state = "welderpack"
w_class = SIZE_LARGE
/// More robust liner I guess
diff --git a/code/game/objects/items/tools/mining_tools.dm b/code/game/objects/items/tools/mining_tools.dm
index 2b95e9fe94c2..cb733d84c58f 100644
--- a/code/game/objects/items/tools/mining_tools.dm
+++ b/code/game/objects/items/tools/mining_tools.dm
@@ -4,7 +4,7 @@
/obj/item/tool/pickaxe
name = "pickaxe"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "pickaxe"
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_WAIST
diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm
index b4aa41c5843f..50ee377678c1 100644
--- a/code/game/objects/items/tools/shovel_tools.dm
+++ b/code/game/objects/items/tools/shovel_tools.dm
@@ -4,7 +4,7 @@
/obj/item/tool/shovel
name = "shovel"
desc = "A large tool for digging and moving dirt."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "shovel"
item_state = "shovel"
flags_atom = FPRINT|CONDUCT
@@ -208,7 +208,7 @@
/obj/item/tool/shovel/etool
name = "entrenching tool"
desc = "Used to dig holes and bash heads in. Folds in to fit in small spaces."
- icon = 'icons/obj/items/marine-items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "etool"
item_state = "etool"
force = 30
diff --git a/code/game/objects/items/toys/toy_weapons.dm b/code/game/objects/items/toys/toy_weapons.dm
index ce32cfdb67a9..cb4043fbd199 100644
--- a/code/game/objects/items/toys/toy_weapons.dm
+++ b/code/game/objects/items/toys/toy_weapons.dm
@@ -198,7 +198,7 @@
/obj/item/toy/sword
name = "toy sword"
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/energy.dmi'
icon_state = "sword0"
item_state = "sword0"
var/active = 0
@@ -233,7 +233,7 @@
/obj/item/toy/katana
name = "replica katana"
desc = "Woefully underpowered in D20."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/swords.dmi'
icon_state = "katana"
flags_atom = FPRINT|CONDUCT
flags_item = NOSHIELD
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index cda721aae515..bfad01ae18c1 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -91,7 +91,7 @@
throw_speed = SPEED_VERY_FAST
throw_range = 20
force = 0
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/toy.dmi'
icon_state = "syndballoon"
item_state = "syndballoon"
w_class = SIZE_LARGE
@@ -123,7 +123,7 @@
/obj/item/toy/crayon
name = "crayon"
desc = "A colorful crayon. Please refrain from eating it or putting it in your nose."
- icon = 'icons/obj/items/crayons.dmi'
+ icon = 'icons/obj/items/paint.dmi'
icon_state = "crayonred"
w_class = SIZE_TINY
attack_verb = list("attacked", "colored")
@@ -322,7 +322,7 @@
desc = "No bother to sink or swim when you can just float!"
icon_state = "inflatable"
item_state = "inflatable"
- icon = 'icons/obj/items/clothing/belts.dmi'
+ icon = 'icons/obj/items/clothing/belts/misc.dmi'
flags_equip_slot = SLOT_WAIST
black_market_value = 20
@@ -377,7 +377,7 @@
/obj/item/toy/bikehorn
name = "bike horn"
desc = "A horn off of a bicycle."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/toy.dmi'
icon_state = "bike_horn"
item_state = "bike_horn"
throwforce = 3
@@ -481,7 +481,7 @@
/obj/item/toy/plush
name = "generic plushie"
desc = "perfectly generic"
- icon = 'icons/obj/items/plush.dmi'
+ icon = 'icons/obj/items/toy.dmi'
icon_state = "debug"
w_class = SIZE_SMALL
COOLDOWN_DECLARE(last_hug_time)
@@ -659,6 +659,3 @@
icon_state = "runner_beret"
return
icon_state = "runner"
-
-/obj/item/toy/plush/shark/alt
- icon_state = "shark_alt"
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index d9d40e003c7a..8d807225810a 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -126,7 +126,7 @@
/obj/item/trash/cigbutt
name = "cigarette butt"
desc = "A manky old cigarette butt."
- icon = 'icons/obj/items/clothing/masks.dmi'
+ icon = 'icons/obj/items/smoking/cigarettes.dmi'
icon_state = "cigbutt"
w_class = SIZE_TINY
throwforce = 1
@@ -150,6 +150,7 @@
name = "cigar butt"
desc = "A manky old cigar butt."
icon_state = "cigarbutt"
+ icon = 'icons/obj/items/smoking/cigars.dmi'
////////////
///Dishes///
@@ -198,7 +199,7 @@
/obj/item/trash/c_tube
name = "cardboard tube"
desc = "A tube... of cardboard."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "c_tube"
throwforce = 1
w_class = SIZE_SMALL
diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm
index b1aca8db29b4..acc9237f4dae 100644
--- a/code/game/objects/items/weapons/blades.dm
+++ b/code/game/objects/items/weapons/blades.dm
@@ -110,7 +110,7 @@
/obj/item/weapon/throwing_knife
name ="\improper M11 throwing knife"
- icon='icons/obj/items/weapons/weapons.dmi'
+ icon='icons/obj/items/weapons/melee/knives.dmi'
icon_state = "throwing_knife"
item_state = "combat_knife"
desc = "A military knife designed to be thrown at the enemy. Much quieter than a firearm, but requires a steady hand to be used optimally, although you should probably just use a gun instead."
@@ -130,7 +130,7 @@
/obj/item/weapon/unathiknife
name = "duelling knife"
desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/knives.dmi'
icon_state = "unathiknife"
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("ripped", "torn", "cut")
@@ -225,8 +225,8 @@
inhand_x_dimension = 64
inhand_y_dimension = 64
item_icons = list(
- WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_64.dmi',
- WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_64.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi'
)
/obj/item/weapon/straight_razor
diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm
index c80da310fe51..7218fde43959 100644
--- a/code/game/objects/items/weapons/misc.dm
+++ b/code/game/objects/items/weapons/misc.dm
@@ -60,7 +60,7 @@
/obj/item/weapon/dart
name = "red throwing dart"
desc = "A dart. For throwing. This one's red."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/toy.dmi'
icon_state = "red_dart"
force = MELEE_FORCE_WEAK
throwforce = MELEE_FORCE_WEAK
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 232936c263ae..e4608e65d2d3 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -57,7 +57,7 @@
/obj/item/weapon/shield/riot
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/shields.dmi'
icon_state = "riot"
item_state = "riot"
base_icon_state = "riot"
@@ -72,8 +72,8 @@
w_class = SIZE_LARGE
matter = list("glass" = 7500, "metal" = 1000)
item_icons = list(
- WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi',
- WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi'
)
attack_verb = list("shoved", "bashed")
@@ -99,7 +99,7 @@
/obj/item/weapon/shield/energy
name = "energy combat shield"
desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/shields.dmi'
icon_state = "eshield0" // eshield1 for expanded
flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT|NOBLOODY
force = 3
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 9c1f065bcf7e..0b4a0aa099bb 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -3,6 +3,7 @@
desc = "A stun baton for incapacitating people with."
icon_state = "stunbaton"
item_state = "baton"
+ icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
flags_equip_slot = SLOT_WAIST
force = 15
throwforce = 7
@@ -181,6 +182,7 @@
desc = "An improvised stun baton."
icon_state = "stunprod"
item_state = "prod"
+ icon = 'icons/obj/items/weapons/melee/spears.dmi'
force = 3
throwforce = 5
stunforce = 40
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 043da19c9d92..7540dd7d60f8 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -19,7 +19,7 @@
/obj/item/weapon/classic_baton
name = "police baton"
desc = "A wooden truncheon for beating criminal scum."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
icon_state = "baton"
item_state = "classic_baton"
flags_equip_slot = SLOT_WAIST
@@ -38,7 +38,7 @@
/obj/item/weapon/telebaton
name = "telescopic baton"
desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded. It will knock down humans when not on harm intent."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
icon_state = "telebaton_0"
item_state = "telebaton_0"
flags_equip_slot = SLOT_WAIST
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index c363dc551450..b41a30b517f4 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -100,6 +100,7 @@
/obj/item/weapon/twohanded/offhand
w_class = SIZE_HUGE
icon_state = "offhand"
+ icon = 'icons/mob/hud/human_midnight.dmi'
name = "offhand"
flags_item = DELONDROP|TWOHANDED|WIELDED|CANTSTRIP
diff --git a/code/game/objects/items/weapons/weapon.dm b/code/game/objects/items/weapons/weapon.dm
index 5dd98bfa5708..a955657189c3 100644
--- a/code/game/objects/items/weapons/weapon.dm
+++ b/code/game/objects/items/weapons/weapon.dm
@@ -1,7 +1,6 @@
//items designed as weapon
/obj/item/weapon
name = "weapon"
- icon = 'icons/obj/items/weapons/weapons.dmi'
hitsound = "swing_hit"
flags_atom = FPRINT|QUICK_DRAWABLE
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 6e94961de15e..acb528feb8d6 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/banhammer
desc = "A banhammer"
name = "banhammer"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/toy.dmi'
icon_state = "toyhammer"
flags_equip_slot = SLOT_WAIST
throwforce = 0
@@ -37,7 +37,7 @@
/obj/item/weapon/ice_axe
name = "ice axe"
desc = "For climbing, mostly. Makes for a good improvised weapon."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/weapons/melee/axes.dmi'
icon_state = "ice_axe"
item_state = "ice_axe"
sharp = IS_SHARP_ITEM_ACCURATE
diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm
index 9e256236e7d6..e7bdbc2f4740 100644
--- a/code/game/objects/prop.dm
+++ b/code/game/objects/prop.dm
@@ -96,7 +96,7 @@
/obj/item/prop/tableflag
name = "United Americas table flag"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/table_decorations.dmi'
icon_state = "uaflag"
force = 0.5
w_class = SIZE_SMALL
@@ -137,13 +137,7 @@
name = "dirty bandages"
desc = "Some used gauze."
icon_state = "bandages_prop"
- icon = 'icons/monkey_icos.dmi'
-
-/obj/item/prop/colony/folded_bedroll
- name = "folded bedroll"
- desc = "a folded up bedroll"
- icon_state = "bedroll"
- icon = 'icons/monkey_icos.dmi'
+ icon = 'icons/obj/structures/props/misc.dmi'
/obj/item/prop/colony/used_flare
name = "flare"
@@ -167,7 +161,7 @@
name = "portable game kit"
desc = "A ThinkPad Systems Game-Bro Handheld (TSGBH, shortened). It can play chess, checkers, tri-d chess, and it also runs Byond! Except this one is out of batteries."
icon_state = "game_kit"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/toy.dmi'
/obj/item/prop/gripper
name = "magnetic gripper"
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index ed18c28de6f7..fcf31eca0607 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -7,7 +7,7 @@ LINEN BINS
/obj/item/bedsheet
name = "bedsheet"
desc = "A surprisingly soft linen bedsheet."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/bedsheets.dmi'
icon_state = "sheet"
item_state = "bedsheet"
layer = MOB_LAYER
diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm
index a2c0d213ccdc..c18df2e42187 100644
--- a/code/game/objects/structures/coathanger.dm
+++ b/code/game/objects/structures/coathanger.dm
@@ -45,7 +45,5 @@
overlays.Cut()
if(istype(coat, /obj/item/clothing/suit/storage/labcoat))
overlays += image(icon, icon_state = "coat_lab")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo))
- overlays += image(icon, icon_state = "coat_cmo")
if(istype(coat, /obj/item/clothing/suit/storage/det_suit))
overlays += image(icon, icon_state = "coat_det")
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index c03e439d23bf..098af692eec1 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -27,27 +27,6 @@
icon_opened = "syndicate1_open"
anchored = FALSE
-/obj/structure/closet/gimmick/russian
- name = "russian surplus closet"
- desc = "It's a storage unit for Russian standard-issue surplus."
- icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1_open"
-
-/obj/structure/closet/gimmick/russian/Initialize()
- . = ..()
- new /obj/item/clothing/head/ushanka(src)
- new /obj/item/clothing/head/ushanka(src)
- new /obj/item/clothing/head/ushanka(src)
- new /obj/item/clothing/head/ushanka(src)
- new /obj/item/clothing/head/ushanka(src)
- new /obj/item/clothing/under/soviet(src)
- new /obj/item/clothing/under/soviet(src)
- new /obj/item/clothing/under/soviet(src)
- new /obj/item/clothing/under/soviet(src)
- new /obj/item/clothing/under/soviet(src)
-
-
/obj/structure/closet/gimmick/tacticool
name = "tacticool gear closet"
desc = "It's a storage unit for Tacticool gear."
@@ -71,55 +50,3 @@
new /obj/item/clothing/suit/armor/swat(src)
-/obj/structure/closet/thunderdome
- name = "\improper Thunderdome closet"
- desc = "Everything you need!"
- icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicate_open"
- anchored = TRUE
-/obj/structure/closet/thunderdome/tdred
- name = "red-team Thunderdome closet"
-
-/obj/structure/closet/thunderdome/tdred/Initialize()
- . = ..()
- new /obj/item/clothing/suit/armor/tdome/red(src)
- new /obj/item/clothing/suit/armor/tdome/red(src)
- new /obj/item/clothing/suit/armor/tdome/red(src)
- new /obj/item/weapon/energy/sword(src)
- new /obj/item/weapon/energy/sword(src)
- new /obj/item/weapon/energy/sword(src)
- new /obj/item/weapon/baton(src)
- new /obj/item/weapon/baton(src)
- new /obj/item/weapon/baton(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/clothing/head/helmet/thunderdome(src)
- new /obj/item/clothing/head/helmet/thunderdome(src)
- new /obj/item/clothing/head/helmet/thunderdome(src)
-
-/obj/structure/closet/thunderdome/tdgreen
- name = "green-team Thunderdome closet"
- icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1_open"
-
-/obj/structure/closet/thunderdome/tdgreen/Initialize()
- . = ..()
- new /obj/item/clothing/suit/armor/tdome/green(src)
- new /obj/item/clothing/suit/armor/tdome/green(src)
- new /obj/item/clothing/suit/armor/tdome/green(src)
- new /obj/item/weapon/energy/sword(src)
- new /obj/item/weapon/energy/sword(src)
- new /obj/item/weapon/energy/sword(src)
- new /obj/item/weapon/baton(src)
- new /obj/item/weapon/baton(src)
- new /obj/item/weapon/baton(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/clothing/head/helmet/thunderdome(src)
- new /obj/item/clothing/head/helmet/thunderdome(src)
- new /obj/item/clothing/head/helmet/thunderdome(src)
-
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index c668f299db73..3057ca216b54 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -155,7 +155,6 @@
. = ..()
new /obj/item/clothing/under/det(src)
new /obj/item/clothing/under/det/black(src)
- new /obj/item/clothing/under/det/slob(src)
new /obj/item/clothing/suit/storage/det_suit(src)
new /obj/item/clothing/suit/storage/det_suit/black(src)
new /obj/item/clothing/suit/storage/forensics/blue(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index eddc0690233c..3ba0e516c76b 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -67,7 +67,7 @@
new /obj/item/clothing/suit/nun(src)
new /obj/item/clothing/head/nun_hood(src)
new /obj/item/clothing/suit/holidaypriest(src)
- new /obj/item/clothing/under/wedding/bride_white(src)
+ new /obj/item/clothing/under/wedding(src)
new /obj/item/storage/backpack/cultpack (src)
new /obj/item/storage/fancy/candle_box(src)
new /obj/item/storage/fancy/candle_box(src)
@@ -350,24 +350,6 @@
new /obj/item/clothing/shoes/leather(src)
return
-/obj/structure/closet/wardrobe/tactical
- name = "tactical equipment"
- icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1_open"
-
-/obj/structure/closet/wardrobe/tactical/Initialize()
- . = ..()
- new /obj/item/clothing/under/tactical(src)
- new /obj/item/clothing/suit/armor/tactical(src)
- new /obj/item/clothing/head/helmet/tactical(src)
- new /obj/item/clothing/mask/balaclava/tactical(src)
- new /obj/item/clothing/glasses/sunglasses/sechud/tactical(src)
- new /obj/item/storage/belt/security/tactical(src)
- new /obj/item/clothing/shoes/jackboots(src)
- new /obj/item/clothing/gloves/black(src)
- return
-
/obj/structure/closet/wardrobe/suit
name = "suit locker"
icon_state = "black"
@@ -387,4 +369,3 @@
new /obj/item/clothing/under/suit_jacket/female(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
new /obj/item/clothing/under/suit_jacket/red(src)
- new /obj/item/clothing/under/scratch(src)
diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm
index 0dab5e55c004..ed6a8ca44c92 100644
--- a/code/game/objects/structures/reagent_dispensers.dm
+++ b/code/game/objects/structures/reagent_dispensers.dm
@@ -1,7 +1,7 @@
/obj/structure/reagent_dispensers
name = "dispenser"
desc = "..."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/liquid_tanks.dmi'
icon_state = "watertank"
density = TRUE
anchored = FALSE
@@ -159,42 +159,36 @@
/obj/structure/reagent_dispensers/watertank
name = "watertank"
desc = "A water tank"
- icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
chemical = "water"
/obj/structure/reagent_dispensers/ammoniatank
name = "ammoniatank"
desc = "An ammonia tank"
- icon = 'icons/obj/objects.dmi'
icon_state = "ammoniatank"
chemical = "ammonia"
/obj/structure/reagent_dispensers/acidtank
name = "sulfuric acid tank"
desc = "A sulfuric acid tank"
- icon = 'icons/obj/objects.dmi'
icon_state = "sacidtank"
chemical = "sulphuric acid"
/obj/structure/reagent_dispensers/pacidtank
name = "polytrinic acid tank"
desc = "A polytrinic acid tank"
- icon = 'icons/obj/objects.dmi'
icon_state = "pacidtank"
chemical = "pacid"
/obj/structure/reagent_dispensers/ethanoltank
name = "ethanol tank"
desc = "An ethanol tank."
- icon = 'icons/obj/objects.dmi'
icon_state = "ethanoltank"
chemical = "ethanol"
/obj/structure/reagent_dispensers/fueltank
name = "fueltank"
desc = "A fuel tank"
- icon = 'icons/obj/objects.dmi'
icon_state = "weldtank"
amount_per_transfer_from_this = 10
chemical = "fuel"
@@ -234,14 +228,6 @@
to_chat(user, SPAN_WARNING("You're already peforming an action!"))
return
- /*if (HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
- user.visible_message("[user] wrenches [src]'s faucet [modded ? "closed" : "open"].", \
- "You wrench [src]'s faucet [modded ? "closed" : "open"]")
- modded = modded ? 0 : 1
- if (modded)
- message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. [ADMIN_JMP(loc)]")
- log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.")
- leak_fuel(amount_per_transfer_from_this)*/
if(istype(W,/obj/item/device/assembly_holder))
if(rig)
@@ -412,7 +398,6 @@
/obj/structure/reagent_dispensers/fueltank/oxygentank
name = "oxygentank"
desc = "An oxygen tank"
- icon = 'icons/obj/objects.dmi'
icon_state = "oxygentank"
chemical = "oxygen"
@@ -451,7 +436,7 @@
/obj/structure/reagent_dispensers/peppertank
name = "pepper spray refiller"
desc = "Refill pepper spray canisters."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/wall_dispensers.dmi'
icon_state = "peppertank"
anchored = TRUE
drag_delay = 3
@@ -480,7 +465,7 @@
/obj/structure/reagent_dispensers/beerkeg
name = "beer keg"
desc = "A beer keg"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/kegs.dmi'
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10
chemical = "beer"
@@ -495,7 +480,7 @@
/obj/structure/reagent_dispensers/virusfood
name = "virus food dispenser"
desc = "A dispenser of virus food."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/wall_dispensers.dmi'
icon_state = "virusfoodtank"
amount_per_transfer_from_this = 10
anchored = TRUE
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 2055eae13e4e..98d7e7ec3b7d 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -11,7 +11,7 @@
name = "bed"
desc = "A mattress seated on a rectangular metallic frame. This is used to support a lying person in a comfortable manner, notably for regular sleep. Ancient technology, but still useful."
icon_state = "bed"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/chairs.dmi'
can_buckle = TRUE
buckle_lying = 90
throwpass = TRUE
@@ -428,7 +428,7 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers)
/obj/structure/bed/bedroll
name = "unfolded bedroll"
desc = "Perfect for those long missions, when there's nowhere else to sleep, you remembered to bring at least one thing of comfort."
- icon = 'icons/monkey_icos.dmi'
+ icon = 'icons/obj/structures/rollerbed.dmi'
icon_state = "bedroll_o"
buckling_y = 0
foldabletype = /obj/item/roller/bedroll
@@ -439,6 +439,5 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers)
/obj/item/roller/bedroll
name = "folded bedroll"
desc = "A standard issue USCMC bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?"
- icon = 'icons/monkey_icos.dmi'
icon_state = "bedroll"
rollertype = /obj/structure/bed/bedroll
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index d9f15922eeaf..bf84630fcc7a 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -386,12 +386,12 @@
/obj/structure/bed/chair/dropship/passenger/Initialize()
. = ..()
- chairbar = image("icons/obj/objects.dmi", "hotseat_bars")
+ chairbar = image(icon, "hotseat_bars")
chairbar.layer = ABOVE_MOB_LAYER
/obj/structure/bed/chair/dropship/passenger/shuttle_chair/Initialize()
. = ..()
- chairbar = image("icons/obj/objects.dmi", "hotseat_bars")
+ chairbar = image(icon, "hotseat_bars")
chairbar.layer = ABOVE_MOB_LAYER
@@ -542,7 +542,7 @@
/obj/item/weapon/twohanded/folded_metal_chair //used for when someone picks up the chair
name = "metal folding chair"
desc = "A metal folding chair, probably could be turned into a seat by anyone with half a braincell working."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/structures/props/chairs.dmi'
icon_state = "folding_chair"
item_state = "folding_chair"
attack_verb = list("bashed", "battered", "chaired")
diff --git a/code/game/objects/structures/stool_bed_chair_nest/sofa.dm b/code/game/objects/structures/stool_bed_chair_nest/sofa.dm
index f44f9c87b471..83b75905f6cf 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/sofa.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/sofa.dm
@@ -1,7 +1,7 @@
/obj/structure/bed/sofa
name = "Sofa"
desc = "Just like Space Ikea would have wanted"
- icon = 'icons/obj/structures/props/sofas.dmi'
+ icon = 'icons/obj/structures/props/chairs.dmi'
icon_state = "sofa" //use child icons
anchored = TRUE //can't rotate sofas
can_buckle = FALSE //Icons aren't setup for this to look right, so just disable it for now. Maybe when we fix the icons y'know?
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 2297d0397352..c7055276da45 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -11,7 +11,7 @@
/obj/item/stool
name = "stool"
desc = "Uh-hoh, the bar is heating up."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/chairs.dmi'
icon_state = "stool"
force = 15
throwforce = 12
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 129e03b7179c..9bacf2118430 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -1,7 +1,7 @@
/obj/structure/dispenser
name = "tank storage unit"
desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten phoron tanks."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/tank_dispenser.dmi'
icon_state = "dispenser"
density = TRUE
anchored = TRUE
diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm
index dcbfd88c9c08..bd95403b70ed 100644
--- a/code/game/objects/structures/vulture_spotter.dm
+++ b/code/game/objects/structures/vulture_spotter.dm
@@ -1,7 +1,8 @@
/obj/structure/vulture_spotter_tripod
name = "\improper M707 spotting tripod"
desc = "A tripod for an M707 anti-materiel rifle's spotting scope."
- icon_state = "vulture_tripod"
+ icon_state = "vulture_tripod_deployed"
+ icon = 'icons/obj/items/binoculars.dmi'
density = TRUE
anchored = TRUE
unacidable = TRUE
@@ -166,7 +167,7 @@
skillless = TRUE
user.visible_message(SPAN_NOTICE("[user] attaches [scope] to [src]."), SPAN_NOTICE("You attach [scope] to [src]."))
- icon_state = "vulture_scope"
+ icon_state = "vulture_tripod_deployed"
setDir(user.dir)
bound_rifle = scope.bound_rifle
scope_attached = TRUE
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index a445652f264d..9397d29c1546 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -374,7 +374,7 @@
retrieved_icon.Scale(128, 128)
Insert("intents", retrieved_icon)
- retrieved_icon = icon('icons/mob/xenos/predalien.dmi', "Normal Predalien Walking")
+ retrieved_icon = icon('icons/mob/xenos/castes/tier_4/predalien.dmi', "Normal Predalien Walking")
retrieved_icon.Scale(128, 128)
Insert("predalien", retrieved_icon)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 323b5ead1df2..9e268fa3a298 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -146,8 +146,8 @@
///////////////////////////////////////////////////////////////////////
//Suit
/obj/item/clothing/suit
- icon = 'icons/obj/items/clothing/suits.dmi'
name = "suit"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
var/fire_resist = T0C+100
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
allowed = list(
@@ -170,6 +170,10 @@
siemens_coefficient = 0.9
w_class = SIZE_MEDIUM
sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi')
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi'
+ )
/obj/item/clothing/suit/update_clothing_icon()
if (ismob(src.loc))
@@ -191,13 +195,6 @@
return 0
return 1
-/obj/item/clothing/suit/proc/get_collar()
- var/icon/C = new('icons/mob/humans/onmob/collar.dmi')
- if(icon_state in C.IconStates())
- var/image/I = image(C, icon_state)
- I.color = color
- return I
-
/////////////////////////////////////////////////////////
//Gloves
/obj/item/clothing/gloves
@@ -240,7 +237,7 @@
//Mask
/obj/item/clothing/mask
name = "mask"
- icon = 'icons/obj/items/clothing/masks.dmi'
+ icon = 'icons/obj/items/clothing/masks/masks.dmi'
flags_equip_slot = SLOT_FACE
flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
blood_overlay_type = "mask"
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index addac1ecf139..1413b73c434e 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -16,13 +16,17 @@
desc = "A top hat worn by only the most prestigious hat collectors."
icon_state = "tophat"
item_state = "that"
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
flags_armor_protection = 0
/obj/item/clothing/head/collectable/tophat/super
name = "collectable super top hat"
desc = "A super top hat worn by only the highest echelon of hat collectors."
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_64.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/head_64.dmi'
)
icon_state = "super_top_hat"
item_state = "super_top_hat"
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 3d0471a48253..fd4b03eccaf2 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -3,6 +3,10 @@
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
+ icon = 'icons/obj/items/clothing/hats/hardhats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hardhats.dmi'
+ )
light_range = 4
light_power = 2
var/hardhat_color = "yellow" //Determines used sprites: hardhat[on]_[hardhat_color]
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
index f9c8adbf9a77..2bdd7965029e 100644
--- a/code/modules/clothing/head/head.dm
+++ b/code/modules/clothing/head/head.dm
@@ -1,7 +1,7 @@
#define HAT_GARB_RELAY_ICON_STATE "icon_state"
/obj/item/clothing/head
name = "head"
- icon = 'icons/obj/items/clothing/hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
flags_armor_protection = BODY_FLAG_HEAD
flags_equip_slot = SLOT_HEAD
w_class = SIZE_SMALL
@@ -19,28 +19,53 @@
/obj/item/clothing/head/cmbandana
name = "bandana"
desc = "Typically worn by heavy-weapon operators, mercenaries and scouts, the bandana serves as a lightweight and comfortable hat. Comes in two stylish colors."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "band"
flags_inv_hide = HIDETOPHAIR
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi'
)
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/cmbandana/Initialize(mapload, ...)
. = ..()
- select_gamemode_skin(/obj/item/clothing/head/cmbandana)
+ if(!(flags_atom & NO_SNOW_TYPE))
+ select_gamemode_skin(/obj/item/clothing/head/cmbandana)
/obj/item/clothing/head/cmbandana/tan
icon_state = "band2"
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ )
+ flags_atom = null
+
+/obj/item/clothing/head/cmbandana/tan/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/urban.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi'
/obj/item/clothing/head/beanie
name = "beanie"
desc = "A standard military beanie, often worn by non-combat military personnel and support crews, though it is not uncommon to see combat personnel who no longer care about self-preservation wearing one of these as well. Popular due to being comfortable and snug."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
icon_state = "beanie_cargo"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi'
)
/obj/item/clothing/head/beanie/green
@@ -55,18 +80,42 @@
/obj/item/clothing/head/beret/cm
name = "\improper USCM beret"
desc = "A hat typically worn by the field-officers of the USCM. Occasionally they find their way down the ranks into the hands of squad-leaders and decorated grunts."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
icon_state = "beret"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
)
/obj/item/clothing/head/beret/cm/Initialize(mapload, ...)
. = ..()
- select_gamemode_skin(/obj/item/clothing/head/beret/cm)
+ if(!(flags_atom & NO_SNOW_TYPE))
+ select_gamemode_skin(/obj/item/clothing/head/beret/cm)
+
+/obj/item/clothing/head/beret/cm/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/urban.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi'
/obj/item/clothing/head/beret/cm/tan
icon_state = "berettan"
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ )
/obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...)
. = ..()
@@ -74,15 +123,22 @@
/obj/item/clothing/head/beret/cm/red
icon_state = "beretred"
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/cm/white
- icon_state = "s_beret"
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/cm/black
icon_state = "beret_black"
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/cm/green
icon_state = "beret_green"
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/cm/squadberet
name = "USCM Squad Beret"
@@ -91,12 +147,10 @@
/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)
. = ..()
@@ -142,16 +196,35 @@
/obj/item/clothing/head/headband
name = "headband"
desc = "A rag typically worn by the less-orthodox weapons operators. While it offers no protection, it is certainly comfortable to wear compared to the standard helmet. Comes in two stylish colors."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "headband"
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
)
- flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
/obj/item/clothing/head/headband/Initialize(mapload, ...)
. = ..()
- select_gamemode_skin(/obj/item/clothing/head/headband)
+ if(!(flags_atom & NO_SNOW_TYPE))
+ select_gamemode_skin(/obj/item/clothing/head/headband)
+
+/obj/item/clothing/head/headband/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
/obj/item/clothing/head/headband/red
icon_state = "headbandred"
@@ -161,18 +234,34 @@
/obj/item/clothing/head/headband/brown
icon_state = "headbandbrown"
+ icon = 'icons/obj/items/clothing/hats/headbands.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/headband/gray
icon_state = "headbandgray"
+ icon = 'icons/obj/items/clothing/hats/headbands.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/headband/rebel
desc = "A headband made from a simple strip of cloth. The words \"DOWN WITH TYRANTS\" are emblazoned on the front."
icon_state = "rebelband"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/CLF.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/CLF.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/headband/squad
var/dummy_icon_state = "headband%SQUAD%"
var/static/list/valid_icon_states
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/headband/squad/Initialize(mapload, ...)
. = ..()
@@ -216,26 +305,32 @@
/obj/item/clothing/head/headband/rambo
desc = "It flutters in the face of the wind, defiant and unrestrained, like the man who wears it."
- icon = 'icons/obj/items/clothing/hats.dmi'
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
icon_state = "headband_rambo"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
+ WEAR_HEAD = 'icons/obj/items/clothing/halloween_clothes.dmi'
)
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/headset
name = "\improper USCM headset"
desc = "A headset typically found in use by radio-operators and officers. This one appears to be malfunctioning."
icon_state = "headset"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
)
/obj/item/clothing/head/cmcap
name = "patrol cap"
desc = "A casual cap issued as part of the non-combat uniform. While it only protects from the sun, it's much more comfortable than a helmet."
icon_state = "cap"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
var/helmet_overlays[]
var/flipped_cap = FALSE
var/list/flipping_message = list(
@@ -284,9 +379,6 @@
var/storage_slots_reserved_for_garb = 1
var/storage_max_w_class = SIZE_TINY
var/storage_max_storage_space = 4
- item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
- )
/obj/item/clothing/head/cmcap/Initialize(mapload, ...)
. = ..()
@@ -302,6 +394,22 @@
pockets.bypass_w_limit = allowed_hat_items
pockets.max_storage_space = storage_max_storage_space
+/obj/item/clothing/head/cmcap/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+
/obj/item/clothing/head/cmcap/attack_hand(mob/user)
if(loc != user)
..(user)
@@ -334,12 +442,12 @@
return return_image
if(length(pockets.contents) && (flags_marine_hat & HAT_GARB_OVERLAY))
- for(var/obj/garb_object in pockets.contents)
+ for(var/obj/item/garb_object in pockets.contents)
if(garb_object.type in allowed_hat_items)
var/garb_state = allowed_hat_items[garb_object.type]
if(garb_state == HAT_GARB_RELAY_ICON_STATE)
garb_state = "hat_[garb_object.icon_state]"
- var/image/garb_image = overlay_image('icons/mob/humans/onmob/helmet_garb.dmi', "[garb_state]", color, RESET_COLOR)
+ var/image/garb_image = overlay_image(garb_object.garb_icon, "[garb_state]", color, RESET_COLOR)
return_image.overlays += garb_image
return return_image
@@ -381,7 +489,6 @@
/obj/item/clothing/head/cmcap/boonie/tan
icon_state = "booniehattan"
- flags_atom = FPRINT|NO_SNOW_TYPE
/obj/item/clothing/head/cmcap/co
name = "\improper USCM Commanding officer cap"
@@ -390,8 +497,12 @@
/obj/item/clothing/head/cmcap/co/formal
name = "\improper USCM formal Commanding Officer's white cap"
- icon_state = "co_formalhat_white"
desc = "A formal cover worn by senior officers of the USCM."
+ icon_state = "co_formalhat_white"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
flags_marine_hat = HAT_GARB_OVERLAY
flags_atom = FPRINT|NO_SNOW_TYPE
@@ -399,18 +510,21 @@
name = "\improper USCM formal Commanding Officer's black cap"
icon_state = "co_formalhat_black"
-/obj/item/clothing/head/cmcap/req/ro
- name = "\improper USCM quartermaster cap"
- desc = "It's a fancy hat for a not-so-fancy military supply clerk."
- icon_state = "rocap"
- flags_atom = NO_SNOW_TYPE
-
/obj/item/clothing/head/cmcap/req
name = "\improper USCM requisition cap"
desc = "It's a not-so-fancy hat for a not-so-fancy military supply clerk."
icon_state = "cargocap"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
flags_atom = FPRINT|NO_SNOW_TYPE
+/obj/item/clothing/head/cmcap/req/ro
+ name = "\improper USCM quartermaster cap"
+ desc = "It's a fancy hat for a not-so-fancy military supply clerk."
+ icon_state = "rocap"
+
/obj/item/clothing/head/cmcap/bridge
name = "\improper USCM officer cap"
desc = "A hat usually worn by officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable."
@@ -419,7 +533,6 @@
/obj/item/clothing/head/cmcap/flap
name = "\improper USCM expedition cap"
desc = "It's a cap, with flaps. A patch stitched across the front reads \"USS ALMAYER\"."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "flapcap"
flags_marine_hat = HAT_GARB_OVERLAY
@@ -428,16 +541,20 @@
desc = "A faithful cap for any terrain war correspondents may find themselves in."
icon_state = "cc_flagcap"
item_state = "cc_flagcap"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
flags_marine_hat = HAT_GARB_OVERLAY
/obj/item/clothing/head/cmo
name = "\improper Chief Medical Officer's Peaked Cap"
desc = "A peaked cap given to high-ranking civilian medical officers. Looks just a touch silly."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
icon_state = "cmohat"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
)
//============================//BERETS\\=================================\\
@@ -452,9 +569,9 @@
name = "\improper USCM MP beret"
icon_state = "beretred"
desc = "A beret with the USCM Military Police insignia emblazoned on it."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
)
black_market_value = 25
@@ -462,32 +579,53 @@
name = "\improper USCM MP warden peaked cap"
icon_state = "warden"
desc = "A peaked cap with the USCM Military Police Lieutenant insignia emblazoned on it. It is typically used by Wardens on USCM ships."
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
/obj/item/clothing/head/beret/marine/mp/cmp
name = "\improper USCM chief MP beret"
desc = "A beret with the USCM Military Police First Lieutenant insignia emblazoned on it. It shines with the glow of corrupt authority and a smudge of doughnut."
icon_state = "beretwo"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
black_market_value = 30
/obj/item/clothing/head/beret/marine/mp/mppeaked
name = "\improper USCM MP peaked cap"
desc = "A peaked cap worn by the USCM's Military Police. Something about it reminds you of an event you once read about in a history book."
icon_state = "mppeaked"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
/obj/item/clothing/head/beret/marine/mp/mpcap
name = "\improper USCM MP ball-cap"
desc = "A ball-cap, typically worn by the more casual of the USCM's Military Police."
icon_state = "mpcap"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
/obj/item/clothing/head/beret/marine/mp/provost
name = "\improper USCM provost beret"
- icon_state = "beretwo"
desc = "A beret with the USCM Military Police insignia emblazoned on it."
+ icon_state = "beretwo"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
+
/obj/item/clothing/head/beret/marine/mp/provost/senior
name = "\improper USCM senior provost beret"
- icon_state = "coblackberet"
desc = "A beret with the USCM Military Police insignia emblazoned on it."
+ icon_state = "coblackberet"
/obj/item/clothing/head/beret/marine/mp/provost/chief
name = "\improper USCM provost command beret"
@@ -495,65 +633,102 @@
/obj/item/clothing/head/beret/marine/mp/tis
name = "\improper UAAC-TIS Special Agent Beret"
- icon_state = "berettis"
desc = "A beret with the UAAC-TIS insignia emblazoned on it. A mark of a TIS Special Agent, these berets are one of the only pieces of equipment that the TIS actually manufactures for itself and earning one is one of the rare signs of achievement the Three Eyes allows."
+ icon_state = "berettis"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
/obj/item/clothing/head/beret/marine/commander
name = "marine commanding officer beret"
desc = "A beret with the commanding officer's insignia emblazoned on it. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "coberet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
)
black_market_value = 30
+/obj/item/clothing/head/beret/marine/commander/Initialize(mapload, ...)
+ . = ..()
+ if(!(flags_atom & NO_SNOW_TYPE))
+ select_gamemode_skin(/obj/item/clothing/head/beret/marine/commander)
+
+/obj/item/clothing/head/beret/marine/commander/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+
/obj/item/clothing/head/beret/marine/commander/dress
name = "marine major white beret"
- icon_state = "codressberet"
desc = "A white beret with the Major insignia emblazoned on it. Its dazzling white color commands power and exudes class."
+ icon_state = "codressberet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/marine/commander/black
name = "marine major black beret"
- icon_state = "coblackberet"
desc = "A black beret with the Major insignia emblazoned on it. Its sleek black color commands power and exudes class."
+ icon_state = "coblackberet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/marine/commander/council
name = "marine colonel beret"
desc = "A blue beret with the Lieutenant Colonel's insignia emblazoned on it. Its blue color symbolizes loyalty, confidence, and politics - the core components of a true Colonel."
icon_state = "cdreberet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/beret/marine/commander/councilchief
name = "marine colonel beret"
desc = "A dark blue, custom-tailored beret signifying The Colonel. Definitely not an alias for a General."
icon_state = "cdrechiefberet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/head/marine/peaked
name = "marine peaked cap"
desc = "A peaked cap. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
icon_state = "marine_formal"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
)
/obj/item/clothing/head/marine/peaked/service
name = "marine service peaked cap"
desc = "A peaked cap. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "marine_service"
- item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
- )
/obj/item/clothing/head/marine/peaked/captain
name = "marine commanding officer peaked cap"
desc = "A peaked cap with the commanding officer's insignia emblazoned on it. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "copeaked"
- item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
- )
black_market_value = 30
/obj/item/clothing/head/marine/peaked/captain/white
@@ -584,11 +759,12 @@
/obj/item/clothing/head/beret/marine/ro
name = "\improper USCM quartermaster beret"
desc = "A beret with the sergeant insignia emblazoned on it. It symbolizes hard work and shady business."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
- icon_state = "ro_beret"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
)
+ icon_state = "ro_beret"
+
//==========================//PROTECTIVE\\===============================\\
//=======================================================================\\
@@ -646,9 +822,9 @@
/obj/item/clothing/head/ivanberet
name = "\improper Black Beret"
desc = "Worn by officers of special units."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UPP.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UPP.dmi'
)
icon_state = "ivan_beret"
item_state = "ivan_beret"
@@ -670,9 +846,9 @@
/obj/item/clothing/head/CMB
name = "\improper Colonial Marshal Bureau cap"
desc = "A dark cap enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/CMB.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/CMB.dmi'
)
icon_state = "cmbcap"
flags_armor_protection = BODY_FLAG_HEAD
@@ -690,9 +866,9 @@
/obj/item/clothing/head/freelancer
name = "\improper armored Freelancer cap"
desc = "A sturdy freelancer's cap. More protective than it seems."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi'
)
icon_state = "freelancer_cap"
siemens_coefficient = 2
@@ -717,9 +893,9 @@
/obj/item/clothing/head/militia
name = "\improper armored militia cowl"
desc = "A large hood in service with some militias, meant for obscurity on the frontier. Offers some head protection due to the study fibers utilized in production."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/CLF.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/CLF.dmi'
)
icon_state = "rebel_hood"
siemens_coefficient = 2
@@ -746,6 +922,10 @@
name = "\improper armored General cap"
desc = "A sturdy general officer's cap. More protective than it seems. Please don't ditch this for a helmet like a punk."
icon_state = "general_helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ )
siemens_coefficient = 2
flags_armor_protection = BODY_FLAG_HEAD
armor_melee = CLOTHING_ARMOR_HIGH
@@ -765,29 +945,46 @@
name = "durag"
desc = "An improvised head wrap made out of a standard issue neckerchief. Great for keeping the sweat out of your eyes and protecting your hair."
icon_state = "durag"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
flags_inv_hide = HIDETOPHAIR
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
)
-/obj/item/clothing/head/durag/black
- icon_state = "duragblack"
- desc = "An improvised head wrap made out of a black neckerchief. Great for keeping the sweat out of your eyes and protecting your hair."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
- flags_atom = NO_SNOW_TYPE
+/obj/item/clothing/head/durag/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD]= 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
/obj/item/clothing/head/durag/Initialize(mapload, ...)
. = ..()
select_gamemode_skin(/obj/item/clothing/head/durag)
+/obj/item/clothing/head/durag/black
+ icon_state = "duragblack"
+ desc = "An improvised head wrap made out of a black neckerchief. Great for keeping the sweat out of your eyes and protecting your hair."
+ flags_atom = NO_SNOW_TYPE
+
/obj/item/clothing/head/drillhat
name = "\improper USCM drill hat"
desc = "A formal hat worn by drill sergeants. Police that moustache."
icon_state = "drillhat"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
)
#undef HAT_GARB_RELAY_ICON_STATE
@@ -798,10 +995,12 @@
/obj/item/clothing/head/marine/dress_cover
name = "marine dress blues cover"
desc = "The combination cover of the legendary Marine dress blues, virtually unchanged since the 19th century. The polished logo sits proudly on the white cloth."
- icon = 'icons/mob/humans/onmob/contained/marinedressblues.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
icon_state = "e_cap"
item_state = "e_cap"
- contained_sprite = TRUE
/obj/item/clothing/head/marine/dress_cover/officer
name = "marine dress blues officer cover"
@@ -812,10 +1011,10 @@
/obj/item/clothing/head/owlf_hood
name = "\improper OWLF thermal hood"
desc = "This hood is attached to a high-tech suit with built-in thermal cloaking technology."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi'
icon_state = "owlf_hood"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi'
)
item_state = "owlf_hood"
@@ -827,9 +1026,9 @@
desc = "A standard military beanie."
icon_state = "rmc_beanie"
item_state = "rmc_beanie"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/TWE.dmi'
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/TWE.dmi'
)
/obj/item/clothing/head/beanie/royal_marine/turban
@@ -843,10 +1042,10 @@
desc = "A green beret belonging to the royal marines commando. This beret symbolizes a royal marines ability to fight in any environment, desert, sea, artic or space a royal marine will always be ready."
icon_state = "rmc_beret"
item_state = "rmc_beret"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/TWE.dmi'
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/TWE.dmi'
)
/obj/item/clothing/head/beret/royal_marine/team_leader
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index cfa3eb5566cf..ded2b0e77b97 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -47,6 +47,10 @@
name = "riot helmet"
desc = "It's a helmet specifically designed to protect against close range attacks. It covers your ears."
icon_state = "riot"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi'
+ )
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_LOW
@@ -61,6 +65,10 @@
/obj/item/clothing/head/helmet/riot/vintage_riot
desc = "A scarred riot helmet covered in cobwebs. It still protects your ears."
icon_state = "old_riot"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+ )
/obj/item/clothing/head/helmet/augment
name = "augment array"
@@ -77,30 +85,6 @@
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
siemens_coefficient = 0.5
-/obj/item/clothing/head/helmet/HoS
- name = "Head of Security Hat"
- desc = "The hat of the Head of Security. For showing the officers who's in charge."
- icon_state = "hoscap"
- armor_melee = CLOTHING_ARMOR_MEDIUM
- armor_bullet = CLOTHING_ARMOR_MEDIUM
- armor_laser = CLOTHING_ARMOR_MEDIUM
- armor_energy = CLOTHING_ARMOR_MEDIUM
- armor_bomb = CLOTHING_ARMOR_MEDIUM
- armor_bio = CLOTHING_ARMOR_MEDIUM
- armor_rad = CLOTHING_ARMOR_MEDIUM
- armor_internaldamage = CLOTHING_ARMOR_MEDIUM
- flags_inventory = COVEREYES
- flags_inv_hide = HIDEEARS
- flags_armor_protection = 0
- siemens_coefficient = 0.8
-
-/obj/item/clothing/head/helmet/HoS/dermal
- name = "Dermal Armor Patch"
- desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
- icon_state = "dermal"
- item_state = "dermal"
- siemens_coefficient = 0.6
-
/obj/item/clothing/head/helmet/warden
name = "warden's hat"
desc = "It's a special helmet issued to the Warden of a security force. Protects the head from impacts."
@@ -117,14 +101,6 @@
flags_inv_hide = NO_FLAGS
flags_armor_protection = 0
-/obj/item/clothing/head/helmet/formalcaptain
- name = "parade hat"
- desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority."
- icon_state = "officercap"
- flags_inventory = NO_FLAGS
- flags_inv_hide = NO_FLAGS
- flags_armor_protection = 0
-
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
desc = "They're often used by highly trained Swat Members."
@@ -145,25 +121,6 @@
siemens_coefficient = 0.5
anti_hug = 1
-/obj/item/clothing/head/helmet/thunderdome
- name = "\improper Thunderdome helmet"
- desc = "'Let the battle commence!'"
- icon_state = "thunderdome"
- flags_inventory = COVEREYES|BLOCKSHARPOBJ
- flags_inv_hide = HIDEEARS|HIDEEYES
- item_state = "thunderdome"
- armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
- armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
- armor_laser = CLOTHING_ARMOR_MEDIUM
- armor_energy = CLOTHING_ARMOR_MEDIUM
- armor_bomb = CLOTHING_ARMOR_MEDIUM
- armor_bio = CLOTHING_ARMOR_MEDIUM
- armor_rad = CLOTHING_ARMOR_MEDIUM
- armor_internaldamage = CLOTHING_ARMOR_MEDIUM
- flags_cold_protection = BODY_FLAG_HEAD
- min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROT
- siemens_coefficient = 1
-
/obj/item/clothing/head/helmet/gladiator
name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant."
@@ -181,25 +138,6 @@
armor_rad = CLOTHING_ARMOR_LOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
-/obj/item/clothing/head/helmet/tactical
- name = "tactical helmet"
- desc = "An armored helmet capable of being fitted with a multitude of attachments."
- icon_state = "swathelm"
- item_state = "helmet"
- flags_inventory = COVEREYES|BLOCKSHARPOBJ
- flags_inv_hide = HIDEEARS|HIDEEYES
- anti_hug = 1
- armor_melee = CLOTHING_ARMOR_MEDIUM
- armor_bullet = CLOTHING_ARMOR_MEDIUM
- armor_laser = CLOTHING_ARMOR_MEDIUMLOW
- armor_energy = CLOTHING_ARMOR_MEDIUMLOW
- armor_bomb = CLOTHING_ARMOR_LOW
- armor_bio = CLOTHING_ARMOR_LOW
- armor_rad = CLOTHING_ARMOR_LOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUM
- siemens_coefficient = 0.7
-
-
//===========================//MARINES HELMETS\\=================================\\
//=======================================================================\\
@@ -359,9 +297,12 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/helmet/marine
name = "\improper M10 pattern marine helmet"
desc = "A standard M10 Pattern Helmet. The inside label, along with washing information, reads, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'. There is a built-in camera on the right side."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
icon_state = "helmet"
item_state = "helmet"
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ )
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
@@ -372,7 +313,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
health = 5
force = 15
- throwforce = 15 // https://i.imgur.com/VW09I4B.gif
+ throwforce = 15
attack_verb = list("whacked", "hit", "smacked", "beaten", "battered")
var/obj/structure/machinery/camera/camera
var/helmet_overlays[]
@@ -385,9 +326,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
var/specialty = "M10 pattern marine" //Give them a specialty var so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE.
valid_accessory_slots = list(ACCESSORY_SLOT_HELM_C)
restricted_accessory_slots = list(ACCESSORY_SLOT_HELM_C)
- item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
- )
var/obj/item/storage/internal/headgear/pockets
var/storage_slots = 2 // Small items like injectors, bandages, etc
@@ -396,7 +334,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
var/storage_max_storage_space = 4
/// The dmi where the grayscale squad overlays are contained
- var/helmet_overlay_icon = 'icons/mob/humans/onmob/head_1.dmi'
+ var/helmet_overlay_icon = 'icons/mob/humans/onmob/clothing/head/hats.dmi'
///Any visors built into the helmet
var/list/built_in_visors = list(new /obj/item/device/helmet_visor)
@@ -458,6 +396,27 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
if(cycle_action)
cycle_action.set_action_overlay(active_visor)
+/obj/item/clothing/head/helmet/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ if(flags_atom & MAP_COLOR_INDEX)
+ return
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/urban.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi'
+
/obj/item/clothing/head/helmet/marine/Destroy(force)
helmet_overlays = null
QDEL_NULL(camera)
@@ -636,7 +595,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/helmet/marine/proc/add_hugger_damage() //This is called in XenoFacehuggers.dm to first add the overlay and set the var.
if(flags_marine_helmet & HELMET_DAMAGE_OVERLAY && !(flags_marine_helmet & HELMET_IS_DAMAGED))
- helmet_overlays["damage"] = image('icons/obj/items/clothing/cm_hats.dmi',icon_state = "hugger_damage")
+ // helmet_overlays["damage"] = image('icons/obj/items/clothing/cm_hats.dmi', icon_state = "hugger_damage")
flags_marine_helmet |= HELMET_IS_DAMAGED
update_icon()
desc += "\nThis helmet seems to be scratched up and damaged, particularly around the face area..."
@@ -771,24 +730,44 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/helmet/marine/grey
desc = "A standard M10 Pattern Helmet. This one has not had a camouflage pattern applied to it yet. There is a built-in camera on the right side."
- icon_state = "c_helmet"
- item_state = "c_helmet"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi'
+ )
+
/obj/item/clothing/head/helmet/marine/jungle
- icon_state = "helmet"
- item_state = "helmet"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
+
/obj/item/clothing/head/helmet/marine/snow
- icon_state = "s_helmet"
- item_state = "s_helmet"
- flags_atom = NO_SNOW_TYPE
+ name = "\improper M10 marine snow helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
/obj/item/clothing/head/helmet/marine/desert
- icon_state = "d_helmet"
- item_state = "d_helmet"
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi'
+ )
/obj/item/clothing/head/helmet/marine/tech/tanker
name = "\improper M50 tanker helmet"
@@ -815,7 +794,16 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper M10 white corpsman helmet"
desc = "An M10 marine helmet version worn by marine hospital corpsmen. Painted in medical white and has white cross in a red square painted on its front."
icon_state = "med_helmet_white"
- specialty = "M10 pattern medic white"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY
@@ -823,6 +811,16 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper M10 covert helmet"
desc = "An M10 marine helmet version designed for use in darkened environments. It is coated with a special anti-reflective paint."
icon_state = "marsoc_helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
@@ -831,7 +829,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
armor_rad = CLOTHING_ARMOR_LOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
specialty = "M10 pattern covert"
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/head/helmet/marine/leader
name = "\improper M11 pattern helmet"
@@ -933,7 +931,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "The M30 tactical helmet has a left eyepiece filter used to filter tactical data. It is required to fly the dropships manually and in safety. This one belonged to Tex: the craziest sum'bitch pilot the Almayer ever had. He's not dead or anything, but he did get a medical discharge after he was hit by a car on shore leave last year."
icon_state = "helmetp_tex"
item_state = "helmetp_tex"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ )
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/head/helmet/marine/ghillie
name = "\improper M45 ghillie helmet"
@@ -953,12 +955,22 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "A special M10 Pattern Helmet worn by Commanding Officers of the USCM. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'."
icon_state = "co_officer"
item_state = "co_officer"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGH
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
specialty = "M10 pattern captain"
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security)
/obj/item/clothing/head/helmet/marine/MP
@@ -966,6 +978,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "A special variant of the M10 Pattern Helmet worn by the Military Police of the USCM. Whether you're facing a crime syndicate or a mutiny, this bucket will keep your brains intact."
icon_state = "mp_helmet"
item_state = "mp_helmet"
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
specialty = "M10 pattern military police"
built_in_visors = list(new /obj/item/device/helmet_visor/security)
@@ -985,11 +1001,15 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
specialty = "M10 pattern officer"
built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced)
-/obj/item/clothing/head/helmet/marine/mp/provost/marshal
+/obj/item/clothing/head/helmet/marine/MP/provost/marshal
name = "\improper Provost Marshal Cap"
desc = "The expensive headwear of a Provost Marshal. Contains shards of kevlar to keep its valuable contents safe."
icon_state = "pvmarshalhat"
item_state = "pvmarshalhat"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
flags_inventory = BLOCKSHARPOBJ|FULL_DECAP_PROTECTION
@@ -997,12 +1017,22 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper SOF Operator Helmet"
desc = "A special variant of the M10 Pattern Helmet worn by USCM SOF."
icon_state = "marsoc_helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGH
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
specialty = "M10 pattern SOF"
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
built_in_visors = list(new /obj/item/device/helmet_visor/night_vision/marine_raider, new /obj/item/device/helmet_visor/security)
start_down_visor_type = /obj/item/device/helmet_visor/night_vision/marine_raider
@@ -1017,6 +1047,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper PMC tactical cap"
desc = "A protective cap made from flexible kevlar. Standard issue for most security forms in the place of a helmet."
icon_state = "pmc_hat"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi',
+ )
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_LOW
@@ -1077,10 +1111,12 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate
name = "\improper WY corporate security helmet"
desc = "A basic skull-helm worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar."
- icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi'
+ )
icon_state = "helmet"
item_state = "helmet"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead
desc = "A basic skull-helm worn by corporate security assets. This variant is worn by low-level guards that have too much brainmatter to fit into the old one. Or so they say."
@@ -1093,9 +1129,19 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper RC6 helmet"
desc = "The standard UA Riot Control 6 helmet is of odd design, lacking a face shield by default (mounting points are available). The distinct white pattern and red emblem are synonymous with oppression throughout the rim."
icon_state = "ua_riot"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
specialty = "RC6"
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
// KUTJEVO HELMET
@@ -1104,6 +1150,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "Standard issued helmet for the workers of Kutjevo. Contains a small webbing to hold small items like pens, oil or even a photo of a loved one."
icon_state = "kutjevo_helmet"
item_state = "kutjevo_helmet"
+ icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi',
+ )
//==========================//DISTRESS\\=================================\\
//=======================================================================\\
@@ -1112,6 +1162,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper Dutch's Dozen helmet"
desc = "A protective helmet worn by some seriously experienced mercs."
icon_state = "dutch_helmet"
+ icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi',
+ )
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
@@ -1135,25 +1189,21 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inv_hide = NO_FLAGS
flags_marine_helmet = NO_FLAGS
-/obj/item/clothing/head/helmet/marine/veteran/bear
- name = "\improper Iron Bear helmet"
- desc = "Is good for winter, because it has hole to put vodka through."
- icon_state = "dutch_helmet"
- armor_melee = CLOTHING_ARMOR_HIGH
- armor_bullet = CLOTHING_ARMOR_HIGH
- armor_energy = CLOTHING_ARMOR_MEDIUMLOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMLOW
- armor_rad = CLOTHING_ARMOR_MEDIUMLOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
- min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
- flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY
-
// UPP Are very powerful against bullets (marines) but middling against melee (xenos)
/obj/item/clothing/head/helmet/marine/veteran/UPP
name = "\improper UM4 helmet"
desc = "Using highly skilled manufacturing techniques this UM4 helmet manages to be very resistant to ballistics damage, at the cost of its huge weight causing an extreme stress on the occupant's head that will most likely cause neck problems."
icon_state = "upp_helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UPP.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UPP.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
armor_bullet = CLOTHING_ARMOR_HIGH
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUM
@@ -1186,10 +1236,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/uppcap
name = "\improper UL2 UPP cap"
desc = "UPP headgear issued to soldiers when they're not expected to face combat, and may be requested by officers and above."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UPP.dmi'
icon_state = "upp_cap"
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UPP.dmi'
)
siemens_coefficient = 2
flags_armor_protection = BODY_FLAG_HEAD
@@ -1259,6 +1309,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "A stylish pith helmet, made from space-age materials. Lightweight, breathable, cool, and protective."
icon_state = "van_bandolier"
item_state = "s_helmet"
+ icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi',
+ )
flags_marine_helmet = NO_FLAGS
@@ -1267,7 +1321,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/helmet/specrag
name = "weapons specialist head-rag"
desc = "A hat worn by heavy-weapons operators to block sweat."
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
icon_state = "spec"
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
@@ -1280,9 +1334,27 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inventory = NO_FLAGS
flags_inv_hide = HIDEEARS|HIDETOPHAIR
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
)
+/obj/item/clothing/head/helmet/specrag/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+
+
/obj/item/clothing/head/helmet/specrag/New()
select_gamemode_skin(type)
..()
@@ -1290,7 +1362,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/head/helmet/skullcap
name = "skullcap"
desc = "Good for keeping sweat out of your eyes"
- icon = 'icons/obj/items/clothing/cm_hats.dmi'
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
icon_state = "skullcap"
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
@@ -1303,9 +1375,31 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inventory = NO_FLAGS
flags_inv_hide = HIDEEARS|HIDETOPHAIR
item_icons = list(
- WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
)
+/obj/item/clothing/head/helmet/skullcap/New()
+ select_gamemode_skin(type)
+ ..()
+
+/obj/item/clothing/head/helmet/specrag/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi'
+ item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi'
+
+
/obj/item/clothing/head/helmet/skullcap/jungle
name = "\improper M8 marksman cowl"
desc = "A cowl worn to conceal the face of a marksman in the jungle."
@@ -1327,6 +1421,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
name = "\improper K12 ceramic helmet"
desc = "A sturdy helmet worn by an unknown mercenary group."
icon_state = "mercenary_heavy_helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/CLF.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/CLF.dmi'
+ )
flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
armor_melee = CLOTHING_ARMOR_VERYHIGH
armor_bullet = CLOTHING_ARMOR_VERYHIGH
@@ -1384,6 +1482,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "For some reason, seeing this helmet causes you to feel extremely distressed."
icon_state = "hefa_helmet"
item_state = "hefa_helmet"
+ icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi',
+ )
armor_bomb = CLOTHING_ARMOR_HARDCORE // the hefa knight stands
flags_inv_hide = HIDEEARS|HIDEALLHAIR|HIDEEYES
flags_marine_helmet = NO_FLAGS
@@ -1444,6 +1546,16 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "A helmet designed to make it clear that the wearer is safety aware and not looking for a fight."
icon_state = "cc_helmet"
item_state = "cc_helmet"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "helmet",
+ WEAR_R_HAND = "helmet"
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
built_in_visors = list()
@@ -1453,6 +1565,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "The M3 MOPP mask includes a full covering cowl that securely attaches to the MOPP suit. The mask filters out harmful particles in the air to allow the wearer to breathe safely in the field. Depending on the hostility of the contaminated area the mask’s filter will last an average of 12 hours or less."
icon_state = "cbrn_hood"
item_state = "cbrn_hood"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi',
+ )
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROT
flags_cold_protection = BODY_FLAG_HEAD
@@ -1484,6 +1600,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
desc = "A High-cut ballistic helmet. Designed by Lindenthal-Ehrenfeld Militärindustrie it is intended to be used by Royal Marines Commando as part of the kestrel armour system."
icon_state = "rmc_helm1"
item_state = "rmc_helm1"
+ icon = 'icons/obj/items/clothing/hats/hats_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/TWE.dmi'
+ )
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 01fad60c2877..4e964547368a 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -8,28 +8,6 @@
desc = "The commander in chef's head wear."
siemens_coefficient = 0.9
-//Captain: This probably shouldn't be space-worthy
-/obj/item/clothing/head/caphat
- name = "captain's hat"
- icon_state = "captain"
- desc = "It's good being the king."
- item_state = "caphat"
- siemens_coefficient = 0.9
- anti_hug = 1
-
-//Captain: This probably shouldn't be space-worthy
-/obj/item/clothing/head/helmet/cap
- name = "captain's cap"
- desc = "You fear to wear it for the negligence it brings."
- icon_state = "capcap"
- flags_inventory = NO_FLAGS
- flags_inv_hide = NO_FLAGS
- flags_armor_protection = 0
- flags_cold_protection = BODY_FLAG_HEAD
- min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROT
- siemens_coefficient = 0.9
- flags_armor_protection = 0
-
//Cult
/obj/item/clothing/head/cultist_hood
name = "black hood"
@@ -70,28 +48,39 @@
flags_armor_protection = 0
pickup_sound = null
drop_sound = null
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/hats_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/hats_righthand.dmi'
+ )
//Security
/obj/item/clothing/head/beret/sec
name = "security beret"
desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
icon_state = "beret_badge"
+
/obj/item/clothing/head/beret/sec/alt
name = "officer beret"
desc = "A navy-blue beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
icon_state = "officerberet"
+
/obj/item/clothing/head/beret/sec/hos
name = "officer beret"
desc = "A navy-blue beret with a captain's rank emblem. For officers that are more inclined towards style than safety."
icon_state = "hosberet"
+
/obj/item/clothing/head/beret/sec/warden
name = "warden beret"
desc = "A navy-blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety."
icon_state = "wardenberet"
+
/obj/item/clothing/head/beret/eng
name = "engineering beret"
desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
icon_state = "e_beret_badge"
+
/obj/item/clothing/head/beret/jan
name = "purple beret"
desc = "A stylish, if purple, beret."
@@ -103,6 +92,10 @@
name = "surgical cap"
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
icon_state = "surgcap_blue"
+ icon = 'icons/obj/items/clothing/hats/surgical_caps.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/surgical_caps.dmi'
+ )
flags_inv_hide = HIDETOPHAIR
/obj/item/clothing/head/surgery/purple
@@ -127,6 +120,10 @@
name = "hat"
desc = "Someone who wears this will look very smart."
icon_state = "detective"
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
allowed = list(/obj/item/reagent_container/food/snacks/candy_corn, /obj/item/tool/pen)
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_LOW
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d5b2f98b6d09..cc49cce4c343 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -1,13 +1,4 @@
-
-/obj/item/clothing/head/centhat
- name = "\improper CentComm. hat"
- icon_state = "centcom"
- desc = "It's good to be emperor."
- item_state = "centhat"
- siemens_coefficient = 0.9
- flags_armor_protection = 0
-
/obj/item/clothing/head/hairflower
name = "hair flower pin"
icon_state = "hairflower"
@@ -26,37 +17,13 @@
desc = "It's an Amish-looking hat."
icon_state = "tophat"
item_state = "that"
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
siemens_coefficient = 0.9
flags_armor_protection = 0
-/obj/item/clothing/head/redcoat
- name = "redcoat's hat"
- icon_state = "redcoat"
- desc = "'I guess it's a redhead.'"
- flags_armor_protection = 0
-
-/obj/item/clothing/head/mailman
- name = "station cap"
- icon_state = "mailman"
- desc = "Choo-choo!"
- flags_armor_protection = 0
-
-/obj/item/clothing/head/plaguedoctorhat
- name = "plague doctor's hat"
- desc = "These were once used by Plague doctors. They're pretty much useless."
- icon_state = "plaguedoctor"
- permeability_coefficient = 0.01
- siemens_coefficient = 0.9
- flags_armor_protection = 0
-
-/obj/item/clothing/head/hasturhood
- name = "hastur's hood"
- desc = "It's unspeakably stylish"
- icon_state = "hasturhood"
- flags_inventory = COVEREYES
- flags_inv_hide = HIDEEARS|HIDEALLHAIR
- flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
-
/obj/item/clothing/head/nursehat
name = "nurse's hat"
desc = "It allows quick identification of trained medical personnel."
@@ -66,25 +33,19 @@
/obj/item/clothing/head/syndicatefake
name = "red space-helmet replica"
+ desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
icon_state = "syndicate"
item_state = "syndicate"
- desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi'
+ )
flags_inventory = COVEREYES|COVERMOUTH
flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR
siemens_coefficient = 2
flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
anti_hug = 1
-/obj/item/clothing/head/cueball
- name = "cueball helmet"
- desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
- icon_state = "cueball"
- flags_inventory = COVEREYES|COVERMOUTH
- flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR
- item_state="cueball"
- flags_inventory = 0
- flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
-
/obj/item/clothing/head/greenbandana
name = "green bandana"
desc = "It's a green bandana with some fine nanotech lining."
@@ -103,30 +64,6 @@
flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR
flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
-/obj/item/clothing/head/justice
- name = "justice hat"
- desc = "fight for what's righteous!"
- icon_state = "justicered"
- item_state = "justicered"
- flags_inventory = COVERMOUTH|COVEREYES
- flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR
-
-/obj/item/clothing/head/justice/blue
- icon_state = "justiceblue"
- item_state = "justiceblue"
-
-/obj/item/clothing/head/justice/yellow
- icon_state = "justiceyellow"
- item_state = "justiceyellow"
-
-/obj/item/clothing/head/justice/green
- icon_state = "justicegreen"
- item_state = "justicegreen"
-
-/obj/item/clothing/head/justice/pink
- icon_state = "justicepink"
- item_state = "justicepink"
-
/obj/item/clothing/head/flatcap
name = "flat cap"
desc = "A working man's cap."
@@ -141,21 +78,6 @@
item_state = "pirate"
flags_armor_protection = 0
-/obj/item/clothing/head/hgpiratecap
- name = "pirate hat"
- desc = "Yarr."
- icon_state = "hgpiratecap"
- item_state = "hgpiratecap"
- flags_armor_protection = 0
- armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
- armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
- armor_laser = CLOTHING_ARMOR_LOW
- armor_energy = CLOTHING_ARMOR_LOW
- armor_bomb = CLOTHING_ARMOR_LOW
- armor_bio = CLOTHING_ARMOR_MEDIUM
- armor_rad = CLOTHING_ARMOR_LOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUM
-
/obj/item/clothing/head/bandana
name = "pirate bandana"
desc = "Yarr."
@@ -167,24 +89,35 @@
desc = "Gentleman, elite aboard!"
icon_state = "bowler"
item_state = "bowler"
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
flags_armor_protection = 0
//stylish bs12 hats
/obj/item/clothing/head/bowlerhat
name = "bowler hat"
+ desc = "For the gentleman of distinction."
icon_state = "bowler_hat"
item_state = "bowler_hat"
- desc = "For the gentleman of distinction."
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
flags_armor_protection = 0
/obj/item/clothing/head/director
name = "director's hat"
+ desc = "Belongs to someone very important. Has minor protection to all damage types"
icon_state = "director_hat"
item_state = "director_hat"
- desc = "Belongs to someone very important. Has minor protection to all damage types"
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
flags_armor_protection = BODY_FLAG_HEAD
-
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
armor_laser = CLOTHING_ARMOR_LOW
@@ -196,11 +129,14 @@
/obj/item/clothing/head/manager
name = "manager's hat"
+ desc = "Belongs to someone important. Offers minor protection from all forms of damage."
icon_state = "manager_hat"
item_state = "manager_hat"
- desc = "Belongs to someone important. Offers minor protection from all forms of damage."
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
flags_armor_protection = BODY_FLAG_HEAD
-
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_LOW
@@ -212,27 +148,43 @@
/obj/item/clothing/head/beaverhat
name = "beaver hat"
+ desc = "Soft felt makes this hat both comfortable and elegant."
icon_state = "beaver_hat"
item_state = "beaver_hat"
- desc = "Soft felt makes this hat both comfortable and elegant."
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
/obj/item/clothing/head/boaterhat
name = "boater hat"
+ desc = "The ultimate in summer fashion."
icon_state = "boater_hat"
item_state = "boater_hat"
- desc = "The ultimate in summer fashion."
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
/obj/item/clothing/head/fedora
name = "\improper fedora"
+ desc = "A sharp, stylish hat."
icon_state = "fedora"
item_state = "fedora"
- desc = "A sharp, stylish hat."
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
/obj/item/clothing/head/feathertrilby
name = "\improper feather trilby"
+ desc = "A sharp, stylish hat with a feather."
icon_state = "feather_trilby"
item_state = "feather_trilby"
- desc = "A sharp, stylish hat with a feather."
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi'
+ )
/obj/item/clothing/head/fez
name = "\improper fez"
@@ -242,15 +194,6 @@
//end bs12 hats
-/obj/item/clothing/head/witchwig
- name = "witch costume wig"
- desc = "Eeeee~heheheheheheh!"
- icon_state = "witch"
- item_state = "witch"
- flags_inventory = NO_FLAGS
- flags_inv_hide = HIDEALLHAIR
- siemens_coefficient = 2
-
/obj/item/clothing/head/chicken
name = "chicken suit head"
desc = "Bkaw!"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index a0e95f7f0f30..68c53e33cca9 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -4,6 +4,10 @@
icon_state = "cargosoft"
flags_inventory = COVEREYES
item_state = "helmet"
+ icon = 'icons/obj/items/clothing/hats/soft_caps.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/soft_caps.dmi'
+ )
var/cap_color = "cargo"
var/flipped = 0
siemens_coefficient = 0.9
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index ffdda93f8a73..6005817ef292 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -3,6 +3,10 @@
name = "breath mask"
icon_state = "breath"
item_state = "breath"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWINTERNALS
flags_armor_protection = 0
w_class = SIZE_SMALL
@@ -48,6 +52,10 @@
desc = "A close-fitting device that instantly heats or cools down air when you inhale so it doesn't damage your lungs."
icon_state = "rebreather"
item_state = "rebreather"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
w_class = SIZE_SMALL
flags_armor_protection = 0
flags_inventory = COVERMOUTH|ALLOWREBREATH
@@ -58,6 +66,10 @@
desc = "The face of your nightmares. Or at least that's how you imagined it'd be. Additionally protects against the cold."
icon_state = "blue_skull_balaclava"
item_state = "blue_skull_balaclava"
+ icon = 'icons/obj/items/clothing/masks/balaclava.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/balaclava.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWREBREATH|ALLOWCPR
flags_inv_hide = HIDEALLHAIR|HIDEEARS
flags_cold_protection = BODY_FLAG_HEAD
@@ -74,6 +86,10 @@
desc = "A close-fitting cap that covers the top, back, and sides of the head. Can also be adjusted to cover the lower part of the face so it keeps the user warm in harsh conditions."
icon_state = "coif"
item_state = "coif"
+ icon = 'icons/obj/items/clothing/masks/balaclava.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/balaclava.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWREBREATH|ALLOWCPR
flags_inv_hide = HIDEALLHAIR|HIDEEARS
flags_cold_protection = BODY_FLAG_HEAD
@@ -128,6 +144,10 @@
desc = "A tactical wrap used by soldiers to conceal their face."
icon_state = "scarf_gray"
item_state = "scarf_gray"
+ icon = 'icons/obj/items/clothing/masks/scarves.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/scarves.dmi'
+ )
original_state = "scarf_gray"
flags_inventory = COVERMOUTH|ALLOWREBREATH|ALLOWCPR
flags_inv_hide = HIDEFACE|HIDELOWHAIR
@@ -201,6 +221,10 @@
desc = "A tactical scarf used to keep warm in the cold."
icon_state = "torn_scarf_classic"
item_state = "torn_scarf_classic"
+ icon = 'icons/obj/items/clothing/masks/scarves.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/scarves.dmi'
+ )
w_class = SIZE_SMALL
flags_inventory = ALLOWCPR
flags_cold_protection = BODY_FLAG_HEAD
@@ -231,6 +255,10 @@
desc = "A close-fitting mask that can be connected to an air supply."
icon_state = "owlf_mask"
item_state = "owlf_mask"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWINTERNALS
flags_armor_protection = 0
w_class = SIZE_SMALL
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index b13fab0ae5a4..874e77dd0212 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -3,13 +3,17 @@
name = "gas mask"
desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air."
icon_state = "gas_alt"
+ item_state = "gas_alt"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
flags_inventory = COVERMOUTH | COVEREYES | ALLOWINTERNALS | BLOCKGASEFFECT | ALLOWREBREATH | ALLOWCPR
flags_inv_hide = HIDEEARS|HIDEFACE|HIDELOWHAIR
flags_cold_protection = BODY_FLAG_HEAD
flags_equip_slot = SLOT_FACE|SLOT_WAIST
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
w_class = SIZE_SMALL
- item_state = "gas_alt"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.9
armor_melee = CLOTHING_ARMOR_NONE
@@ -36,6 +40,10 @@
desc = "An armored balaclava designed to conceal both the identity of the operator and act as an air-filter."
item_state = "helmet"
icon_state = "pmc_mask"
+ icon = 'icons/obj/items/clothing/masks/masks_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks_by_faction/WY.dmi'
+ )
anti_hug = 3
vision_impair = VISION_IMPAIR_NONE
armor_melee = CLOTHING_ARMOR_LOW
@@ -54,41 +62,24 @@
name = "\improper SOF armored balaclava"
desc = "Designed for maximum protection -- and badassery. Provides protection against facial attacks, filters toxins, and conceals the wearer's identity."
icon_state = "balaclava"
+ icon = 'icons/obj/items/clothing/masks/balaclava.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/balaclava.dmi'
+ )
/obj/item/clothing/mask/gas/pmc/upp
name = "\improper UPP armored commando balaclava"
icon_state = "upp_mask"
+ icon = 'icons/obj/items/clothing/masks/masks_by_faction/UPP.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks_by_faction/UPP.dmi'
+ )
/obj/item/clothing/mask/gas/pmc/leader
name = "\improper M8 pattern armored balaclava"
desc = "An armored balaclava designed to conceal both the identity of the operator and act as an air-filter. This particular suit looks like it belongs to a high-ranking officer."
icon_state = "officer_mask"
-/obj/item/clothing/mask/gas/bear
- name = "tactical balaclava"
- desc = "A superior balaclava worn by the Iron Bears."
- icon_state = "bear_mask"
- anti_hug = 2
-
-
-
-
-//Plague Dr suit can be found in clothing/suits/bio.dm
-/obj/item/clothing/mask/gas/plaguedoctor
- name = "plague doctor mask"
- desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
- icon_state = "plaguedoctor"
- item_state = "gas_mask"
- armor_melee = CLOTHING_ARMOR_NONE
- armor_bullet = CLOTHING_ARMOR_NONE
- armor_laser = CLOTHING_ARMOR_NONE
- armor_energy = CLOTHING_ARMOR_NONE
- armor_bomb = CLOTHING_ARMOR_NONE
- armor_bio = CLOTHING_ARMOR_NONE
- armor_rad = CLOTHING_ARMOR_NONE
- armor_internaldamage = CLOTHING_ARMOR_NONE
- flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE
-
/obj/item/clothing/mask/gas/swat
name = "\improper SWAT mask"
desc = "A close-fitting tactical mask that can be connected to an air supply."
@@ -96,54 +87,28 @@
siemens_coefficient = 0.7
flags_armor_protection = BODY_FLAG_FACE|BODY_FLAG_EYES
-/obj/item/clothing/mask/gas/syndicate
- name = "syndicate mask"
- desc = "A close-fitting tactical mask that can be connected to an air supply."
- icon_state = "swat"
- siemens_coefficient = 0.7
-
-/obj/item/clothing/mask/gas/voice
- name = "gas mask"
- desc = "A face-covering mask that can be connected to an air supply. It seems to house some odd electronics."
-
-/obj/item/clothing/mask/gas/voice/space_ninja
- name = "ninja mask"
- desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
- icon_state = "s-ninja"
- item_state = "s-ninja_mask"
- siemens_coefficient = 0.2
- vision_impair = VISION_IMPAIR_NONE
-
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask."
icon_state = "clown"
item_state = "clown_hat"
+ icon = 'icons/obj/items/clothing/masks/masks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks.dmi'
+ )
vision_impair = VISION_IMPAIR_NONE
black_market_value = 25
-/obj/item/clothing/mask/gas/mime
- name = "mime mask"
- desc = "The traditional mime's mask. It has an eerie facial posture."
- icon_state = "mime"
- item_state = "mime"
- vision_impair = VISION_IMPAIR_NONE
-
-/obj/item/clothing/mask/gas/monkeymask
- name = "monkey mask"
- desc = "A mask used when acting as a monkey."
- icon_state = "monkeymask"
- item_state = "monkeymask"
- flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
- vision_impair = VISION_IMPAIR_NONE
-
/obj/item/clothing/mask/gas/fake_mustache
name = "fake mustache"
desc = "It is almost perfect."
icon_state = "souto_man"
+ icon = 'icons/obj/items/clothing/masks/masks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks.dmi'
+ )
vision_impair = VISION_IMPAIR_NONE
unacidable = TRUE
-// flags_item = NODROP|DELONDROP
flags_inventory = CANTSTRIP|COVEREYES|COVERMOUTH|ALLOWINTERNALS|ALLOWREBREATH|BLOCKGASEFFECT|ALLOWCPR|BLOCKSHARPOBJ
//=ROYAL MARINES=\\
@@ -152,4 +117,8 @@
name = "\improper L7 gasmask"
desc = "The L7 Gasmask used by members of the three world empires royal marines commando."
icon_state = "rmc_mask"
+ icon = 'icons/obj/items/clothing/masks/masks_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks_by_faction/TWE.dmi'
+ )
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 4f928f62399f..74b7223edcdc 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -38,25 +38,22 @@
name = "Snorkel"
desc = "For the Swimming Savant."
icon_state = "snorkel"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
flags_inv_hide = HIDEFACE
flags_armor_protection = 0
-/obj/item/clothing/mask/pig
- name = "pig mask"
- desc = "A rubber pig mask."
- icon_state = "pig"
- item_state = "pig"
- flags_inventory = COVERMOUTH|COVEREYES
- flags_inv_hide = HIDEFACE|HIDEALLHAIR|HIDEEYES|HIDEEARS
- w_class = SIZE_SMALL
- siemens_coefficient = 0.9
- flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
-
/obj/item/clothing/mask/balaclava
name = "balaclava"
desc = "A basic single eye-hole balaclava, available in almost every sporting goods, outdoor supply, or military surplus store in existence, protects your face from the cold almost as well as it conceals it. This one is in a standard black color."
icon_state = "balaclava"
item_state = "balaclava"
+ icon = 'icons/obj/items/clothing/masks/balaclava.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/balaclava.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWREBREATH|ALLOWCPR
flags_inv_hide = HIDEFACE|HIDEALLHAIR|HIDEEARS
flags_cold_protection = BODY_FLAG_HEAD
diff --git a/code/modules/clothing/officer_stuff.dm b/code/modules/clothing/officer_stuff.dm
index d0edb2d9c26d..27c32be09715 100644
--- a/code/modules/clothing/officer_stuff.dm
+++ b/code/modules/clothing/officer_stuff.dm
@@ -34,6 +34,6 @@
/obj/item/clothing/under/rank/centcom/captain
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral\" and bears \"N.C.V. Fearless CV-286\" on the left shoulder."
name = "\improper Wey-Yu Admiral Uniform"
- icon_state = "centcom"
- item_state = "dg_suit"
+ icon_state = "officer"
+ item_state = "g_suit"
displays_id = 0
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 91ae13958e46..bce96407c70d 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -48,27 +48,6 @@
flags_heat_protection = BODY_FLAG_FEET
max_heat_protection_temperature = SHOE_MAX_HEAT_PROT
-/obj/item/clothing/shoes/space_ninja
- name = "ninja shoes"
- desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."
- icon_state = "s-ninja"
- permeability_coefficient = 0.01
- flags_inventory = NOSLIPPING
- armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
- armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
- armor_laser = CLOTHING_ARMOR_LOW
- armor_energy = CLOTHING_ARMOR_LOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_HIGH
- armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
- siemens_coefficient = 0.2
-
- flags_cold_protection = BODY_FLAG_FEET
- min_cold_protection_temperature = SHOE_MIN_COLD_PROT
- flags_heat_protection = BODY_FLAG_FEET
- max_heat_protection_temperature = SHOE_MAX_HEAT_PROT
-
/obj/item/clothing/shoes/sandal
desc = "A pair of rather plain, wooden sandals."
name = "sandals"
diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm
deleted file mode 100644
index 2643e43b2b6a..000000000000
--- a/code/modules/clothing/spacesuits/captain.dm
+++ /dev/null
@@ -1,41 +0,0 @@
-//Captain's Spacesuit
-/obj/item/clothing/head/helmet/space/capspace
- name = "space helmet"
- icon_state = "capspace"
- item_state = "capspacehelmet"
- desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
- permeability_coefficient = 0.01
- armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
- armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
- armor_laser = CLOTHING_ARMOR_MEDIUMHIGH
- armor_energy = CLOTHING_ARMOR_MEDIUMHIGH
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
- armor_rad = CLOTHING_ARMOR_HIGH
- armor_internaldamage = CLOTHING_ARMOR_HIGH
-
-//Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it.
-/obj/item/clothing/suit/armor/captain
- name = "Captain's armor"
- desc = "A bulky, heavy-duty piece of exclusive Weyland-Yutani armor. YOU are in charge!"
- icon_state = "caparmor"
- item_state = "capspacesuit"
- w_class = SIZE_LARGE
- gas_transfer_coefficient = 0.01
- permeability_coefficient = 0.02
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS
- allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun, /obj/item/ammo_magazine, /obj/item/weapon/baton,/obj/item/restraint/handcuffs)
- slowdown = 1.5
- armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
- armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
- armor_laser = CLOTHING_ARMOR_LOW
- armor_energy = CLOTHING_ARMOR_LOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
- armor_rad = CLOTHING_ARMOR_LOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
- flags_inventory = NOPRESSUREDMAGE
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
- flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT
- siemens_coefficient = 0.7
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 36dd5f4f04c8..68f9b4c083bc 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -3,6 +3,10 @@
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santa_hat_red"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+ )
flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ
flags_inv_hide = HIDEEYES
flags_armor_protection = BODY_FLAG_HEAD
@@ -15,49 +19,13 @@
desc = "Festive!"
icon_state = "santa"
item_state = "santa"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
slowdown = 0
allowed = list(/obj/item) //for stuffing extra special presents
-//Space pirate outfit
-/obj/item/clothing/head/helmet/space/pirate
- name = "pirate hat"
- desc = "Yarr."
- icon_state = "pirate"
- item_state = "pirate"
- armor_melee = CLOTHING_ARMOR_MEDIUM
- armor_bullet = CLOTHING_ARMOR_MEDIUM
- armor_laser = CLOTHING_ARMOR_MEDIUMLOW
- armor_energy = CLOTHING_ARMOR_MEDIUMLOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMLOW
- armor_rad = CLOTHING_ARMOR_MEDIUMLOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
- flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ
- flags_inv_hide = HIDEEYES
- flags_armor_protection = 0
- siemens_coefficient = 0.9
-
-/obj/item/clothing/suit/space/pirate
- name = "pirate coat"
- desc = "Yarr."
- icon_state = "pirate"
- item_state = "pirate"
- w_class = SIZE_MEDIUM
- allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank/emergency_oxygen)
- slowdown = 0
- armor_melee = CLOTHING_ARMOR_MEDIUM
- armor_bullet = CLOTHING_ARMOR_MEDIUM
- armor_laser = CLOTHING_ARMOR_MEDIUMLOW
- armor_energy = CLOTHING_ARMOR_MEDIUMLOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMLOW
- armor_rad = CLOTHING_ARMOR_MEDIUMLOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
- siemens_coefficient = 0.9
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
-
-
-
/obj/item/clothing/head/helmet/space/compression
name = "\improper MK.50 compression helmet"
desc = "A heavy space helmet, designed to be coupled with the MK.50 compression suit, though it is less resilient than the suit. Feels like you could hotbox in here."
@@ -77,6 +45,7 @@
desc = "A heavy, bulky civilian space suit, fitted with armored plates. Commonly seen in the hands of mercenaries, explorers, scavengers, and researchers."
item_state = "compression"
icon_state = "compression"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
@@ -85,6 +54,9 @@
armor_bio = CLOTHING_ARMOR_ULTRAHIGH
armor_rad = CLOTHING_ARMOR_ULTRAHIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
/obj/item/clothing/head/helmet/space/compression/uscm
name = "\improper MK.50 compression helmet"
@@ -102,6 +74,10 @@
desc = "The tank top worn by Souto Man. As fresh as a nice can of Souto Classic!"
item_state = "souto_man"
icon_state = "souto_man"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
armor_melee = CLOTHING_ARMOR_HARDCORE
armor_bullet = CLOTHING_ARMOR_HARDCORE
armor_laser = CLOTHING_ARMOR_HARDCORE
@@ -120,6 +96,10 @@
desc = "The hat worn by Souto Man. As tall as the new 24oz cans of Souto Lime!"
item_state = "souto_man"
icon_state = "souto_man"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi'
+ )
armor_melee = CLOTHING_ARMOR_HARDCORE
armor_bullet = CLOTHING_ARMOR_HARDCORE
armor_laser = CLOTHING_ARMOR_HARDCORE
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index a8b056d0bb9d..f30f963925e0 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -6,6 +6,10 @@
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
item_state = "space"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi',
+ )
permeability_coefficient = 0.01
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -28,6 +32,10 @@
desc = "A suit that protects against low pressure environments."
icon_state = "space"
item_state = "s_suit"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
w_class = SIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 7e9a41c6becc..febc89396db6 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -1,5 +1,6 @@
/obj/item/clothing/suit/armor
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
flags_inventory = BLOCKSHARPOBJ
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
@@ -8,7 +9,7 @@
max_heat_protection_temperature = HELMET_MAX_HEAT_PROT
siemens_coefficient = 0.6
w_class = SIZE_HUGE
- allowed = list(/obj/item/weapon/gun, /obj/item/storage/backpack/general_belt)//Guns only.
+ allowed = list(/obj/item/weapon/gun, /obj/item/storage/backpack/general_belt) //Guns only.
uniform_restricted = list(/obj/item/clothing/under)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S)
@@ -16,6 +17,9 @@
pickup_sound = "armorequip"
drop_sound = "armorequip"
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi'
+ )
/obj/item/clothing/suit/armor/mob_can_equip(mob/living/carbon/human/M, slot, disable_warning = 0)
. = ..()
@@ -54,13 +58,11 @@
/obj/item/storage/belt/gun/m44,
)
-
-
/obj/item/clothing/suit/armor/vest/pilot
name = "\improper M70 flak jacket"
desc = "A flak jacket used by dropship pilots to protect themselves while flying in the cockpit. Excels in protecting the wearer against high-velocity solid projectiles."
- icon = 'icons/obj/items/clothing/cm_suits.dmi'
icon_state = "pilot"
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
blood_overlay_type = "armor"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
@@ -92,18 +94,34 @@
)
uniform_restricted = list(/obj/item/clothing/under/marine/officer/pilot)
sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi')
- item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi'
- )
/obj/item/clothing/suit/armor/vest/pilot/Initialize()
. = ..()
select_gamemode_skin(/obj/item/clothing/suit/armor/vest/pilot)
+/obj/item/clothing/suit/armor/vest/pilot/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/classic.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/desert.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/snow.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/urban.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi'
+
/obj/item/clothing/suit/armor/vest/dutch
name = "armored jacket"
desc = "It's hot in the jungle. Sometimes it's hot and heavy, and sometimes it's hell on earth."
- icon = 'icons/obj/items/clothing/cm_suits.dmi'
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
icon_state = "dutch_armor"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
armor_melee = CLOTHING_ARMOR_HIGH
@@ -131,13 +149,16 @@
armor_rad = CLOTHING_ARMOR_LOW
valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
-
/obj/item/clothing/suit/armor/vest/warden
name = "Warden's jacket"
desc = "An armored jacket with silver rank pips and livery."
icon_state = "warden_jacket"
item_state = "armor"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
/obj/item/clothing/suit/armor/laserproof
name = "Ablative Armor Vest"
@@ -192,7 +213,6 @@
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
flags_inventory = BLOCKSHARPOBJ
- flags_inv_hide = HIDEJUMPSUIT
siemens_coefficient = 0.5
time_to_unequip = 20
time_to_equip = 20
@@ -202,6 +222,7 @@
desc = "Are you not entertained? Is that not why you are here?"
icon_state = "gladiator"
item_state = "gladiator"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_LOW
@@ -220,6 +241,9 @@
/obj/item/device/flashlight,
)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
/obj/item/clothing/suit/armor/riot/marine
name = "\improper M5 riot control armor"
@@ -247,6 +271,7 @@
desc = "A heavily armored suit that protects against moderate damage. Used in special operations."
icon_state = "deathsquad"
item_state = "swat_suit"
+ icon = 'icons/obj/items/clothing/suits/donator.dmi'
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS
@@ -261,22 +286,27 @@
armor_rad = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_HIGH
flags_inventory = BLOCKSHARPOBJ|NOPRESSUREDMAGE
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ flags_inv_hide = HIDEGLOVES|HIDESHOES
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT
siemens_coefficient = 0.6
-
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/donator.dmi',
+ )
/obj/item/clothing/suit/armor/swat/officer
name = "officer jacket"
desc = "An armored jacket used in special operations."
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
icon_state = "detective"
item_state = "det_suit"
blood_overlay_type = "coat"
flags_inventory = NO_FLAGS
flags_inv_hide = NO_FLAGS
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
-
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
/obj/item/clothing/suit/armor/det_suit
name = "armor"
@@ -295,199 +325,10 @@
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M)
-//Reactive armor
-//When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!)
-/obj/item/clothing/suit/armor/reactive
- name = "Reactive Teleport Armor"
- desc = "Someone separated our Research Director from their own head!"
- var/active = 0
- icon_state = "reactiveoff"
- item_state = "reactiveoff"
- blood_overlay_type = "armor"
- slowdown = 1
- flags_atom = FPRINT|CONDUCT
- armor_melee = CLOTHING_ARMOR_NONE
- armor_bullet = CLOTHING_ARMOR_NONE
- armor_laser = CLOTHING_ARMOR_NONE
- armor_energy = CLOTHING_ARMOR_NONE
- armor_bomb = CLOTHING_ARMOR_NONE
- armor_bio = CLOTHING_ARMOR_NONE
- armor_rad = CLOTHING_ARMOR_NONE
- armor_internaldamage = CLOTHING_ARMOR_NONE
-
-/obj/item/clothing/suit/armor/reactive/IsShield()
- if(active)
- return 1
- return 0
-
-/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
- ..()
-
- active = !active
- if (active)
- to_chat(user, SPAN_NOTICE(" The reactive armor is now active."))
- icon_state = "reactive"
- item_state = "reactive"
- else
- to_chat(user, SPAN_NOTICE(" The reactive armor is now inactive."))
- icon_state = "reactiveoff"
- item_state = "reactiveoff"
- add_fingerprint(user)
-
-/obj/item/clothing/suit/armor/reactive/emp_act(severity)
- . = ..()
- active = 0
- src.icon_state = "reactiveoff"
- src.item_state = "reactiveoff"
-
-
-
-
-
-
-//All of the armor below is mostly unused
-
-
-/obj/item/clothing/suit/armor/centcomm
- name = "Cent. Com. armor"
- desc = "A suit that protects against some damage."
- icon_state = "centcom"
- item_state = "centcom"
- w_class = SIZE_LARGE//bulky item
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- allowed = list(/obj/item/weapon/gun,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank/emergency_oxygen)
- flags_inventory = NO_FLAGS
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT
- siemens_coefficient = 0
-
-/obj/item/clothing/suit/armor/heavy
- name = "heavy armor"
- desc = "A heavily armored suit that protects against moderate damage."
- icon_state = "heavy"
- item_state = "swat_suit"
- w_class = SIZE_LARGE//bulky item
- gas_transfer_coefficient = 0.90
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- slowdown = 3
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- siemens_coefficient = 0
-
-/obj/item/clothing/suit/armor/tdome
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-/obj/item/clothing/suit/armor/tdome/red
- name = "Thunderdome suit (red)"
- desc = "Reddish armor."
- icon_state = "tdred"
- item_state = "tdred"
- siemens_coefficient = 1
-
-/obj/item/clothing/suit/armor/tdome/green
- name = "Thunderdome suit (green)"
- desc = "Pukish armor."
- icon_state = "tdgreen"
- item_state = "tdgreen"
- siemens_coefficient = 1
-
-/obj/item/clothing/suit/armor/tactical
- name = "tactical armor"
- desc = "A suit of armor most often used by Special Weapons and Intel squads. Includes padded vest with pockets along with shoulder and kneeguards."
- icon_state = "swatarmor"
- item_state = "armor"
- var/obj/item/weapon/gun/holstered = null
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
- slowdown = 1
- armor_melee = CLOTHING_ARMOR_MEDIUM
- armor_bullet = CLOTHING_ARMOR_MEDIUM
- armor_laser = CLOTHING_ARMOR_MEDIUMLOW
- armor_energy = CLOTHING_ARMOR_MEDIUMLOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMLOW
- armor_rad = CLOTHING_ARMOR_MEDIUMLOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
- siemens_coefficient = 0.7
-
-/obj/item/clothing/suit/armor/tactical/verb/holster()
- set name = "Holster"
- set category = "Object"
- set src in usr
- if(!istype(usr, /mob/living)) return
- if(usr.stat) return
-
- if(!holstered)
- if(!isgun(usr.get_active_hand()))
- to_chat(usr, SPAN_NOTICE(" You need your gun equiped to holster it."))
- return
- var/obj/item/weapon/gun/W = usr.get_active_hand()
- if (W.w_class > SIZE_MEDIUM)
- to_chat(usr, SPAN_DANGER("This gun won't fit in the belt!"))
- return
- holstered = usr.get_active_hand()
- usr.drop_held_item()
- holstered.forceMove(src)
- usr.visible_message(SPAN_NOTICE("\The [usr] holsters \the [holstered]."), "You holster \the [holstered].")
- else
- if(istype(usr.get_active_hand(),/obj) && istype(usr.get_inactive_hand(),/obj))
- to_chat(usr, SPAN_DANGER("You need an empty hand to draw the gun!"))
- else
- if(usr.a_intent == INTENT_HARM)
- usr.visible_message(SPAN_DANGER("\The [usr] draws \the [holstered], ready to shoot!"), \
- SPAN_DANGER("You draw \the [holstered], ready to shoot!"))
- else
- usr.visible_message(SPAN_NOTICE("\The [usr] draws \the [holstered], pointing it at the ground."), \
- SPAN_NOTICE("You draw \the [holstered], pointing it at the ground."))
- usr.put_in_hands(holstered)
- holstered = null
-
-//Non-hardsuit ERT armor.
-/obj/item/clothing/suit/armor/vest/ert
- name = "emergency response team armor"
- desc = "A set of armor worn by members of the Weyland-Yutani Emergency Response Team."
- icon_state = "ertarmor_cmd"
- item_state = "armor"
- armor_melee = CLOTHING_ARMOR_MEDIUM
- armor_bullet = CLOTHING_ARMOR_MEDIUM
- armor_laser = CLOTHING_ARMOR_MEDIUMLOW
- armor_energy = CLOTHING_ARMOR_MEDIUMLOW
- armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
- armor_bio = CLOTHING_ARMOR_MEDIUMLOW
- armor_rad = CLOTHING_ARMOR_MEDIUMLOW
- armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
-
-//Commander
-/obj/item/clothing/suit/armor/vest/ert/command
- name = "emergency response team commander armor"
- desc = "A set of armor worn by the commander of a Weyland-Yutani Emergency Response Team. Has blue highlights."
-
-//Security
-/obj/item/clothing/suit/armor/vest/ert/security
- name = "emergency response team security armor"
- desc = "A set of armor worn by security members of the Weyland-Yutani Emergency Response Team. Has red highlights."
- icon_state = "ertarmor_sec"
-
-//Engineer
-/obj/item/clothing/suit/armor/vest/ert/engineer
- name = "emergency response team engineer armor"
- desc = "A set of armor worn by engineering members of the Weyland-Yutani Emergency Response Team. Has orange highlights."
- icon_state = "ertarmor_eng"
-
-//Medical
-/obj/item/clothing/suit/armor/vest/ert/medical
- name = "emergency response team medical armor"
- desc = "A set of armor worn by medical members of the Weyland-Yutani Emergency Response Team. Has red and white highlights."
- icon_state = "ertarmor_med"
-
-
-
-
-
-
/obj/item/clothing/suit/armor/hos
name = "armored coat"
desc = "A greatcoat enhanced with a special alloy for some protection and style."
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
icon_state = "hos"
item_state = "hos"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
@@ -502,12 +343,6 @@
flags_inventory = NO_FLAGS
flags_inv_hide = HIDEJUMPSUIT
siemens_coefficient = 0.6
-
-/obj/item/clothing/suit/armor/hos/jensen
- name = "armored trenchcoat"
- desc = "A trenchcoat augmented with a special alloy for some protection and style."
- icon_state = "jensencoat"
- item_state = "jensencoat"
- flags_inv_hide = NO_FLAGS
- siemens_coefficient = 0.6
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index eb99005328bc..28789f04b2a8 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -1,8 +1,12 @@
//Biosuit complete with shoes (in the item sprite)
/obj/item/clothing/head/bio_hood
name = "bio hood"
- icon_state = "bio"
desc = "A hood that protects the head and face from biological contaminants."
+ icon_state = "bio"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi'
+ )
permeability_coefficient = 0.2
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -28,6 +32,7 @@
desc = "A suit that protects against biological contamination."
icon_state = "bio"
item_state = "bio_suit"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
w_class = SIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.2
@@ -43,12 +48,16 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
siemens_coefficient = 0.9
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
/obj/item/clothing/suit/storage/synthbio
name = "bio suit"
desc = "Synthetic compliant bio-hazard suit. Intended to allow a synthetic to offer the illusion of infection control to humans. Has had most of the internal protective lining removed, allowing it to hold equipment and be lighter to move in."
icon_state = "bio"
item_state = "bio_suit"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
allowed = list(
/obj/item/weapon/baton,
/obj/item/restraint/handcuffs,
@@ -64,6 +73,9 @@
/obj/item/storage/large_holster/machete,
/obj/item/device/motiondetector,
)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
@@ -112,20 +124,3 @@
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-//CMO's biosuit, blue stripe
-/obj/item/clothing/suit/bio_suit/cmo
- icon_state = "bio_cmo"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
- flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-
-/obj/item/clothing/head/bio_hood/cmo
- icon_state = "bio_cmo"
-
-
-//Plague Dr mask can be found in clothing/masks/gasmask.dm
-/obj/item/clothing/suit/bio_suit/plaguedoctorsuit
- name = "Plague doctor suit"
- desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
- icon_state = "plaguedoctor"
- item_state = "bio_suit"
- flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 34d5764db21e..9296416dbe2e 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -8,6 +8,7 @@
desc = "A basic blue apron."
icon_state = "apron"
item_state = "apron"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
blood_overlay_type = "armor"
flags_armor_protection = 0
allowed = list (
@@ -23,22 +24,9 @@
/obj/item/tool/crowbar,
/obj/item/tool/pen,
)
-//Captain
-/obj/item/clothing/suit/captunic
- name = "captain's parade tunic"
- desc = "Worn by a Captain to show their class."
- icon_state = "captunic"
- item_state = "bio_suit"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
- flags_inv_hide = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/captunic/capjacket
- name = "captain's uniform jacket"
- desc = "A less formal jacket for everyday captain use."
- icon_state = "capjacket"
- item_state = "bio_suit"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
- flags_inv_hide = HIDEJUMPSUIT
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi',
+ )
//Cultist
/obj/item/clothing/suit/cultist_hoodie
@@ -87,11 +75,15 @@
desc = "Maximum piety in this star system."
icon_state = "nun"
item_state = "nun"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
flags_inv_hide = HIDESHOES|HIDEJUMPSUIT
allowed = list(
/obj/item/weapon/gun,
)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
//Chef
/obj/item/clothing/suit/chef
@@ -99,6 +91,7 @@
desc = "An apron used by a high-class chef."
icon_state = "chef"
item_state = "chef"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
@@ -113,6 +106,9 @@
/obj/item/tool/crowbar,
/obj/item/tool/pen,
)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
//Chef
/obj/item/clothing/suit/chef/classic
@@ -120,6 +116,10 @@
desc = "A basic, dull, white chef's apron."
icon_state = "apronchef"
item_state = "apronchef"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi',
+ )
blood_overlay_type = "armor"
flags_armor_protection = 0
allowed = list (
@@ -134,34 +134,13 @@
/obj/item/tool/pen,
)
-//Security
-/obj/item/clothing/suit/security/navyofficer
- name = "security officer's jacket"
- desc = "This jacket is for those special occasions when a security officer actually feels safe."
- icon_state = "officerbluejacket"
- item_state = "officerbluejacket"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
-
-/obj/item/clothing/suit/security/navywarden
- name = "warden's jacket"
- desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig."
- icon_state = "wardenbluejacket"
- item_state = "wardenbluejacket"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
-
-/obj/item/clothing/suit/security/navyhos
- name = "head of security's jacket"
- desc = "This piece of clothing was specifically designed for asserting superior authority."
- icon_state = "hosbluejacket"
- item_state = "hosbluejacket"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
-
//Detective
/obj/item/clothing/suit/storage/det_suit
name = "coat"
desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business."
icon_state = "detective"
item_state = "det_suit"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
blood_overlay_type = "coat"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
allowed = list(
@@ -215,6 +194,9 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
/obj/item/clothing/suit/storage/det_suit/black
icon_state = "detective2"
@@ -224,6 +206,7 @@
name = "jacket"
desc = "A forensics technician jacket."
item_state = "det_suit"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
allowed = list(
/obj/item/device/analyzer,
@@ -275,6 +258,9 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi',
+ )
/obj/item/clothing/suit/storage/forensics/red
name = "red jacket"
@@ -292,6 +278,7 @@
desc = "An orange high-visibility vest used in work zones."
icon_state = "hazard"
item_state = "hazard"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
blood_overlay_type = "armor"
allowed = list (
/obj/item/device/analyzer,
@@ -331,6 +318,9 @@
)
flags_armor_protection = BODY_FLAG_CHEST
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi',
+ )
/obj/item/clothing/suit/storage/hazardvest/blue
name = "blue hazard vest"
@@ -351,6 +341,12 @@
item_state = "hazard_black"
//Lawyer
+/obj/item/clothing/suit/storage/lawyer
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi',
+ )
+
/obj/item/clothing/suit/storage/lawyer/bluejacket
name = "Blue Suit Jacket"
desc = "A snappy dress jacket."
@@ -369,41 +365,11 @@
blood_overlay_type = "coat"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
-//Internal Affairs
-/obj/item/clothing/suit/storage/internalaffairs
- name = "Internal Affairs Jacket"
- desc = "A smooth black jacket."
- icon_state = "ia_jacket_open"
- item_state = "ia_jacket"
- blood_overlay_type = "coat"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
- valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
- restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
-
-/obj/item/clothing/suit/storage/internalaffairs/verb/toggle()
- set name = "Toggle Coat Buttons"
- set category = "Object"
- set src in usr
-
- if(usr.is_mob_incapacitated())
- return 0
-
- switch(icon_state)
- if("ia_jacket_open")
- src.icon_state = "ia_jacket"
- to_chat(usr, "You button up the jacket.")
- if("ia_jacket")
- src.icon_state = "ia_jacket_open"
- to_chat(usr, "You unbutton the jacket.")
- else
- to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are.")
- return
- update_clothing_icon() //so our overlays update
-
//Windbreakers
/obj/item/clothing/suit/storage/windbreaker
name = "windbreaker parent object"
desc = "This shouldn't be here..."
+ icon = 'icons/obj/items/clothing/suits/windbreakers.dmi'
blood_overlay_type = "armor"
allowed = list(
/obj/item/storage/fancy/cigarettes,
@@ -435,6 +401,9 @@
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
var/zip_unzip = FALSE
actions_types = list(/datum/action/item_action/toggle)
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/windbreakers.dmi',
+ )
/obj/item/clothing/suit/storage/windbreaker/attack_self(mob/user) //Adds UI button
..()
@@ -492,7 +461,10 @@
name = "suspenders"
gender = PLURAL
desc = "They suspend pants."
- icon = 'icons/obj/items/clothing/belts.dmi'
+ icon = 'icons/obj/items/clothing/belts/misc.dmi'
icon_state = "suspenders"
blood_overlay_type = "armor"
flags_armor_protection = 0
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/belts/misc.dmi',
+ )
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index d0f6d1cc868a..e46a896fb54b 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -3,6 +3,7 @@
desc = "A suit that protects against minor chemical spills."
icon_state = "labcoat"
item_state = "labcoat" //Is this even used for anything?
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
blood_overlay_type = "coat"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
allowed = list(
@@ -46,6 +47,10 @@
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
var/buttoned = TRUE
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
+
/obj/item/clothing/suit/storage/labcoat/verb/toggle()
set name = "Toggle Labcoat Buttons"
@@ -93,12 +98,6 @@
icon_state = "green_labcoat"
item_state = "green_labcoat"
-/obj/item/clothing/suit/storage/labcoat/cmo
- name = "chief medical officer's labcoat"
- desc = "Bluer than the standard model."
- icon_state = "labcoat_cmo"
- item_state = "labcoat_cmo"
-
/obj/item/clothing/suit/storage/labcoat/mad
name = "The Mad's labcoat"
desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
@@ -151,7 +150,7 @@
/obj/item/clothing/suit/storage/snow_suit
name = "snow suit"
desc = "A standard snow suit. It can protect the wearer from extreme cold."
- icon = 'icons/obj/items/clothing/suits.dmi'
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
icon_state = "snowsuit"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
@@ -271,6 +270,7 @@
desc = "A winter coat made in some desolate snowplanet. This wintercoat was made from the fur of local wildlife which donated their fur for the greater good of UPP!"
icon_state = "sovietcoat"
item_state = "sovietcoat"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi'
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
armor_melee = CLOTHING_ARMOR_MEDIUM
@@ -298,11 +298,19 @@
/obj/item/device/motiondetector,
/obj/item/device/walkman,
)
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi'
+ )
+
/obj/item/clothing/suit/storage/snow_suit/liaison
name = "liaison's winter coat"
desc = "A Weyland-Yutani winter coat. Only the best comfort for the liaison in a cold environment."
icon_state = "snowsuit_liaison"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi'
+ )
/obj/item/clothing/suit/storage/snow_suit/liaison/modified
name = "modified liaison's winter coat"
diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
index 138de402fbe4..1e00452ccd51 100644
--- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm
+++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
@@ -33,11 +33,11 @@
/obj/item/clothing/suit/storage/marine
name = "\improper M3 pattern marine armor"
desc = "A standard Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
- icon = 'icons/obj/items/clothing/cm_suits.dmi'
icon_state = "1"
item_state = "marine_armor" //Make unique states for Officer & Intel armors.
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi'
)
flags_atom = FPRINT|CONDUCT
flags_inventory = BLOCKSHARPOBJ
@@ -102,7 +102,7 @@
equip_sounds = list('sound/handling/putting_on_armor1.ogg')
var/armor_variation = 0
/// The dmi where the grayscale squad overlays are contained
- var/squad_overlay_icon = 'icons/mob/humans/onmob/suit_1.dmi'
+ var/squad_overlay_icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
var/atom/movable/marine_light/light_holder
@@ -141,14 +141,34 @@
armor_overlays["lamp"] = null
if(flags_marine_armor & ARMOR_LAMP_OVERLAY)
if(flags_marine_armor & ARMOR_LAMP_ON)
- I = image('icons/obj/items/clothing/cm_suits.dmi', src, "lamp-on")
+ I = image('icons/obj/items/clothing/suits/misc_ert.dmi', src, "lamp-on")
else
- I = image('icons/obj/items/clothing/cm_suits.dmi', src, "lamp-off")
+ I = image('icons/obj/items/clothing/suits/misc_ert.dmi', src, "lamp-off")
armor_overlays["lamp"] = I
overlays += I
else armor_overlays["lamp"] = null
if(user) user.update_inv_wear_suit()
+/obj/item/clothing/suit/storage/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ if(flags_atom & MAP_COLOR_INDEX)
+ return
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/classic.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/desert.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/snow.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/urban.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi'
/obj/item/clothing/suit/storage/marine/post_vendor_spawn_hook(mob/living/carbon/human/user) //used for randomizing/selecting a variant for armors.
if(!armor_variation)
@@ -308,8 +328,13 @@
name = "\improper M3 pattern general officer armor"
desc = "A well-crafted suit of M3 Pattern Armor with a gold shine. It looks very expensive, but shockingly fairly easy to carry and wear."
icon_state = "general"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_bio = CLOTHING_ARMOR_MEDIUM
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
uniform_restricted = list(/obj/item/clothing/under/marine/officer/general)
specialty = "M3 pattern general"
item_state_slots = list(WEAR_JACKET = "general")
@@ -332,9 +357,13 @@
desc = "A robust, well-polished suit of armor for the Commanding Officer. Custom-made to fit its owner with special straps to operate a smartgun. Show those Marines who's really in charge."
icon_state = "co_officer"
item_state = "co_officer"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
armor_bullet = CLOTHING_ARMOR_HIGH
storage_slots = 3
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS
uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/qm_suit)
specialty = "M3 pattern captain"
@@ -460,6 +489,10 @@
name = "\improper M3-VL pattern ballistics vest"
desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel."
icon_state = "VL"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
flags_marine_armor = ARMOR_LAMP_OVERLAY //No squad colors when wearing this since it'd look funny.
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
@@ -479,6 +512,10 @@
name = "\improper M3-VL pattern flak vest"
desc = "A combination of the standard non-combat M3-VL ballistics vest and M70 flak jacket, this piece of armor has been distributed to dropship crew to keep them safe from threats external and internal..."
icon_state = "VL_FLAK"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
storage_slots = 2
/obj/item/clothing/suit/storage/marine/light/synvest
@@ -503,22 +540,50 @@
/obj/item/clothing/suit/storage/marine/light/synvest/grey
icon_state = "VL_syn"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/suit/storage/marine/light/synvest/jungle
icon_state = "VL_syn_camo"
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/suit/storage/marine/light/synvest/snow
- icon_state = "s_VL_syn_camo"
- flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ icon_state = "VL_syn_camo"
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/snow.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
+ )
+ flags_atom = NO_SNOW_TYPE
/obj/item/clothing/suit/storage/marine/light/synvest/desert
- icon_state = "d_VL_syn_camo"
+ icon_state = "VL_syn_camo"
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/desert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/suit/storage/marine/light/synvest/dgrey
- icon_state = "c_VL_syn_camo"
+ icon_state = "VL_syn_camo"
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/classic.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/suit/storage/marine/light/recon
@@ -672,5 +737,9 @@
name = "press body armor"
desc = "Body armor used by war correspondents in battles and wars across the universe."
icon_state = "cc_armor"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm
index 2070a7d33da2..9b4eb6c18401 100644
--- a/code/modules/clothing/suits/marine_armor/ert.dm
+++ b/code/modules/clothing/suits/marine_armor/ert.dm
@@ -5,6 +5,10 @@
name = "\improper SOF Armor"
desc = "A heavily customized suit of M3 armor. Used by Marine Raiders."
icon_state = "marsoc"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGH
armor_bomb = CLOTHING_ARMOR_VERYHIGH
@@ -28,6 +32,10 @@
name = "\improper M4 pattern PMC armor"
desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind."
icon_state = "pmc_armor"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi'
+ )
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
@@ -74,11 +82,8 @@
/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate
name = "\improper M1 pattern corporate security armor"
desc = "A basic vest with a Weyland-Yutani badge on the right breast. This is commonly worn by low-level guards protecting Weyland-Yutani facilities."
- icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi'
icon_state = "armor"
item_state = "armor"
- item_state_slots = null
- contained_sprite = TRUE
slowdown = SLOWDOWN_ARMOR_LIGHT
flags_armor_protection = BODY_FLAG_CHEST
@@ -133,6 +138,10 @@
name = "\improper PMC gunner armor"
desc = "A modification of the standard Armat Systems M3 armor. Hooked up with harnesses and straps allowing the user to carry an M56 Smartgun."
icon_state = "heavy_armor"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
@@ -186,6 +195,10 @@
name = "\improper H1 Iron Bears vest"
desc = "A protective vest worn by Iron Bears mercenaries."
icon_state = "bear_armor"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
@@ -198,6 +211,10 @@
name = "\improper D2 armored vest"
desc = "A protective vest worn by some seriously experienced mercs."
icon_state = "dutch_armor"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS //Makes no sense but they need leg/arm armor too.
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
@@ -214,6 +231,10 @@
desc = "A tailored hunting jacket, cunningly lined with segmented armor plates. Sometimes the game shoots back."
icon_state = "van_bandolier"
item_state = "van_bandolier_jacket"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi',
+ )
blood_overlay_type = "coat"
flags_marine_armor = NO_FLAGS //No shoulder light.
actions_types = list()
@@ -267,6 +288,10 @@
name = "\improper UM5 personal armor"
desc = "Standard body armor of the UPP military, the UM5 (Union Medium MK5) is a medium body armor, roughly on par with the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. Unlike the M3, however, the plate has a heavier neckplate. This has earned many UA members to refer to UPP soldiers as 'tin men'."
icon_state = "upp_armor"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi'
+ )
armor_bullet = CLOTHING_ARMOR_HIGH
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_MEDIUMLOW
@@ -405,6 +430,10 @@
name = "freelancer cuirass"
desc = "An armored protective chestplate scrapped together from various plates. It keeps up remarkably well, as the craftsmanship is solid, and the design mirrors such armors in the UPP and the USCM. The many skilled craftsmen in the freelancers ranks produce these vests at a rate about one a month."
icon_state = "freelancer_armor"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
slowdown = SLOWDOWN_ARMOR_LIGHT
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
@@ -417,10 +446,10 @@
/obj/item/clothing/suit/storage/militia
name = "colonial militia hauberk"
desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops."
- icon = 'icons/obj/items/clothing/cm_suits.dmi'
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/CLF.dmi'
icon_state = "rebel_armor"
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/CLF.dmi'
)
sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi')
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
@@ -501,6 +530,10 @@
desc = "A thick and stylish black leather jacket with a Marshal's Deputy badge pinned to it. The back is enscribed with the powerful letters of 'DEPUTY' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
icon_state = "CMB_jacket"
item_state = "CMB_jacket"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/CMB.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/CMB.dmi'
+ )
blood_overlay_type = "coat"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
@@ -560,6 +593,10 @@
name = "\improper K12 ceramic plated armor"
desc = "A set of grey, heavy ceramic armor with dark blue highlights. It is the standard uniform of an unknown mercenary group working in the sector."
icon_state = "mercenary_heavy_armor"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/CLF.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/CLF.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN
armor_melee = CLOTHING_ARMOR_VERYHIGH
armor_bullet = CLOTHING_ARMOR_VERYHIGH
@@ -633,8 +670,11 @@
/obj/item/clothing/suit/storage/marine/M3G/hefa
name = "\improper HEFA Knight armor"
desc = "A thick piece of armor adorning a HEFA. Usually seen on a HEFA knight."
- specialty = "HEFA Knight"
icon_state = "hefadier"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
flags_item = NO_CRYO_STORE
flags_marine_armor = ARMOR_LAMP_OVERLAY
@@ -651,6 +691,10 @@
desc = "A standard Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
icon_state = "pvmedium"
item_state_slots = list(WEAR_JACKET = "pvmedium")
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
slowdown = SLOWDOWN_ARMOR_LIGHT
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
@@ -697,6 +741,10 @@
desc = "A modified luxury armor, originally meant for a USCM Provost Marshall, modified to use the colors and insignia of the TIS. The Three Eyes is technically able to requisition any equipment or personnel to fulfill its mission and often uses this privilege to outfit their agents with high-quality gear from other UA military forces."
icon_state = "tis"
item_state_slots = list(WEAR_JACKET = "tis")
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_laser = CLOTHING_ARMOR_LOW
@@ -734,6 +782,10 @@
name = "\improper UA-M1 body armor"
desc = "Based on the M-3 pattern employed by the USCM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. While robust against melee and bullet attacks, it critically lacks coverage of the legs and arms."
icon_state = "ua_riot"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
@@ -771,6 +823,10 @@
desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines."
icon_state = "rmc_light"
item_state = "rmc_light"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/TWE.dmi'
+ )
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
allowed = list(
/obj/item/weapon/gun,
@@ -834,6 +890,10 @@
desc = "While lacking the appearance of the M3 pattern armor worn in regular service, this armor piece is still a derivative of it. It has been heavily modified to fit over the MOPP suit with additional padding and Venlar composite layers removed, so as not to restrict the wearer’s movement. However, with the reduction of composite layers, the personal protection offered is less than desired with complaints having been lodged since 2165."
icon_state = "cbrn"
item_state = "cbrn"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
slowdown = SLOWDOWN_ARMOR_HEAVY
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm
index c55e1d054b79..3daa8be80645 100644
--- a/code/modules/clothing/suits/marine_armor/ghillie.dm
+++ b/code/modules/clothing/suits/marine_armor/ghillie.dm
@@ -161,4 +161,8 @@
name = "UDEP Thermal Poncho"
desc = "UDEP or the Ultra Diffusive Environmental Poncho is a camouflaged rain-cover worn to protect against the elements and chemical spills. It's commonly treated with an infrared absorbing coating, making a marine almost invisible in the rain. Favoured by USCM specialists for it's comfort and practicality."
icon_state = "mercenary_miner_armor"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/CLF.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/CLF.dmi'
+ )
flags_atom = MOB_LOCK_ON_EQUIP|NO_SNOW_TYPE|NO_NAME_OVERRIDE
diff --git a/code/modules/clothing/suits/marine_armor/spec_fire.dm b/code/modules/clothing/suits/marine_armor/spec_fire.dm
index c3f2863b3545..22df8e0b4731 100644
--- a/code/modules/clothing/suits/marine_armor/spec_fire.dm
+++ b/code/modules/clothing/suits/marine_armor/spec_fire.dm
@@ -129,7 +129,7 @@
name = "Activate Fire Shield"
button.name = name
button.overlays.Cut()
- var/image/IMG = image('icons/obj/items/clothing/cm_suits.dmi', button, "pyro_armor")
+ var/image/IMG = image('icons/obj/items/clothing/suits/suits_by_map/jungle.dmi', button, "pyro_armor")
button.overlays += IMG
/datum/action/item_action/specialist/fire_shield/action_cooldown_check()
diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm
index fc2a76698029..b231c61153e6 100644
--- a/code/modules/clothing/suits/marine_coat.dm
+++ b/code/modules/clothing/suits/marine_coat.dm
@@ -2,9 +2,9 @@
name = "marine jacket"
//This really should not be spawned
desc = "What the hell is this doing here?"
- icon = 'icons/obj/items/clothing/cm_suits.dmi'
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi'
)
sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi')
blood_overlay_type = "coat"
@@ -48,6 +48,25 @@
var/buttoned = TRUE
var/initial_icon_state
+/obj/item/clothing/suit/storage/jacket/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/jungle.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/classic.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/desert.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/snow.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi'
+ if("urban")
+ icon = 'icons/obj/items/clothing/suits/suits_by_map/urban.dmi'
+ item_icons[WEAR_JACKET] = 'icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi'
+
/obj/item/clothing/suit/storage/jacket/marine/proc/toggle()
set name = "Toggle Buttons"
set category = "Object"
@@ -85,6 +104,10 @@
name = "\improper M70B1 light flak jacket"
desc = "A light flak jacket used by dropship pilots to protect themselves while flying in the cockpit. This specific flak jacket has been designed for style and comfort over protection, and it shows. Don't get hit by any stray bullets!"
icon_state = "pilot_alt"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
has_buttons = TRUE
flags_atom = NO_SNOW_TYPE
initial_icon_state = "pilot_alt"
@@ -93,9 +116,9 @@
name = "quartermaster jacket"
desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it."
icon_state = "RO_jacket"
- icon = 'icons/obj/items/clothing/suits.dmi'
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_0.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
)
flags_atom = NO_SNOW_TYPE
@@ -104,6 +127,10 @@
desc = "A marine service jacket adopted for use by Military Police personnel on board USCM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty MPs. This variant is also available to regular Marines, if they are willing to bear the shame."
has_buttons = TRUE
icon_state = "coat_mp"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
flags_atom = NO_SNOW_TYPE
initial_icon_state = "coat_mp"
@@ -112,6 +139,10 @@
desc = "A marine service jacket adopted for use by Military Wardens on board USCM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty Wardens. The jacket of choice for looking all night at a set of monitors, while cigarette butts pile around you."
has_buttons = TRUE
icon_state = "coat_warden"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
flags_atom = NO_SNOW_TYPE
initial_icon_state = "coat_warden"
@@ -120,6 +151,10 @@
desc = "A marine service jacket adopted for use by Military Police personnel on board USCM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty MPs. Very popular among those who want to inexplicably smell like donuts."
has_buttons = TRUE
icon_state = "coat_cmp"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
flags_atom = NO_SNOW_TYPE
initial_icon_state = "coat_cmp"
@@ -129,12 +164,20 @@
has_buttons = TRUE
flags_atom = NO_SNOW_TYPE
icon_state = "jacket_tanker"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
+ )
initial_icon_state = "jacket_tanker"
/obj/item/clothing/suit/storage/jacket/marine/chef
name = "mess technician jacket"
desc = "Smells like vanilla. Signifies prestige and power, if a little flashy."
icon_state = "chef_jacket"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
+ )
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
@@ -149,6 +192,10 @@
name = "marine formal service jacket"
desc = "Smells like vanilla. Signifies prestige and power, if a little flashy."
icon_state = "coat_formal"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
initial_icon_state = "coat_formal"
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
@@ -199,10 +246,10 @@
/obj/item/clothing/suit/storage/jacket/marine/dress/general
name = "general's jacket"
desc = "A black trench coat with gold metallic trim. Flashy, highly protective, and over-the-top. Fit for a king - or, in this case, a General. Has quite a few pockets."
- icon = 'icons/obj/items/clothing/suits.dmi'
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
icon_state = "general_jacket"
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_0.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
)
item_state = "general_jacket"
has_buttons = FALSE
@@ -250,6 +297,10 @@
name = "\improper Provost Jacket"
desc = "A crisp jacket with the Provost sigil."
icon_state = "provost_jacket"
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR)
@@ -274,12 +325,13 @@
/obj/item/clothing/suit/storage/jacket/marine/dress/blues
name = "marine enlisted dress blues jacket"
desc = "The jacket of the legendary Marine dress blues, virtually unchanged since the 19th century. You're wearing history, Marine. Don't let your ancestors down."
- icon = 'icons/mob/humans/onmob/contained/marinedressblues.dmi'
+ icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
+ )
icon_state = "e_jacket"
item_state = "e_jacket"
has_buttons = FALSE
- item_state_slots = null
- contained_sprite = TRUE
/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco
name = "marine NCO dress blues jacket"
@@ -300,6 +352,10 @@
desc = "A jacket for the most fashionable war correspondents."
icon_state = "cc_brown"
item_state = "cc_brown"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
+ )
flags_atom = NO_SNOW_TYPE
has_buttons = FALSE
@@ -315,6 +371,10 @@
/obj/item/clothing/suit/storage/jacket/marine/reporter/blue
icon_state = "cc_blue"
item_state = "cc_blue"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi'
+ )
//==================Corporate Liaison==================\\
@@ -324,6 +384,10 @@
desc = "A casual brown vest."
icon_state = "vest_brown"
item_state = "vest_brown"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi'
+ )
flags_atom = NO_SNOW_TYPE
has_buttons = FALSE
@@ -346,6 +410,10 @@
desc = "A khaki suit jacket."
icon_state = "corporate_ivy"
item_state = "corporate_ivy"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
+ )
flags_atom = NO_SNOW_TYPE
has_buttons = FALSE
@@ -382,6 +450,10 @@
desc = "A khaki bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_khaki"
item_state = "jacket_khaki"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
+ )
flags_atom = NO_SNOW_TYPE
has_buttons = FALSE
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 252b99e124bc..3ccd20ad046e 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -73,35 +73,15 @@
armor_rad = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_LOW
-
-/obj/item/clothing/suit/cyborg_suit
- name = "cyborg suit"
- desc = "Suit for a cyborg costume."
- icon_state = "death"
- item_state = "death"
- flags_atom = FPRINT|CONDUCT
- fire_resist = T0C+5200
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-/obj/item/clothing/suit/johnny_coat
- name = "johnny~~ coat"
- desc = "Johnny~~"
- icon_state = "johnny"
- item_state = "johnny"
-
-/obj/item/clothing/suit/justice
- name = "justice suit"
- desc = "This pretty much looks ridiculous."
- icon_state = "justice"
- item_state = "justice"
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_LEGS|BODY_FLAG_FEET
-
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
icon_state = "judge"
item_state = "judge"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi'
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
allowed = list(
/obj/item/storage/fancy/cigarettes,
@@ -121,6 +101,10 @@
desc = "For some classy, murderous fun."
icon_state = "vest"
item_state = "wcoat"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi'
+ )
blood_overlay_type = "armor"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
allowed = list(
@@ -181,9 +165,13 @@
/obj/item/clothing/suit/syndicatefake
name = "red space suit replica"
+ desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
icon_state = "syndicate"
item_state = "space_suit_syndicate"
- desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
w_class = SIZE_MEDIUM
allowed = list(
/obj/item/toy,
@@ -198,15 +186,6 @@
flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_LEGS|BODY_FLAG_FEET
-/obj/item/clothing/suit/hastur
- name = "Hastur's Robes"
- desc = "Robes not meant to be worn by man"
- icon_state = "hastur"
- item_state = "hastur"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-
/obj/item/clothing/suit/imperium_monk
name = "Imperium monk"
desc = "Have YOU killed a xenos today?"
@@ -226,21 +205,15 @@
siemens_coefficient = 2
-/obj/item/clothing/suit/monkeysuit
- name = "Monkey Suit"
- desc = "A suit that looks like a primate"
- icon_state = "monkeysuit"
- item_state = "monkeysuit"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_HANDS
- flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- siemens_coefficient = 2
-
-
/obj/item/clothing/suit/holidaypriest
name = "Holiday Priest"
desc = "This is a nice holiday my son."
icon_state = "holidaypriest"
item_state = "holidaypriest"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
flags_inv_hide = HIDEJUMPSUIT
allowed = list(
@@ -276,13 +249,6 @@
H.drop_r_hand()
..()
-/obj/item/clothing/suit/ianshirt
- name = "worn shirt"
- desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
- icon_state = "ianshirt"
- item_state = "ianshirt"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
-
/obj/item/clothing/suit/storage/webbing
name = "external webbing"
desc = "Designed to be worn over a jumpsuit rather than clipped on."
@@ -316,6 +282,10 @@
desc = "A utility vest to hold tools in."
icon_state = "synth_utility_vest"
item_state = "synth_utility_vest"
+ icon = 'icons/obj/items/clothing/suits/vests_aprons.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi'
+ )
allowed = list(
/obj/item/weapon/baton,
/obj/item/restraint/handcuffs,
@@ -377,16 +347,6 @@
item_state = "red_pyjamas"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
-//stripper
-/obj/item/clothing/under/stripper
- flags_armor_protection = 0
-
-/obj/item/clothing/under/stripper/mankini
- name = "the mankini"
- desc = "No honest man would wear this abomination"
- icon_state = "mankini"
- siemens_coefficient = 1
-
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
@@ -399,6 +359,10 @@
/obj/item/clothing/under/swimsuit
siemens_coefficient = 1
flags_armor_protection = 0
+ icon = 'icons/obj/items/clothing/uniforms/underwear_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi',
+ )
/obj/item/clothing/under/swimsuit/black
name = "black swimsuit"
@@ -449,6 +413,10 @@
name = "brown bomber jacket"
desc = "A well-worn leather bomber jacket."
icon_state = "bomber"
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS
allowed = list (
@@ -488,8 +456,9 @@
/obj/item/clothing/suit/storage/manager
name = "manager's jacket"
desc = "A suit that belongs to someone important. It is made of insulating material and offers minor protection from all forms of damage."
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
)
item_state = "manager_suit"
icon_state = "manager_suit"
@@ -520,8 +489,9 @@
/obj/item/clothing/suit/storage/director
name = "director's jacket"
desc = "A jacket that belongs to someone very important. It is made of insulating material and offers minor protection from all forms of damage."
+ icon = 'icons/obj/items/clothing/suits/jackets.dmi'
item_icons = list(
- WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi'
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/jackets.dmi'
)
item_state = "director_suit"
icon_state = "director_suit"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 3b415cf0f9e8..6d0c1739fe28 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -14,6 +14,10 @@
desc = "A suit that protects against fire and heat."
icon_state = "fire"
item_state = "fire_suit"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
w_class = SIZE_LARGE//bulky item
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
@@ -64,6 +68,10 @@
name = "bomb hood"
desc = "Use in case of bomb."
icon_state = "bombsuit"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi'
+ )
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
@@ -83,6 +91,10 @@
desc = "A suit designed for safety when handling explosives."
icon_state = "bombsuit"
item_state = "bombsuit"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
w_class = SIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
@@ -128,8 +140,12 @@
*/
/obj/item/clothing/head/radiation
name = "Radiation Hood"
- icon_state = "rad"
desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
+ icon_state = "rad"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi'
+ )
flags_inventory = COVEREYES|COVERMOUTH
flags_inv_hide = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR
flags_armor_protection = BODY_FLAG_HEAD|BODY_FLAG_FACE|BODY_FLAG_EYES
@@ -148,6 +164,10 @@
desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
icon_state = "rad"
item_state = "rad_suit"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
w_class = SIZE_LARGE//bulky item
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 3a54ad8bbca1..92a73add9664 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -1,6 +1,10 @@
/obj/item/clothing/under/color
flags_jumpsuit = FALSE
+ icon = 'icons/obj/items/clothing/uniforms/jumpsuits.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi',
+ )
/obj/item/clothing/under/color/black
name = "black jumpsuit"
@@ -47,25 +51,25 @@
item_state = "y_suit"
worn_state = "yellow"
-/obj/item/clothing/under/lightbrown
+/obj/item/clothing/under/color/lightbrown
name = "lightbrown jumpsuit"
desc = "lightbrown"
icon_state = "lightbrown"
worn_state = "lightbrown"
-/obj/item/clothing/under/brown
+/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
desc = "brown"
icon_state = "brown"
worn_state = "brown"
-/obj/item/clothing/under/lightred
+/obj/item/clothing/under/color/lightred
name = "lightred jumpsuit"
desc = "lightred"
icon_state = "lightred"
worn_state = "lightred"
-/obj/item/clothing/under/darkred
+/obj/item/clothing/under/color/darkred
name = "darkred jumpsuit"
desc = "darkred"
icon_state = "darkred"
diff --git a/code/modules/clothing/under/gimmick.dm b/code/modules/clothing/under/gimmick.dm
index 793bc0593735..d3d729c6b853 100644
--- a/code/modules/clothing/under/gimmick.dm
+++ b/code/modules/clothing/under/gimmick.dm
@@ -10,9 +10,33 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
has_sensor = UNIFORM_NO_SENSORS
displays_id = 0
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/obj/items/clothing/halloween_clothes.dmi',
+ )
+
+/obj/item/clothing/suit/gimmick
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/obj/items/clothing/halloween_clothes.dmi',
+ )
+
+/obj/item/clothing/shoes/gimmick
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
+ item_icons = list(
+ WEAR_FEET = 'icons/obj/items/clothing/halloween_clothes.dmi',
+ )
+
+/obj/item/clothing/mask/gimmick
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/obj/items/clothing/halloween_clothes.dmi',
+ )
+/obj/item/clothing/gloves/gimmick
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
item_icons = list(
- WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
+ WEAR_HANDS = 'icons/obj/items/clothing/halloween_clothes.dmi',
)
//JASON
@@ -136,6 +160,10 @@
desc = "The impersonal face of the law. Constructed from titanium and laminated with kevlar."
icon_state = "robocop_helmet"
item_state = "robocop_helmet"
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/obj/items/clothing/halloween_clothes.dmi',
+ )
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_VERYHIGH
armor_laser = CLOTHING_ARMOR_HIGH
@@ -148,6 +176,12 @@
flags_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR
anti_hug = 100
+/obj/item/clothing/suit/armor/gimmick
+ icon = 'icons/obj/items/clothing/halloween_clothes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/obj/items/clothing/halloween_clothes.dmi',
+ )
+
/obj/item/clothing/suit/armor/gimmick/robocop
name = "polished metal armor"
desc = "Clean and well maintained, unlike the ugly streets of Detroit. Constructed from titanium and laminated with kevlar."
@@ -185,17 +219,3 @@
name = "black glove"
desc = "Something to cover up that artificial hand... Who says heroes can't be self-conscious?"
icon_state = "skywalker_gloves"
-
-
-
-/obj/item/clothing/under/gimmick/rank/captain/suit
- name = "captain's suit"
- desc = "A green suit and yellow necktie. Exemplifies authority."
- icon_state = "green_suit"
- item_state = "dg_suit"
-
-/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
- name = "head of personnel's suit"
- desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
- icon_state = "teal_suit"
- item_state = "g_suit"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 4b1fd077415c..3c42d7b2487a 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -7,6 +7,10 @@
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
icon_state = "ba_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/rank/cargo
@@ -14,6 +18,10 @@
desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
icon_state = "qm"
item_state = "lb_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/rank/cargotech
@@ -21,6 +29,10 @@
desc = "Shooooorts! They're comfy and easy to wear!"
icon_state = "cargotech"
item_state = "lb_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi',
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
/obj/item/clothing/under/rank/chaplain
@@ -28,6 +40,10 @@
name = "chaplain's jumpsuit"
icon_state = "chaplain"
item_state = "chaplain"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/rank/chaplain/cultist
@@ -38,23 +54,39 @@
desc = "A long dress with a purple scarf, often worn by religious folk."
icon_state = "priest_robe"
item_state = "priest_robe"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
/obj/item/clothing/under/rank/worker_overalls
name = "worker overalls"
desc = "An outfit fit for the hard-working man."
icon_state = "worker_overalls"
item_state = "bl_suit"
+ icon = 'icons/obj/items/clothing/uniforms/workwear.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/workwear.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/rank/chef
desc = "It's an apron which is given only to the most hardcore chefs in space."
name = "chef's uniform"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
icon_state = "chef"
/obj/item/clothing/under/rank/clown
name = "clown suit"
desc = "'HONK!'"
icon_state = "clown"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
flags_jumpsuit = FALSE
black_market_value = 25
@@ -63,18 +95,20 @@
name = "botanist's jumpsuit"
icon_state = "hydroponics"
item_state = "g_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
permeability_coefficient = 0.50
-/obj/item/clothing/under/rank/internalaffairs
- desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched."
- name = "Internal Affairs uniform"
- icon_state = "internalaffairs"
- flags_jumpsuit = FALSE
-
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
name = "janitor's jumpsuit"
icon_state = "janitor"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
@@ -87,6 +121,10 @@
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "Lawyer suit"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/lawyer/black
@@ -123,10 +161,9 @@
name = "sensible suit"
desc = "It's very... sensible."
icon_state = "red_suit"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
flags_jumpsuit = FALSE
-/obj/item/clothing/under/mime
- name = "mime's outfit"
- desc = "It's not very colorful."
- icon_state = "mime"
- flags_jumpsuit = FALSE
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index fe8a29b33a0e..68bb0875568a 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -1,23 +1,14 @@
//Contains: Engineering department jumpsuits
-/obj/item/clothing/under/rank/chief_engineer
- desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
- name = "chief engineer's jumpsuit"
- icon_state = "chiefengineer"
- item_state = "g_suit"
- armor_melee = CLOTHING_ARMOR_NONE
- armor_bullet = CLOTHING_ARMOR_NONE
- armor_laser = CLOTHING_ARMOR_NONE
- armor_energy = CLOTHING_ARMOR_NONE
- armor_bomb = CLOTHING_ARMOR_NONE
- armor_bio = CLOTHING_ARMOR_NONE
- armor_rad = CLOTHING_ARMOR_MEDIUM
- armor_internaldamage = CLOTHING_ARMOR_LOW
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
name = "atmospheric technician's jumpsuit"
icon_state = "atmos"
item_state = "atmos_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+ )
flags_jumpsuit = null
/obj/item/clothing/under/rank/engineer
@@ -25,6 +16,10 @@
name = "engineer's jumpsuit"
icon_state = "engine"
item_state = "engi_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+ )
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
@@ -39,4 +34,8 @@
desc = "It's a slimming black with reinforced seams; great for industrial work."
name = "roboticist's jumpsuit"
icon_state = "robotics"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi',
+ )
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 74507c2e5593..ac1232a8f403 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -7,6 +7,10 @@
name = "research director's uniform"
icon_state = "rdalt_s"
worn_state = "rdalt_s"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -22,6 +26,10 @@
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer is a Research Director."
name = "research director's jumpsuit"
icon_state = "rdalt"
+ icon = 'icons/obj/items/clothing/uniforms/synthetic_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/synthetic_uniforms.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -38,6 +46,10 @@
name = "scientist's jumpsuit"
icon_state = "science"
item_state = "w_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -53,6 +65,10 @@
name = "chemist's jumpsuit"
icon_state = "chemistry"
item_state = "w_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -71,6 +87,10 @@
name = "chief medical officer's jumpsuit"
icon_state = "cmo"
item_state = "w_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -86,6 +106,10 @@
name = "geneticist's jumpsuit"
icon_state = "genetics"
item_state = "w_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -101,6 +125,10 @@
name = "virologist's jumpsuit"
icon_state = "virology"
item_state = "w_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -116,6 +144,10 @@
desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
name = "nurse's suit"
icon_state = "nursesuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -132,6 +164,10 @@
desc = "A dress commonly worn by the nursing staff in the medical department."
name = "nurse's dress"
icon_state = "nurse"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -144,27 +180,15 @@
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_jumpsuit = FALSE
-/obj/item/clothing/under/rank/orderly
- desc = "A white suit to be worn by orderly people who love orderly things."
- name = "orderly's uniform"
- icon_state = "orderly"
- permeability_coefficient = 0.50
- armor_melee = CLOTHING_ARMOR_NONE
- armor_bullet = CLOTHING_ARMOR_NONE
- armor_laser = CLOTHING_ARMOR_NONE
- armor_energy = CLOTHING_ARMOR_NONE
- armor_bomb = CLOTHING_ARMOR_NONE
- armor_bio = CLOTHING_ARMOR_LOW
- armor_rad = CLOTHING_ARMOR_LOW
- armor_internaldamage = CLOTHING_ARMOR_LOW
- flags_jumpsuit = FALSE
- item_state_slots = list(WEAR_BODY = "orderly")
-
/obj/item/clothing/under/rank/medical
desc = "They're made of a special fiber that provides minor protection against biohazards. They have a cross on the chest denoting that the wearer is trained medical personnel."
name = "medical doctor's uniform"
icon_state = "medical"
item_state = "w_suit"
+ icon = 'icons/obj/items/clothing/uniforms/jumpsuits.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi',
+ )
permeability_coefficient = 0.50
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
@@ -180,6 +204,10 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in light blue."
icon_state = "scrubslightblue"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubslightblue")
@@ -187,6 +215,10 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in formal blue."
icon_state = "scrubsblue"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsblue")
@@ -194,6 +226,10 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in jade green."
icon_state = "scrubsgreen"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsgreen")
@@ -201,6 +237,10 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in berry red."
icon_state = "scrubspurple"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubspurple")
@@ -208,6 +248,10 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in olive green."
icon_state = "scrubsolive"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsolive")
@@ -215,6 +259,10 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in mundane grey."
icon_state = "scrubsgrey"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsgrey")
@@ -222,20 +270,9 @@
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in prisoner orange."
icon_state = "scrubsorange"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi',
+ )
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsorange")
-
-/obj/item/clothing/under/rank/psych
- desc = "A basic white jumpsuit. It has turquoise markings that denote the wearer as a psychiatrist."
- name = "psychiatrist's jumpsuit"
- icon_state = "psych"
- item_state = "w_suit"
- flags_jumpsuit = FALSE
-
-
-/obj/item/clothing/under/rank/psych/turtleneck
- desc = "A turquoise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
- name = "psychologist's turtleneck"
- icon_state = "psychturtle"
- item_state = "b_suit"
- flags_jumpsuit = FALSE
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 5cf634fed585..7c7246ba8de5 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -13,6 +13,10 @@
name = "warden's jumpsuit"
icon_state = "warden"
item_state = "r_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
@@ -28,6 +32,10 @@
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
icon_state = "security"
item_state = "r_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
@@ -43,6 +51,10 @@
name = "dispatcher's uniform"
desc = "A dress shirt and khakis with a security patch sewn on."
icon_state = "dispatch"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
@@ -60,6 +72,10 @@
desc = "It's made of a slightly sturdier material, to allow for robust protection."
icon_state = "redshirt2"
item_state = "r_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
@@ -79,20 +95,6 @@
icon_state = "warden_corporate"
flags_jumpsuit = FALSE
-/obj/item/clothing/under/tactical
- name = "tactical jumpsuit"
- desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
- icon_state = "swatunder"
- armor_melee = CLOTHING_ARMOR_LOW
- armor_bullet = CLOTHING_ARMOR_LOW
- armor_laser = CLOTHING_ARMOR_NONE
- armor_energy = CLOTHING_ARMOR_NONE
- armor_bomb = CLOTHING_ARMOR_NONE
- armor_bio = CLOTHING_ARMOR_NONE
- armor_rad = CLOTHING_ARMOR_NONE
- armor_internaldamage = CLOTHING_ARMOR_LOW
- siemens_coefficient = 0.9
-
/*
* Detective
*/
@@ -101,6 +103,10 @@
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
@@ -114,29 +120,6 @@
/obj/item/clothing/under/det/black
icon_state = "detective2"
-/obj/item/clothing/under/det/slob
- icon_state = "polsuit"
- flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
-
-
-/*
- * Navy uniforms
- */
-
-/obj/item/clothing/under/rank/security/navyblue
- name = "security officer's uniform"
- desc = "The latest in fashionable security outfits."
- icon_state = "officerblueclothes"
- item_state = "officerblueclothes"
- flags_jumpsuit = FALSE
-
-/obj/item/clothing/under/rank/head_of_security/navyblue
- desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
- name = "head of security's uniform"
- icon_state = "hosblueclothes"
- item_state = "hosblueclothes"
- flags_jumpsuit = FALSE
-
/obj/item/clothing/under/rank/warden/navyblue
desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
name = "warden's uniform"
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index d12638c4c529..23c862fca718 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -5,8 +5,8 @@
/obj/item/clothing/under/marine
name = "\improper USCM uniform"
desc = "Standard-issue Marine uniform. They have shards of light Kevlar to help protect against stabbing weapons and bullets."
- siemens_coefficient = 0.9
icon_state = "marine_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi'
worn_state = "marine_jumpsuit"
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
@@ -18,11 +18,13 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
drop_sound = "armorequip"
+ siemens_coefficient = 0.9
///Makes it so that we can see the right name in the vendor.
var/specialty = "USCM"
- ///List of map variants that use sleeve rolling on something else, like snow uniforms rolling the collar, and therefore shouldn't hide patches etc when rolled.
- var/list/map_variants_roll_accessories = list("s_")
layer = UPPER_ITEM_LAYER
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi',
+ )
//speciality does NOTHING if you have NO_NAME_OVERRIDE
@@ -37,18 +39,29 @@
select_gamemode_skin(type, override_icon_state, new_protection)
. = ..() //Done after above in case gamemode skin is missing sprites.
+/obj/item/clothing/under/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+ . = ..()
+ switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+ if("jungle")
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi'
+ item_icons[WEAR_BODY] = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi'
+ if("classic")
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi'
+ item_icons[WEAR_BODY] = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi'
+ if("desert")
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi'
+ item_icons[WEAR_BODY] = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi'
+ if("snow")
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi'
+ item_icons[WEAR_BODY] = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi'
+ flags_jumpsuit |= UNIFORM_DO_NOT_HIDE_ACCESSORIES
+
/obj/item/clothing/under/marine/set_sensors(mob/user)
if(!skillcheckexplicit(user, SKILL_ANTAG, SKILL_ANTAG_AGENT))
to_chat(user, SPAN_WARNING("The sensors in \the [src] can't be modified."))
return
. = ..()
-/obj/item/clothing/under/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
- . = ..()
- for(var/i in map_variants_roll_accessories)
- if(findtext(icon_state, i, 1, 3))
- flags_jumpsuit |= UNIFORM_DO_NOT_HIDE_ACCESSORIES
-
/obj/item/clothing/under/marine/medic
name = "\improper USCM corpsman uniform"
desc = "Standard-issue Marine hospital corpsman fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets."
@@ -64,12 +77,16 @@
specialty = "USCM Combat Technician"
/obj/item/clothing/under/marine/engineer/standard
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/under/marine/engineer/darker
- icon_state = "d_marine_engineer"
- worn_state = "d_marine_engineer"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi'
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi'
+ )
/obj/item/clothing/under/marine/rto
name = "\improper USCM radio telephone operator uniform"
@@ -78,11 +95,6 @@
item_state = "marine_rto"
specialty = "marine Radio Telephone Operator"
-/obj/item/clothing/under/marine/sniper
- name = "\improper USCM sniper uniform"
- flags_jumpsuit = FALSE
- specialty = "USCM Sniper"
-
/obj/item/clothing/under/marine/tanker
name = "\improper USCM tanker uniform"
icon_state = "marine_tanker"
@@ -91,19 +103,21 @@
specialty = "USCM tanker"
/obj/item/clothing/under/marine/tanker/New(loc,
- new_protection = list(MAP_ICE_COLONY = ICE_PLANET_MIN_COLD_PROT),
- override_icon_state = list(MAP_ICE_COLONY = "s_marine_tanker"))
+ new_protection = list(MAP_ICE_COLONY = ICE_PLANET_MIN_COLD_PROT))
- ..(loc, new_protection, override_icon_state)
+ ..(loc, new_protection)
/obj/item/clothing/under/marine/chef
name = "\improper USCM Mess Technician uniform"
desc = "Standard-issue Mess Technician uniform. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
icon_state = "chef_uniform"
worn_state = "chef_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi'
flags_jumpsuit = FALSE
- specialty = "USCM mess technician"
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi',
+ )
/obj/item/clothing/under/marine/mp
name = "military police jumpsuit"
@@ -115,12 +129,16 @@
specialty = "military police"
/obj/item/clothing/under/marine/mp/standard
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/under/marine/mp/darker
- icon_state = "d_MP_jumpsuit"
- worn_state = "d_MP_jumpsuit"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi'
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi'
+ )
/obj/item/clothing/under/marine/warden
name = "military warden jumpsuit"
@@ -130,14 +148,13 @@
suit_restricted = list(/obj/item/clothing/suit/storage/marine, /obj/item/clothing/suit/armor/riot/marine, /obj/item/clothing/suit/storage/jacket/marine/service/warden)
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_SLEEVE_CUTTABLE|UNIFORM_JACKET_REMOVABLE
specialty = "military warden"
- flags_atom = NO_SNOW_TYPE
/obj/item/clothing/under/marine/officer
name = "marine officer uniform"
desc = "Softer than silk. Lighter than feather. More protective than Kevlar. Fancier than a regular jumpsuit, too. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
- icon_state = "officertanclothes"
- item_state = "officertanclothes"
- worn_state = "officertanclothes"
+ icon_state = ""
+ item_state = ""
+ worn_state = ""
suit_restricted = null //so most officers can wear whatever suit they want
flags_jumpsuit = FALSE
specialty = "marine officer"
@@ -162,13 +179,6 @@
specialty = "chief MP"
flags_atom = NO_SNOW_TYPE
-/obj/item/clothing/under/marine/officer/technical
- name = "technical officer uniform"
- icon_state = "johnny"
- worn_state = "johnny"
- specialty = "technical officer"
- flags_atom = NO_SNOW_TYPE
-
/obj/item/clothing/under/marine/officer/pilot
name = "pilot officer bodysuit"
desc = "A bodysuit worn by pilot officers of the USCM, and is meant for survival in inhospitable conditions. Fly the marines onwards to glory. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
@@ -176,7 +186,6 @@
item_state = "pilot_flightsuit"
worn_state = "pilot_flightsuit"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
- flags_atom = NO_NAME_OVERRIDE
flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
suit_restricted = list(/obj/item/clothing/suit/armor/vest/pilot, /obj/item/clothing/suit/storage/marine/light/vest/dcc, /obj/item/clothing/suit/storage/jacket/marine/pilot, /obj/item/clothing/suit/storage/marine/light/vest)
@@ -184,20 +193,26 @@
name = "tactical pilot officer flightsuit"
desc = "A flightsuit worn by pilot officers of the USCM, with plenty of leather straps, pouches, and other essential gear you will never use. Looks badass."
icon_state = "pilot_flightsuit_alt"
- item_state = "pilot_flightsuit_alt"
worn_state = "pilot_flightsuit_alt"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
/obj/item/clothing/under/marine/officer/pilot/dcc
name = "dropship crew chief bodysuit"
desc = "A bodysuit worn by dropship crew chiefs of the USCM, and is meant for survival in inhospitable conditions. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
icon_state = "crewchief_flightsuit"
- item_state = "crewchief_flightsuit"
worn_state = "crewchief_flightsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
/obj/item/clothing/under/marine/officer/tanker
name = "vehicle crewman uniform"
@@ -212,18 +227,19 @@
/obj/item/clothing/under/marine/officer/bridge
name = "marine service uniform"
desc = "A service uniform worn by members of the USCM. Do the corps proud. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "BO_jumpsuit"
- item_state = "BO_jumpsuit"
worn_state = "BO_jumpsuit"
- specialty = "marine service"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
- flags_atom = NO_SNOW_TYPE
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
/obj/item/clothing/under/marine/officer/boiler
name = "marine operations uniform"
desc = "An operations uniform worn by members of the USCM. Do the corps proud. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
icon_state = "uscmboiler"
- item_state = "uscmboiler"
worn_state = "uscmboiler"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
specialty = "marine operations"
@@ -238,10 +254,13 @@
/obj/item/clothing/under/marine/officer/general
name = "general uniform"
desc = "A uniform worn by a fleet general. It comes in a shade of deep black, and has a light shimmer to it. The weave looks strong enough to provide some light protections."
- item_state = "general_jumpsuit"
+ icon_state = "general_jumpsuit"
worn_state = "general_jumpsuit"
- specialty = "general"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
/obj/item/clothing/under/marine/officer/ce
name = "chief engineer uniform"
@@ -250,8 +269,11 @@
armor_rad = CLOTHING_ARMOR_MEDIUMLOW
icon_state = "EC_jumpsuit"
worn_state = "EC_jumpsuit"
- specialty = "chief engineer"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
item_state_slots = list(WEAR_BODY = "EC_jumpsuit")
/obj/item/clothing/under/marine/officer/engi
@@ -261,6 +283,10 @@
armor_rad = CLOTHING_ARMOR_LOW
icon_state = "mt_jumpsuit"
worn_state = "mt_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+ )
specialty = "engineer"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
flags_atom = NO_SNOW_TYPE
@@ -272,6 +298,10 @@
armor_bomb = CLOTHING_ARMOR_LOW
icon_state = "ot_jumpsuit"
worn_state = "ot_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+ )
item_state_slots = list(WEAR_BODY = "ot_jumpsuit")
/obj/item/clothing/under/marine/officer/researcher
@@ -281,16 +311,26 @@
armor_rad = CLOTHING_ARMOR_LOW
icon_state = "research_jumpsuit"
worn_state = "research_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi',
+ )
specialty = "researcher"
flags_atom = NO_SNOW_TYPE
+/obj/item/clothing/under/marine/officer/formal
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
+
/obj/item/clothing/under/marine/officer/formal/servicedress
name = "commanding officer's dress shirt"
desc = "The shirt and tie of a two-piece Navy service dress uniform for high-ranking officers. Wear with style and substance."
specialty = "captain's service dress"
icon_state = "CO_service"
worn_state = "CO_service"
- flags_atom = NO_SNOW_TYPE
/obj/item/clothing/under/marine/officer/formal/white
name = "Commanding Officer's white formal uniform"
@@ -298,7 +338,6 @@
icon_state = "CO_formal_white"
worn_state = "CO_formal_white"
specialty = "captain's white formal"
- flags_atom = NO_SNOW_TYPE
/obj/item/clothing/under/marine/officer/formal/black
name = "Commanding Officer's gray formal uniform"
@@ -306,15 +345,17 @@
icon_state = "CO_formal_black"
worn_state = "CO_formal_black"
specialty = "captain's gray formal"
- flags_atom = NO_SNOW_TYPE
/obj/item/clothing/under/marine/dress
name = "marine formal service uniform"
desc = "A formal service uniform typically worn by marines of the USCM. Still practicable while still being more formal than the standard service uniform."
icon_state = "formal_jumpsuit"
worn_state = "formal_jumpsuit"
- specialty = "marine formal"
- flags_atom = NO_SNOW_TYPE
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
+ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
flags_jumpsuit = FALSE
black_market_value = 15
@@ -332,25 +373,23 @@
/obj/item/clothing/under/marine/dress/blues
name = "marine enlisted dress blues uniform"
desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This unadorned variant is for enlisted personnel, E-1 thru E-3."
- icon = 'icons/mob/humans/onmob/contained/marinedressblues.dmi'
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "enlisted"
- item_state = "enlisted"
worn_state = "enlisted"
- contained_sprite = TRUE
- item_state_slots = null
/obj/item/clothing/under/marine/dress/blues/senior
name = "marine senior dress blues uniform"
desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This variant features the iconic Blood Stripe, worn by NCOs and officers."
icon_state = "senior"
- item_state = "senior"
worn_state = "senior"
/obj/item/clothing/under/marine/dress/blues/general
name = "marine senior dress blues uniform"
desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This variant features black trousers and a large Blood Stripe, worn by general officers."
icon_state = "general"
- item_state = "general"
worn_state = "general"
//=========================//PROVOST\\================================\\
@@ -362,6 +401,10 @@
name = "\improper Provost Uniform"
desc = "The crisp uniform of a Provost Officer."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "provost"
worn_state = "provost"
@@ -402,6 +445,10 @@
flags_jumpsuit = FALSE
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
siemens_coefficient = 0.9
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "tis"
worn_state = "tis"
armor_melee = CLOTHING_ARMOR_LOW
@@ -425,6 +472,10 @@
/obj/item/clothing/under/marine/reconnaissance
name = "\improper USCM uniform"
desc = "Torn, Burned and blood stained. This uniform has seen much more than you could possibly imagine."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "recon_marine"
worn_state = "recon_marine"
flags_atom = NO_SNOW_TYPE
@@ -454,6 +505,10 @@
name = "SOF Uniform"
desc = "A black uniform for elite Marine personnel. Designed to be comfortable and help blend into dark enviorments."
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "marsoc"
worn_state = "marsoc"
specialty = "sof uniform"
@@ -464,6 +519,10 @@
/obj/item/clothing/under/marine/veteran/pmc
name = "\improper PMC fatigues"
desc = "A white set of fatigues, designed for private security operators. The symbol of the Weyland-Yutani corporation is emblazed on the suit."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi',
+ )
icon_state = "pmc_jumpsuit"
worn_state = "pmc_jumpsuit"
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
@@ -491,12 +550,8 @@
/obj/item/clothing/under/marine/veteran/pmc/corporate
name = "\improper WY corporate security uniform"
desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by what are known as 'goons'."
- icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi'
icon_state = "uniform"
- item_state = "uniform"
worn_state = "uniform"
- contained_sprite = TRUE
- item_state_slots = null
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
/obj/item/clothing/under/marine/veteran/pmc/corporate/lead
@@ -511,13 +566,14 @@
name = "\improper Iron Bear uniform"
desc = "A uniform worn by Iron Bears mercenaries in the service of Mother Russia. Smells a little like an actual bear."
icon_state = "bear_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi'
worn_state = "bear_jumpsuit"
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
has_sensor = UNIFORM_NO_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/bear)
item_icons = list(
- WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
)
/obj/item/clothing/under/marine/veteran/UPP
@@ -525,11 +581,16 @@
desc = "A set of UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
icon_state = "upp_uniform"
worn_state = "upp_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UPP.dmi'
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
has_sensor = UNIFORM_HAS_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing)
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UPP.dmi'
+ )
+
/obj/item/clothing/under/marine/veteran/UPP/medic
name = "\improper UPP medic fatigues"
desc = "A set of medic UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
@@ -588,9 +649,14 @@
desc = "A set of loose-fitting fatigues, perfect for an informal mercenary. Smells like gunpowder, apple pie, and covered in grease and sake stains."
icon_state = "freelancer_uniform"
worn_state = "freelancer_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi'
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
has_sensor = UNIFORM_NO_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/freelancer, /obj/item/clothing/suit/storage/webbing, /obj/item/clothing/suit/storage/utility_vest)
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
+ )
+
//=========================//Dutch Dozen\\================================\\
@@ -600,11 +666,14 @@
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
+ icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi'
icon_state = "dutch_jumpsuit"
worn_state = "dutch_jumpsuit"
has_sensor = UNIFORM_NO_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/dutch, /obj/item/clothing/suit/armor/vest/dutch)
-
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
+ )
/obj/item/clothing/under/marine/veteran/dutch/ranger
icon_state = "dutch_jumpsuit2"
@@ -612,11 +681,15 @@
/obj/item/clothing/under/marine/veteran/van_bandolier
name = "hunting clothes"
desc = "A set of tailored clothes, made from fine but sturdy reinforced fabrics. Protects from thorns, weather, and the cuts and scrapes that forever bedevil outdoorsmen."
+ icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi'
icon_state = "van_bandolier"
worn_state = "van_bandolier"
item_state = "van_bandolier_clothes"
flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
has_sensor = UNIFORM_NO_SENSORS
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
+ )
//=========================//OWLF\\================================\\
@@ -626,10 +699,14 @@
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS //This is all a copy and paste of the Dutch's stuff for now.
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
+ icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi'
icon_state = "owlf_uniform"
worn_state = "owlf_uniform"
has_sensor = UNIFORM_NO_SENSORS
hood_state = /obj/item/clothing/head/owlf_hood
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
+ )
//===========================//HELGHAST - MERCENARY\\================================\\
//=====================================================================\\
@@ -637,6 +714,10 @@
/obj/item/clothing/under/marine/veteran/mercenary
name = "\improper Mercenary fatigues"
desc = "A thick, beige suit with a red armband. There is an unknown symbol is emblazed on the suit."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/CLF.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CLF.dmi',
+ )
icon_state = "mercenary_heavy_uniform"
worn_state = "mercenary_heavy_uniform"
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
@@ -660,25 +741,24 @@
/obj/item/clothing/under/marine/ua_riot
name = "\improper United American security uniform"
desc = "Overalls made of kevlon cover a snazzy blue dress shirt. UA branded security uniforms are notorious for their association with anti-union riot control teams."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "ua_riot"
worn_state = "ua_riot"
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE //Let's make them keep their original name.
flags_jumpsuit = FALSE
suit_restricted = null
-/obj/item/clothing/under/marine/ucf_clown
- name = "\improper UCF uniform"
- desc = "A Unified Clown Federation combat uniform. Features the latest in anti-mime technology."
- icon_state = "clown"
- worn_state = "clown"
- flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE //Let's make them keep their original name.
- black_market_value = 25
-
/obj/item/clothing/under/pizza
name = "pizza delivery uniform"
desc = "An ill-fitting, slightly stained uniform for a pizza delivery pilot. Smells of cheese."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
icon_state = "redshirt2"
- item_state = "r_suit"
worn_state = "redshirt2"
has_sensor = UNIFORM_NO_SENSORS
@@ -692,6 +772,10 @@
/obj/item/clothing/under/colonist
name = "colonist uniform"
desc = "A stylish gray-green jumpsuit - standard issue for colonists."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi',
+ )
icon_state = "colonist"
worn_state = "colonist"
has_sensor = UNIFORM_HAS_SENSORS
@@ -699,6 +783,10 @@
/obj/item/clothing/under/colonist/workwear
name = "grey workwear"
desc = "A pair of black slacks and a short-sleeve grey workshirt. Standard uniform for Weyland Yutani employees working in colony operations and administration."
+ icon = 'icons/obj/items/clothing/uniforms/workwear.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/workwear.dmi',
+ )
icon_state = "workwear_grey"
worn_state = "workwear_grey"
@@ -733,12 +821,20 @@
/obj/item/clothing/under/colonist/clf
name = "\improper Colonial Liberation Front uniform"
desc = "A stylish grey-green jumpsuit - standard issue for colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/CLF.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CLF.dmi',
+ )
icon_state = "clf_uniform"
worn_state = "clf_uniform"
/obj/item/clothing/under/colonist/ua_civvies
name = "\improper UA gray utility uniform"
desc = "A stylish gray jumpsuit - standard issue for UA civilian support personnel."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "ua_civvies"
worn_state = "ua_civvies"
has_sensor = UNIFORM_HAS_SENSORS
@@ -746,6 +842,10 @@
/obj/item/clothing/under/colonist/wy_davisone
name = "\improper UA brown utility uniform"
desc = "A stylish brown jumpsuit - standard issue for UA civilian support personnel."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "wy_davisone"
worn_state = "wy_davisone"
has_sensor = UNIFORM_HAS_SENSORS
@@ -753,6 +853,10 @@
/obj/item/clothing/under/colonist/white_service
name = "white service uniform"
desc = "A white dress shirt and tie with sleek pants. Standard clothing for anyone on professional business."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "CO_service"
worn_state = "CO_service"
has_sensor = UNIFORM_HAS_SENSORS
@@ -760,12 +864,20 @@
/obj/item/clothing/under/colonist/wy_joliet_shopsteward
name = "steward utilities"
desc = "A stylish brown vest and shorts - uniforms like this are often worn by clerks and shop stewards."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
icon_state = "wy_joliet_shopsteward"
worn_state = "wy_joliet_shopsteward"
has_sensor = UNIFORM_HAS_SENSORS
/obj/item/clothing/under/tshirt
name = "T-shirt parent object"
+ icon = 'icons/obj/items/clothing/uniforms/workwear.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/workwear.dmi',
+ )
has_sensor = UNIFORM_NO_SENSORS
/obj/item/clothing/under/tshirt/w_br
@@ -795,6 +907,10 @@
/obj/item/clothing/under/CM_uniform
name = "\improper Colonial Marshal uniform"
desc = "A pair of off-white slacks and a blue button-down shirt with a dark brown tie; the standard uniform of the Colonial Marshals."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/CMB.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CMB.dmi',
+ )
icon_state = "marshal"
worn_state = "marshal"
armor_melee = CLOTHING_ARMOR_LOW
@@ -810,6 +926,10 @@
/obj/item/clothing/under/liaison_suit
name = "liaison's tan suit"
desc = "A stiff, stylish tan suit commonly worn by businessmen from the Weyland-Yutani corporation. Expertly crafted to make you look like a prick."
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi',
+ )
icon_state = "liaison_regular"
worn_state = "liaison_regular"
@@ -894,9 +1014,10 @@
desc = "A relaxed and robust uniform fit for any potential reporting needs."
icon_state = "cc_white"
worn_state = "cc_white"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
item_icons = list(
- WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
)
/obj/item/clothing/under/marine/reporter/black
@@ -916,12 +1037,20 @@
desc = "A stiff, stylish blue suit commonly worn by gentlemen from the Three World Empire. Expertly crafted to make you look as important as possible."
icon_state = "twe_suit"
worn_state = "twe_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/TWE.dmi',
+ )
/obj/item/clothing/under/stowaway
name = "dirty suit"
desc = "A stiff, stylish tan suit commonly worn by businessmen from the Weyland-Yutani corporation. Expertly crafted to make you look like a prick."
icon_state = "stowaway_uniform"
worn_state = "stowaway_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
/obj/item/clothing/under/rank/chef/exec
name = "\improper Weyland-Yutani suit"
@@ -933,6 +1062,10 @@
desc = "A nicely-fitting military suit for a quartermaster. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
icon_state = "RO_jumpsuit"
worn_state = "RO_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi',
+ )
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
/obj/item/clothing/under/rank/synthetic
@@ -940,6 +1073,10 @@
desc = "A simple uniform made for Synthetic crewmembers."
icon_state = "rdalt"
worn_state = "rdalt"
+ icon = 'icons/obj/items/clothing/uniforms/synthetic_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/synthetic_uniforms.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/rank/synthetic/synth_k9
@@ -996,6 +1133,10 @@
icon_state = "pilot_flightsuit_alt"
item_state = "pilot_flightsuit_alt"
worn_state = "pilot_flightsuit_alt"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
@@ -1003,12 +1144,20 @@
/obj/item/clothing/under/rank/synthetic/old
icon_state = "rdalt_s"
worn_state = "rdalt_s"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi',
+ )
/obj/item/clothing/under/rank/synthetic/joe
name = "\improper Working Joe Uniform"
desc = "A cheap uniform made for Synthetic labor. Tomorrow, Together."
icon_state = "working_joe"
worn_state = "working_joe"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi',
+ )
flags_item = NO_CRYO_STORE
var/obj/structure/machinery/camera/camera
@@ -1062,11 +1211,13 @@
/obj/item/clothing/under/marine/veteran/royal_marine
name = "royal marines commando uniform"
desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/TWE.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/TWE.dmi',
+ )
icon_state = "rmc_uniform"
worn_state = "rmc_uniform"
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
- contained_sprite = TRUE
- icon = 'icons/mob/humans/onmob/contained/royal_marines_commando.dmi'
/obj/item/clothing/under/marine/veteran/royal_marine/tl
icon_state = "rmc_uniform_teaml"
@@ -1085,6 +1236,7 @@
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
icon_state = "cbrn"
worn_state = "cbrn"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
flags_jumpsuit = NO_FLAGS
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
@@ -1100,7 +1252,7 @@
actions_types = list(/datum/action/item_action/specialist/toggle_cbrn_hood)
item_icons = list(
- WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
)
///Whether the hood and gas mask were worn through the hood toggle verb
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 42c61404a31a..498dc4ba0562 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -10,27 +10,23 @@
icon_state = "blue_pyjamas"
item_state = "w_suit"
-/obj/item/clothing/under/scratch
- name = "white suit"
- desc = "A white suit, suitable for an excellent host"
- icon_state = "scratch"
-
/obj/item/clothing/under/sl_suit
desc = "It's a very Amish-looking suit."
name = "Amish suit"
icon_state = "sl_suit"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
/obj/item/clothing/under/waiter
name = "waiter's outfit"
desc = "It's a very smart uniform with a special pocket for tip."
icon_state = "waiter"
-
-/obj/item/clothing/under/rank/mailman
- name = "mailman's jumpsuit"
- desc = "'Special delivery!'"
- icon_state = "mailman"
- item_state = "b_suit"
- flags_jumpsuit = FALSE
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
/obj/item/clothing/under/rank/centcom_officer
desc = "It's a jumpsuit worn by CentCom Officers."
@@ -39,30 +35,15 @@
item_state = "g_suit"
flags_jumpsuit = FALSE
-/obj/item/clothing/under/rank/centcom_commander
- desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
- name = "\improper CentCom officer's jumpsuit"
- icon_state = "centcom"
- item_state = "dg_suit"
- flags_jumpsuit = FALSE
-
-/obj/item/clothing/under/space
- name = "\improper NASA jumpsuit"
- desc = "It has a NASA logo on it and is made of space-proofed materials."
- icon_state = "black"
- item_state = "bl_suit"
- w_class = SIZE_LARGE//bulky item
- gas_transfer_coefficient = 0.01
- permeability_coefficient = 0.02
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS //Needs gloves and shoes with cold protection to be fully protected.
- min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT
-
/obj/item/clothing/under/suit_jacket
name = "black suit"
desc = "A black suit and red tie. Very formal."
icon_state = "black_suit"
item_state = "bl_suit"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
/obj/item/clothing/under/suit_jacket/really_black
name = "executive suit"
@@ -85,6 +66,10 @@
name = "red dress skirt"
desc = "A black cardigan with a red skirt, quite fancy!"
icon_state = "blackskirt"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
/obj/item/clothing/under/schoolgirl
@@ -98,6 +83,10 @@
desc = "A set of durable overalls for getting the job done."
icon_state = "overalls"
item_state = "lb_suit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi',
+ )
/obj/item/clothing/under/pirate
name = "pirate outfit"
@@ -117,12 +106,6 @@
icon_state = "kutjevo_drysuit"
item_state = "kutjevo_drysuit"
-
-/obj/item/clothing/under/soviet
- name = "soviet uniform"
- desc = "For the Motherland!"
- icon_state = "soviet"
-
/obj/item/clothing/under/rank/veteran/soviet_uniform_01
name = "soviet military uniform"
desc = "Made with fabric so strong and unified it would make the capitalist tailors jealous."
@@ -134,47 +117,17 @@
desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
name = "shaft miner's jumpsuit"
icon_state = "miner"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi',
+ )
/obj/item/clothing/under/redcoat
name = "redcoat uniform"
desc = "Looks old."
icon_state = "redcoat"
-/obj/item/clothing/under/kilt
- name = "kilt"
- desc = "Includes shoes and plaid"
- icon_state = "kilt"
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_FEET
-
-//wedding stuff
/obj/item/clothing/under/wedding
- flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
-
-/obj/item/clothing/under/wedding/bride_orange
- name = "orange wedding dress"
- desc = "A big and puffy orange dress."
- icon_state = "bride_orange"
- flags_inv_hide = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_purple
- name = "purple wedding dress"
- desc = "A big and puffy purple dress."
- icon_state = "bride_purple"
- flags_inv_hide = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_blue
- name = "blue wedding dress"
- desc = "A big and puffy blue dress."
- icon_state = "bride_blue"
- flags_inv_hide = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_red
- name = "red wedding dress"
- desc = "A big and puffy red dress."
- icon_state = "bride_red"
- flags_inv_hide = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_white
name = "silky wedding dress"
desc = "A white wedding gown made from the finest silk."
icon_state = "bride_white"
@@ -186,6 +139,10 @@
desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
icon_state = "assistant_formal"
item_state = "gy_suit"
+ icon = 'icons/obj/items/clothing/uniforms/formal_uniforms.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi',
+ )
/obj/item/clothing/under/suit_jacket/charcoal
name = "charcoal suit"
@@ -217,25 +174,32 @@
desc = "A dirty suit with a yellow tie. It looks very weathered."
icon_state = "stowaway_uniform"
-/obj/item/clothing/under/serviceoveralls
- name = "Workman outfit"
- desc = "The very image of a working man. Not that you're probably doing work."
- icon_state = "mechanic"
-
/obj/item/clothing/under/suit_jacket/director
name = "director's suit"
desc = "It's a suit that oozes with authority. Belongs to someone very important."
item_state = "director_uniform"
icon_state = "director_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi',
+ )
/obj/item/clothing/under/suit_jacket/manager
desc = "It's a suit worn by those with the know-how to achieve the position of \"Corporate Manager\"."
name = "manager's suit"
icon_state = "manager_uniform"
item_state = "manager_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi',
+ )
/obj/item/clothing/under/suit_jacket/trainee
name = "trainee's uniform"
desc = "It's a uniform that has a Wey-Yu insignia on it with the words \"Trainee\" stamped below."
icon_state = "trainee_uniform"
item_state = "trainee_uniform"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi',
+ )
diff --git a/code/modules/clothing/under/rank_pins.dm b/code/modules/clothing/under/rank_pins.dm
index 894ff6d879b7..ef5ec796694e 100644
--- a/code/modules/clothing/under/rank_pins.dm
+++ b/code/modules/clothing/under/rank_pins.dm
@@ -4,6 +4,12 @@
gender = PLURAL
desc = "A set of rank pins, used to denote the paygrade of someone within the military."
icon_state = "ranks_enlisted"
+ icon = 'icons/obj/items/clothing/accessory/ranks.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/ranks.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/ranks.dmi'
+ )
var/rank = "Private"
var/rank_short = PAY_SHORT_ME1
slot = ACCESSORY_SLOT_RANK
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index aaf736e6f84f..d1deec0b1513 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -1,6 +1,8 @@
/obj/item/clothing/under/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
+ icon = 'icons/obj/items/clothing/uniforms/underwear_uniforms.dmi'
+ icon_override = 'icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi'
gender = PLURAL
flags_armor_protection = BODY_FLAG_GROIN
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index f8b4bf55c461..8c485aac9557 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -1,7 +1,7 @@
/obj/item/clothing/accessory
name = "tie"
desc = "A neosilk clip-on tie."
- icon = 'icons/obj/items/clothing/ties.dmi'
+ icon = 'icons/obj/items/clothing/accessory/ties.dmi'
icon_state = "bluetie"
w_class = SIZE_SMALL
var/image/inv_overlay = null //overlay used when attached to clothing.
@@ -9,7 +9,11 @@
var/slot = ACCESSORY_SLOT_DECOR
var/list/mob_overlay = list()
var/overlay_state = null
- var/list/accessory_icons = list(WEAR_BODY = 'icons/mob/humans/onmob/ties.dmi', WEAR_JACKET = 'icons/mob/humans/onmob/ties.dmi')
+ var/inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/ties.dmi'
+ var/list/accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/ties.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/ties.dmi'
+ )
///Jumpsuit flags that cause the accessory to be hidden. format: "x" OR "(x|y|z)" (w/o quote marks).
var/jumpsuit_hide_states
var/high_visibility //if it should appear on examine without detailed view
@@ -19,7 +23,7 @@
/obj/item/clothing/accessory/Initialize()
. = ..()
- inv_overlay = image("icon" = 'icons/obj/items/clothing/ties_overlay.dmi', "icon_state" = "[item_state? "[item_state]" : "[icon_state]"]")
+ inv_overlay = image("icon" = inv_overlay_icon, "icon_state" = "[item_state? "[item_state]" : "[icon_state]"]")
flags_atom |= USES_HEARING
/obj/item/clothing/accessory/Destroy()
@@ -104,6 +108,12 @@
name = "stethoscope"
desc = "An outdated, but still useful, medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
icon_state = "stethoscope"
+ icon = 'icons/obj/items/clothing/accessory/misc.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi'
+ )
/obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/being, mob/living/user)
if(!ishuman(being) || !isliving(user))
@@ -166,6 +176,12 @@
name = "medal"
desc = "A medal."
icon_state = "bronze"
+ icon = 'icons/obj/items/clothing/accessory/medals.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/medals.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/medals.dmi'
+ )
var/recipient_name //name of the person this is awarded to.
var/recipient_rank
var/medal_citation
@@ -347,6 +363,12 @@
name = "red armband"
desc = "A fancy red armband!"
icon_state = "red"
+ icon = 'icons/obj/items/clothing/accessory/armbands.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/armbands.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/armbands.dmi'
+ )
slot = ACCESSORY_SLOT_ARMBAND
jumpsuit_hide_states = (UNIFORM_SLEEVE_CUT|UNIFORM_JACKET_REMOVED)
@@ -390,6 +412,11 @@
name = "USCM patch"
desc = "A fire-resistant shoulder patch, worn by the men and women of the United States Colonial Marines."
icon_state = "uscmpatch"
+ icon = 'icons/obj/items/clothing/accessory/patches.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/patches.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/patches.dmi'
+ )
jumpsuit_hide_states = (UNIFORM_SLEEVE_CUT|UNIFORM_JACKET_REMOVED)
flags_obj = OBJ_IS_HELMET_GARB
@@ -435,19 +462,34 @@
name = "Attachable Dogtags"
desc = "A robust pair of dogtags to be worn around the neck of the United States Colonial Marines, however due to a combination of budget reallocation, Marines losing their dogtags, and multiple incidents of marines swallowing their tags, they now attach to the uniform or armor."
icon_state = "dogtag"
+ icon = 'icons/obj/items/clothing/accessory/misc.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi'
+ )
slot = ACCESSORY_SLOT_MEDAL
/obj/item/clothing/accessory/poncho
name = "USCM Poncho"
desc = "The standard USCM poncho has variations for every climate. Custom fitted to be attached to standard USCM armor variants it is comfortable, warming or cooling as needed, and well-fit. A marine couldn't ask for more. Affectionately referred to as a \"woobie\"."
icon_state = "poncho"
+ icon = 'icons/obj/items/clothing/accessory/ponchos.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/ponchos.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/ponchos.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/ponchos.dmi',
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
slot = ACCESSORY_SLOT_PONCHO
+ flags_atom = MAP_COLOR_INDEX
/obj/item/clothing/accessory/poncho/Initialize()
. = ..()
// Only do this for the base type '/obj/item/clothing/accessory/poncho'.
select_gamemode_skin(/obj/item/clothing/accessory/poncho)
- inv_overlay = image("icon" = 'icons/obj/items/clothing/ties_overlay.dmi', "icon_state" = "[icon_state]")
+ inv_overlay = image("icon" = inv_overlay_icon, "icon_state" = "[icon_state]")
update_icon()
/obj/item/clothing/accessory/poncho/green
@@ -475,6 +517,12 @@
name = "load bearing equipment"
desc = "Used to hold things when you don't have enough hands."
icon_state = "webbing"
+ icon = 'icons/obj/items/clothing/accessory/webbings.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/webbings.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/webbings.dmi'
+ )
w_class = SIZE_LARGE //too big to store in other pouches
var/obj/item/storage/internal/hold = /obj/item/storage/internal/accessory
slot = ACCESSORY_SLOT_UTILITY
@@ -810,23 +858,6 @@
..()
playsound(src, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, TRUE)
-/obj/item/clothing/accessory/storage/knifeharness/duelling
- name = "decorated harness"
- desc = "A heavily decorated harness of sinew and leather with two knife-loops."
- icon_state = "unathiharness2"
- hold = /obj/item/storage/internal/accessory/knifeharness/duelling
-
-/obj/item/storage/internal/accessory/knifeharness/duelling
- storage_slots = 2
- max_storage_space = 2
- can_hold = list(
- /obj/item/weapon/unathiknife,
- )
-
-/obj/item/storage/internal/accessory/knifeharness/duelling/fill_preset_inventory()
- new /obj/item/weapon/unathiknife(src)
- new /obj/item/weapon/unathiknife(src)
-
/obj/item/clothing/accessory/storage/droppouch
name = "drop pouch"
desc = "A convenient pouch to carry loose items around."
@@ -930,7 +961,6 @@
name = "shoulder holster"
desc = "A handgun holster. Made of expensive leather."
icon_state = "holster"
- item_state = "holster_low"
/*
Holobadges are worn on the belt or neck, and can be used to show that the holder is an authorized
@@ -943,6 +973,12 @@
name = "holobadge"
desc = "This glowing blue badge marks the holder as THE LAW."
icon_state = "holobadge"
+ icon = 'icons/obj/items/clothing/accessory/misc.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi'
+ accessory_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi'
+ )
flags_equip_slot = SLOT_WAIST
jumpsuit_hide_states = UNIFORM_JACKET_REMOVED
@@ -1000,6 +1036,5 @@
/obj/item/clothing/accessory/storage/owlf_vest
name = "\improper OWLF agent vest"
desc = "This is a fancy-looking ballistics vest, meant to be attached to a uniform." //No stats for these yet, just placeholder implementation.
- icon = 'icons/obj/items/clothing/ties.dmi'
icon_state = "owlf_vest"
item_state = "owlf_vest"
diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm
index effd441ab81b..b3f8eebe9302 100644
--- a/code/modules/clothing/under/under.dm
+++ b/code/modules/clothing/under/under.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/under
- icon = 'icons/obj/items/clothing/uniforms.dmi'
+ icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi'
name = "under"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
@@ -36,6 +36,9 @@
sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi')
equip_sounds = list('sound/handling/clothing_on.ogg')
unequip_sounds = list('sound/handling/clothing_off.ogg')
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi'
+ )
/obj/item/clothing/under/Initialize()
. = ..()
@@ -44,7 +47,7 @@
else
worn_state = icon_state
- var/check_icon = contained_sprite ? icon : GLOB.default_onmob_icons[WEAR_BODY]
+ var/check_icon = contained_sprite ? icon : item_icons[WEAR_BODY]
//autodetect rollability, cuttability, and removability.
if(icon_exists(check_icon, "[worn_state]_d[contained_sprite ? "_un" : ""]"))
diff --git a/code/modules/cm_aliens/Ovipositor.dm b/code/modules/cm_aliens/Ovipositor.dm
index b8983f37cc7a..358a8f70dc9a 100644
--- a/code/modules/cm_aliens/Ovipositor.dm
+++ b/code/modules/cm_aliens/Ovipositor.dm
@@ -2,7 +2,7 @@
/obj/ovipositor
name = "Egg Sac"
- icon = 'icons/mob/xenos/ovipositor.dmi'
+ icon = 'icons/mob/xenos/castes/tier_4/ovipositor.dmi'
icon_state = "ovipositor"
unacidable = TRUE
var/begin_decay_time = 0
@@ -40,7 +40,7 @@
var/turf/T = get_turf(src)
if (T)
- T.overlays += image('icons/mob/xenos/ovipositor.dmi', "ovipositor_molted", ATMOS_DEVICE_LAYER) //ATMOS_DEVICE_LAYER so that the ovi is above weeds, blood, and resin weed nodes.
+ T.overlays += image('icons/mob/xenos/castes/tier_4/ovipositor.dmi', "ovipositor_molted", ATMOS_DEVICE_LAYER) //ATMOS_DEVICE_LAYER so that the ovi is above weeds, blood, and resin weed nodes.
qdel(src)
@@ -54,7 +54,7 @@
var/turf/T = get_turf(src)
if (T)
- T.overlays += image('icons/mob/xenos/ovipositor.dmi', "ovipositor_gibbed", ATMOS_DEVICE_LAYER)
+ T.overlays += image('icons/mob/xenos/castes/tier_4/ovipositor.dmi', "ovipositor_gibbed", ATMOS_DEVICE_LAYER)
qdel(src)
diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm
index f8f2e61b8a37..15137c2aa1d8 100644
--- a/code/modules/cm_marines/Donator_Items.dm
+++ b/code/modules/cm_marines/Donator_Items.dm
@@ -11,8 +11,8 @@
icon_state = null
item_state = null
//DON'T GRAB STUFF BETWEEN THIS LINE
- icon = 'icons/obj/items/clothing/hats.dmi'
- icon_override = 'icons/mob/humans/onmob/head_0.dmi'
+ icon = 'icons/obj/items/clothing/hats/donator.dmi'
+ icon_override = 'icons/mob/humans/onmob/clothing/head/donator.dmi'
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|NO_SNOW_TYPE
@@ -52,6 +52,10 @@
desc = "ITEM DESCRIPTION. DONOR ITEM" //Add UNIQUE if Unique
icon_state = null
item_state = null
+ icon = 'icons/obj/items/clothing/masks/donator.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/donator.dmi'
+ )
//DON'T GRAB STUFF BETWEEN THIS LINE
flags_inventory = ALLOWREBREATH
flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE
@@ -69,8 +73,8 @@
item_state = null
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|NO_SNOW_TYPE
//DON'T GRAB STUFF BETWEEN THIS LINE
- icon = 'icons/obj/items/clothing/suits.dmi'
- icon_override = 'icons/mob/humans/onmob/suit_0.dmi' //Don't fuck with this in the future please.
+ icon = 'icons/obj/items/clothing/suits/donator.dmi'
+ icon_override = 'icons/mob/humans/onmob/clothing/suits/donator.dmi' //Don't fuck with this in the future please.
flags_inventory = BLOCKSHARPOBJ
flags_marine_armor = NO_FLAGS
@@ -82,8 +86,8 @@
item_state = null
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|NO_SNOW_TYPE
//DON'T GRAB STUFF BETWEEN THIS LINE
- icon = 'icons/obj/items/clothing/suits.dmi'
- icon_override = 'icons/mob/humans/onmob/suit_0.dmi' //Don't fuck with this in the future please.
+ icon = 'icons/obj/items/clothing/suits/donator.dmi'
+ icon_override = 'icons/mob/humans/onmob/clothing/suits/donator.dmi' //Don't fuck with this in the future please.
flags_inventory = BLOCKSHARPOBJ
flags_marine_armor = NO_FLAGS
@@ -124,10 +128,20 @@
//END FEET TEMPLATE
/obj/item/storage/backpack/marine/fluff
+ icon_state = null
xeno_types = null
+ icon = 'icons/obj/items/clothing/backpack/donator.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/donator.dmi'
+ )
/obj/item/storage/backpack/marine/satchel/fluff
+ icon_state = null
xeno_types = null
+ icon = 'icons/obj/items/clothing/backpack/donator.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/donator.dmi'
+ )
/obj/item/clothing/gloves/marine/fluff //MARINE GLOVES TEMPLATE
name = "ITEM NAME"
@@ -178,6 +192,10 @@
desc = "A black Balaclava used for hiding your face. DISCLAIMER: May not actually hide your face... DONOR ITEM"
item_state = "balaclava"
icon_state = "balaclava"
+ icon = 'icons/obj/items/clothing/masks/balaclava.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/balaclava.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWREBREATH
flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR
@@ -194,6 +212,10 @@
desc = "Festive! DONOR ITEM"
icon_state = "santa"
item_state = "santa"
+ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/commandercookies //CKEY=commandercookies
name = "marine armor w/ ammo"
@@ -212,6 +234,10 @@
desc = "Some fancy looking armor. DONOR ITEM"
icon_state = "armor_reflec"
item_state = "armor_reflec"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi'
+ )
/obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE)
name = "juggernaut armor"
@@ -224,6 +250,10 @@
desc = "An 18th-century trenchcoat. Someone who wears this means serious business. DONOR ITEM"
icon_state = "detective"
item_state = "det_suit"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
blood_overlay_type = "coat"
/obj/item/clothing/suit/storage/marine/fluff/wright //CKEY=wrightthewrong
@@ -247,9 +277,17 @@
/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
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|MAP_COLOR_INDEX
icon_state = "rangerarmor"
item_state = "rangerarmor"
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
+ item_state_slots = list(
+ WEAR_L_HAND = "marine_armor",
+ WEAR_R_HAND = "marine_armor"
+ )
/obj/item/clothing/suit/storage/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Armor"
@@ -274,12 +312,20 @@
desc = "A vintage DONOR ITEM"
icon_state = "bulletproof"
item_state = "bulletproof"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/john56 //CKEY=johnkilla56
name = "A red trenchcoat"
desc = "A special trenchcoat made famous for instilling fear into greytide everywhere. DONOR ITEM"
icon_state = "hos"
item_state = "hos"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
blood_overlay_type = "coat"
/obj/item/clothing/suit/storage/marine/light/fluff/biolock //CKEY=biolock
@@ -299,6 +345,10 @@
desc = "Looks like a hardsuit. Unique DONOR ITEM"
icon_state = "syndicate"
item_state = "syndicate"
+ icon = 'icons/obj/items/clothing/suits/hazard.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/Zynax //CKEY=zynax
name = "Gorka Vest"
@@ -329,12 +379,20 @@
desc = "A fairly advanced set of armor. DONOR ITEM"
icon_state = "armor_reflec"
item_state = "armor_reflec"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/mitii
name = "Mya's Trenchcoat"
desc = "A trenchcoat of authority. DONOR ITEM"
icon_state = "hos"
item_state = "hos"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/gromi
name = "Hawkeye's Jacket"
@@ -347,6 +405,10 @@
desc = "A trenchcoat of authority. DONOR ITEM"
icon_state = "hos"
item_state = "hos"
+ icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/devilzhand
name = "Tank's Trenchcoat"
@@ -354,12 +416,15 @@
icon_state = "jensencoat"
item_state = "jensencoat"
-
/obj/item/clothing/suit/storage/marine/fluff/feweh //CKEY=feweh
name = "Pink's Ablative Armor Vest"
desc = "The fanciest bullet proof vest you've ever seen. DONOR ITEM"
icon_state = "armor_reflec"
item_state = "armor_reflec"
+ icon = 'icons/obj/items/clothing/suits/armor.dmi'
+ item_icons = list(
+ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/armor.dmi',
+ )
/obj/item/clothing/suit/storage/marine/fluff/crazyh206
name = "Templar Armor"
@@ -577,6 +642,10 @@
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santa_hat_red"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+ )
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEALLHAIR
@@ -589,6 +658,10 @@
name = "Fancy Helmet"
desc = "That's not red paint. That's real blood. DONOR ITEM"
icon_state = "syndicate"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi',
+ )
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEALLHAIR
@@ -596,6 +669,10 @@
name = "Top Penguin Hat"
icon_state = "petehat"
desc = "A hat for a penguin, maybe even the TOP Penguin... DONOR ITEM"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
@@ -609,24 +686,40 @@
name = "Tanya's Beret"
desc = "A bright red beret, owned by Tanya Edenia."
icon_state = "beret_badge"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/robin //CKEY=robin63
name = "Robin Low's Beret"
desc = "A bright red beret, owned by Robin Low."
icon_state = "beret_badge"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/vintage //CKEY=vintagepalmer
name = "Vintage Pimp Hat"
- icon_state = "petehat"
desc = "A pimp hat, for the classic pimp. DONOR ITEM"
+ icon_state = "petehat"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/john56 //CKEY=johnkilla56
name = "Priest hood"
- icon_state = "chaplain_hood"
desc = "Thought I walk through the valley in the shadow of death... Donor Item"
+ icon_state = "chaplain_hood"
+ icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
+ )
/obj/item/clothing/head/helmet/marine/fluff/biolock //CKEY=biolock
name = "M10-Custom"
@@ -638,6 +731,10 @@
name = "Pararescue Beret"
desc = "A Pararescue Beret, issued only to the very best. DONOR ITEM"
icon_state = "beret_badge"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/sas_elite //CKEY=sasoperative (UNIQUE)
@@ -648,14 +745,18 @@
/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"
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|MAP_COLOR_INDEX
/obj/item/clothing/head/helmet/marine/fluff/officialjake
name = "Timothy's Beret"
desc = "A fancy red beret owned by Timothy Seidner. DONOR ITEM"
icon_state = "beret_badge"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/ningajai
@@ -688,6 +789,10 @@
desc = "A hat, very closely affiliated with accusations of people being bad at security... DONOR ITEM" //Add UNIQUE if Unique
icon_state = "detective"
item_state = "detective"
+ icon = 'icons/obj/items/clothing/hats/formal_hats.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/formal_hats.dmi',
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/limo //CKEY=limodish (UNIQUE)
@@ -695,6 +800,10 @@
desc = "It looks like a costume hardsuit helmet. DONOR ITEM"
icon_state = "syndicate"
item_state = "syndicate"
+ icon = 'icons/obj/items/clothing/hats/hazard.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hazard.dmi',
+ )
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEALLHAIR
@@ -725,6 +834,10 @@
desc = "A red beret with a shiny Security badge. DONOR ITEM"
icon_state = "beret_badge"
item_state = "beret_badge"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/fickmacher //CKEY=fickmacher (UNIQUE)
@@ -732,6 +845,10 @@
desc = "A fancy beret. DONOR ITEM"
icon_state = "hosberet"
item_state = "hosberet"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/eastgerman
@@ -739,6 +856,10 @@
desc = "A fancy beret. DONOR ITEM"
icon_state = "hosberet"
item_state = "hosberet"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/chimera //CKEY=theultimatechimera
@@ -746,6 +867,10 @@
desc = "A fancy beret. DONOR ITEM"
icon_state = "hosberet"
item_state = "hosberet"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/lostmixup
@@ -789,6 +914,10 @@
desc = "A fancy red beret owned by Juan 'Rook' Garcia. DONOR ITEM"
icon_state = "beret_badge"
item_state = "beret_badge"
+ icon = 'icons/obj/items/clothing/hats/berets.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/berets.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/chris1464 //CKEY=chris1464
@@ -796,6 +925,10 @@
desc = "Beret from a Mercenary Company. DONOR ITEM"
icon_state = "cargosoft"
item_state = "cargosoft"
+ icon = 'icons/obj/items/clothing/hats/soft_caps.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/soft_caps.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/radical
@@ -842,7 +975,7 @@
desc = "A next generation combat helmet intended to be paired with the M4-X armor. The full faced helmet provides complete light ballistic-resistant protection alongside enchanced acid resistance. This prototype version lacks those features. DONOR ITEM"
icon_state = "steelpoint_helmet"
item_state = "steelpoint_helmet"
- flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|MAP_COLOR_INDEX
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR
@@ -913,6 +1046,10 @@
desc = "A little old and shabby. The color has slightly faded over time. DONOR ITEM"
icon_state = "bluesoft"
item_state = "bluesoft"
+ icon = 'icons/obj/items/clothing/hats/soft_caps.dmi'
+ item_icons = list(
+ WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/soft_caps.dmi'
+ )
flags_inventory = BLOCKSHARPOBJ
/obj/item/clothing/head/helmet/marine/fluff/titus
@@ -959,26 +1096,15 @@
flags_atom = FPRINT|NO_NAME_OVERRIDE|NO_SNOW_TYPE
icon_state = null
item_state = null
+ icon = 'icons/obj/items/clothing/uniforms/donator.dmi'
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
item_icons = list(
- WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/donator.dmi',
)
//END UNIFORM TEMPLATE
-/obj/item/clothing/under/marine/fluff/marinemedic //UNUSED
- name = "Marine Medic jumpsuit"
- desc = "A standard quilted Colonial Marine jumpsuit. Weaved with armored plates to protect against low-caliber rounds and light impacts. Has medical markings. "
- icon_state = "marine_medic"
- worn_state = "marine_medic"
-
-/obj/item/clothing/under/marine/fluff/marineengineer //UNUSED
- name = "Marine Technician jumpsuit"
- desc = "A standard quilted Colonial Marine jumpsuit. Weaved with armored plates to protect against low-caliber rounds and light impacts. Has engineer markings. "
- icon_state = "marine_engineer"
- worn_state = "marine_engineer"
-
/obj/item/clothing/under/marine/fluff/tristan //CKEY=tristan63
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
name = "captain's jumpsuit"
@@ -1004,6 +1130,10 @@
name = "Pink Pride Jumpsuit"
desc = "A jumpsuit for showing your pride in pink... Donor Item"
icon_state = "pink"
+ icon = 'icons/obj/items/clothing/uniforms/jumpsuits.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi',
+ )
worn_state = "pink"
flags_jumpsuit = FALSE
@@ -1026,6 +1156,10 @@
desc = "A jumpsuit that was either once red, or once white and washed with a load of colors... Donor Item"
icon_state = "pink"
worn_state = "pink"
+ icon = 'icons/obj/items/clothing/uniforms/jumpsuits.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi',
+ )
flags_jumpsuit = FALSE
/obj/item/clothing/under/marine/fluff/wooki //CKEY=tophatpenguin (UNIQUE)
@@ -1053,6 +1187,10 @@
name = "Corporate Security Uniform"
desc = "A security jumpsuit, worthy of a Corporate Head of Security. DONOR ITEM" //Add UNIQUE if Unique
icon_state = "hos_corporate"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi',
+ )
worn_state = "hos_corporate"
flags_jumpsuit = FALSE
@@ -1060,6 +1198,10 @@
name = "Selena's Tactical Suit"
desc = "A strange looking black jumpsuit. DONOR ITEM"
icon_state = "robotics"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi',
+ )
worn_state = "robotics"
/obj/item/clothing/under/marine/fluff/gromi
@@ -1115,6 +1257,10 @@
name = "Dress Uniform"
desc = "A Dress uniform, worn by standard marines. DONOR ITEM"
icon_state = "BO_jumpsuit"
+ icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi',
+ )
worn_state = "BO_jumpsuit"
flags_jumpsuit = FALSE
@@ -1221,9 +1367,12 @@
/obj/item/clothing/mask/fluff/totalanarchy //CKEY=totalanarchy
name = "PMC Mask"
desc = "A white colored PMC Mask. DONOR ITEM."
- icon_override = 'icons/mob/humans/onmob/mask.dmi'
item_state = "pmc_mask"
icon_state = "pmc_mask"
+ icon = 'icons/obj/items/clothing/masks/masks_by_faction/WY.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks_by_faction/WY.dmi'
+ )
flags_inventory = COVERMOUTH|ALLOWREBREATH
flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR
@@ -1238,6 +1387,10 @@
desc = "Swat Gas Mask. DONOR ITEM"
icon_state = "swat"
item_state = "swat"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
flags_inventory = ALLOWREBREATH
flags_inv_hide = HIDEEYES|HIDEFACE
@@ -1246,6 +1399,10 @@
desc = "A standard issue gas mask. DONOR ITEM"
icon_state = "swat"
item_state = "swat"
+ icon = 'icons/obj/items/clothing/masks/gasmasks.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/gasmasks.dmi'
+ )
flags_inventory = ALLOWREBREATH
flags_inv_hide = HIDEEYES|HIDEFACE
@@ -1270,6 +1427,10 @@
desc = "It's a g-g-g-g-g-ghost cigar. DONOR ITEM" //Add UNIQUE if Unique
icon_state = "cigar_on"
item_state = "cigar_on"
+ icon = 'icons/obj/items/smoking/cigars.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/smoking.dmi'
+ )
flags_inventory = ALLOWREBREATH
flags_inv_hide = HIDEFACE
@@ -1323,12 +1484,22 @@
desc = "A large backpack, used by Tanya Edenia. DONOR ITEM"
icon_state = "securitypack"
item_state = "securitypack"
+ has_gamemode_skin = FALSE
+ icon = 'icons/obj/items/clothing/backpack/backpacks.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks.dmi'
+ )
/obj/item/storage/backpack/marine/fluff/mitii
name = "Mya's Backpack"
desc = "A large security backpack, with a radio booster. Donor Item"
icon_state = "securitypack"
item_state = "securitypack"
+ has_gamemode_skin = FALSE
+ icon = 'icons/obj/items/clothing/backpack/backpacks.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks.dmi'
+ )
/obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE)
name = "tactical radiopack"
@@ -1340,7 +1511,7 @@
/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
+ flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|MAP_COLOR_INDEX
icon_state = "skinnerrangerpack"
item_state = "skinnerrangerpack"
@@ -1361,17 +1532,23 @@
desc = "Belt worn by the dreaded Commissars of Omega Team. UNIQUE DONOR ITEM"
icon_state = "swordbelt_u"
item_state = "swordbelt_u"
+ icon = 'icons/obj/items/clothing/belts/donator.dmi'
+ item_icons = list(
+ WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/donator.dmi',
+ )
+ has_gamemode_skin = FALSE
//CUSTOM ITEMS - NO TEMPLATES - ALL UNIQUE ////////////////////////
/obj/item/tool/lighter/zippo/fluff/ghostdex //CKEY=ghostdex
name = "purple zippo lighter"
desc = "A Purple Zippo lighter, engraved with the name John Donable... UNIQUE DONOR ITEM."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/smoking/lighters.dmi'
icon_state = "bluezippo"
/obj/item/clothing/mask/cigarette/fluff/ghostdex //CKEY=ghostdex
name = "XXX's custom Cigar"
desc = "A custom rolled giant, made specifically for John Donable in the best, hottest, and most abusive of Cuban sweat shops. UNIQUE DONOR ITEM."
+ icon = 'icons/obj/items/smoking/cigars.dmi'
icon_state = "cigar2_off"
icon_on = "cigar2_on"
icon_off = "cigar_2off"
diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm
index 6e11181e249e..f134db327218 100644
--- a/code/modules/cm_marines/equipment/gear.dm
+++ b/code/modules/cm_marines/equipment/gear.dm
@@ -149,6 +149,7 @@
return FALSE
. = ..()
handle_cloaking()
+
/obj/structure/broken_apc
name = "\improper M577 armored personnel carrier"
desc = "A large, armored behemoth capable of ferrying marines around. \nThis one is sitting nonfunctional."
@@ -191,6 +192,7 @@
name = "stale USCM protein bar"
desc = "The most fake-looking protein bar you have ever laid eyes on, covered in a substitution chocolate. The powder used to make these is a substitute of a substitute of whey substitute."
icon_state = "yummers"
+ icon = 'icons/obj/items/food/mre_food.dmi'
filling_color = "#ED1169"
w_class = SIZE_TINY
@@ -203,6 +205,7 @@
/obj/item/reagent_container/food/snacks/mre_pack
name = "\improper generic MRE pack"
//trash = /obj/item/trash/USCMtray
+ icon = 'icons/obj/items/food/trays.dmi'
trash = null
w_class = SIZE_SMALL
diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm
index 161be4813832..1e8036ef41da 100644
--- a/code/modules/cm_marines/equipment/mortar/mortars.dm
+++ b/code/modules/cm_marines/equipment/mortar/mortars.dm
@@ -410,6 +410,10 @@
icon_state = "mortar_m402_carry"
unacidable = TRUE
w_class = SIZE_HUGE //No dumping this in a backpack. Carry it, fatso
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
+ )
/obj/item/mortar_kit/Initialize(...)
. = ..()
diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm
index b600f9fb67cb..d6fa1e858c02 100644
--- a/code/modules/cm_phone/phone.dm
+++ b/code/modules/cm_phone/phone.dm
@@ -392,7 +392,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter)
/obj/item/phone
name = "telephone"
- icon = 'icons/obj/items/misc.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "rpb_phone"
w_class = SIZE_LARGE
diff --git a/code/modules/cm_preds/thrall_procs.dm b/code/modules/cm_preds/thrall_procs.dm
index cf430bd05639..75d2046cb4ed 100644
--- a/code/modules/cm_preds/thrall_procs.dm
+++ b/code/modules/cm_preds/thrall_procs.dm
@@ -25,7 +25,7 @@
var/sure = alert("An array of powerful weapons are displayed to you. Pick your gear carefully. If you cancel at any point, you will not claim your equipment.","Sure?","Begin the Hunt","No, not now")
if(sure == "Begin the Hunt")
- var/list/hmelee = list(YAUTJA_THRALL_GEAR_MACHETE = image(icon = 'icons/obj/items/weapons/weapons.dmi', icon_state = "machete"), YAUTJA_THRALL_GEAR_RAPIER = image(icon = 'icons/obj/items/weapons/weapons.dmi', icon_state = "ceremonial"), YAUTJA_THRALL_GEAR_CLAYMORE = image(icon = 'icons/obj/items/weapons/weapons.dmi', icon_state = "mercsword"), YAUTJA_THRALL_GEAR_FIREAXE = image(icon = 'icons/obj/items/weapons/weapons.dmi', icon_state = "fireaxe"))
+ var/list/hmelee = list(YAUTJA_THRALL_GEAR_MACHETE = image(icon = 'icons/obj/items/weapons/melee/swords.dmi', icon_state = "machete"), YAUTJA_THRALL_GEAR_RAPIER = image(icon = 'icons/obj/items/weapons/melee/knives.dmi', icon_state = "ceremonial"), YAUTJA_THRALL_GEAR_CLAYMORE = image(icon = 'icons/obj/items/weapons/melee/swords.dmi', icon_state = "mercsword"), YAUTJA_THRALL_GEAR_FIREAXE = image(icon = 'icons/obj/items/weapons/melee/axes.dmi', icon_state = "fireaxe"))
var/list/ymelee = list(YAUTJA_GEAR_GLAIVE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "glaive"), YAUTJA_GEAR_WHIP = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "whip"), YAUTJA_GEAR_SWORD = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "clansword"), YAUTJA_GEAR_SCYTHE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "predscythe"), YAUTJA_GEAR_STICK = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "combistick"), YAUTJA_GEAR_SPEAR = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "spearhunter"))
var/main_weapon
diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm
index 06600ca55645..6356e73dbc96 100644
--- a/code/modules/cm_preds/yaut_items.dm
+++ b/code/modules/cm_preds/yaut_items.dm
@@ -994,6 +994,7 @@
name = "How did you get this?"
desc = "A bone from a human."
icon = 'icons/obj/items/skeleton.dmi'
+ inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/yautja.dmi'
accessory_icons = list(WEAR_BODY = 'icons/mob/humans/onmob/hunter/pred_gear.dmi')
icon_state = null
slot = ACCESSORY_SLOT_TROPHY
diff --git a/code/modules/cm_tech/implements/adv_weapon.dm b/code/modules/cm_tech/implements/adv_weapon.dm
index c5165967642e..3c1d5d78e720 100644
--- a/code/modules/cm_tech/implements/adv_weapon.dm
+++ b/code/modules/cm_tech/implements/adv_weapon.dm
@@ -3,7 +3,7 @@
name = "advanced weapon kit"
desc = "It seems to be a kit to choose an advanced weapon"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "wrench"
var/gun_type = /obj/item/weapon/gun/shotgun/pump
@@ -26,7 +26,7 @@
name = "advanced weapon kit"
desc = "It seems to be a kit to choose an advanced weapon"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "wrench"
gun_type = /obj/item/weapon/gun/rifle/techweb_railgun
diff --git a/code/modules/cm_tech/implements/armor.dm b/code/modules/cm_tech/implements/armor.dm
index 5ed344a42d8b..51c2499f6972 100644
--- a/code/modules/cm_tech/implements/armor.dm
+++ b/code/modules/cm_tech/implements/armor.dm
@@ -2,7 +2,7 @@
/obj/item/clothing/accessory/health
name = "armor plate"
desc = "A metal trauma plate, able to absorb some blows."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/ceramic_plates.dmi'
icon_state = "regular2_100"
var/base_icon_state = "regular2"
@@ -205,6 +205,7 @@
desc = "Attachment to the uniform which gives X (this shouldn't be in your handdssss)"
is_armor = FALSE
icon_state = "plate_research"
+ icon = 'icons/obj/items/devices.dmi'
var/obj/item/clothing/attached_uni
///can the plate be recycled after X condition? 0 means it cannot be recycled, otherwise put in the biomass points to refund.
var/recyclable_value = 0
@@ -371,7 +372,7 @@
action_icon_state = "plate_research"
button.name = name
button.overlays.Cut()
- button.overlays += image('icons/obj/items/items.dmi', button, action_icon_state)
+ button.overlays += image('icons/obj/items/devices.dmi', button, action_icon_state)
/obj/item/clothing/accessory/health/research_plate/emergency_injector/ui_action_click(mob/owner, obj/item/holder)
if(used)
diff --git a/code/modules/cm_tech/implements/implants.dm b/code/modules/cm_tech/implements/implants.dm
index 44c817d5ee5a..ffa55114301e 100644
--- a/code/modules/cm_tech/implements/implants.dm
+++ b/code/modules/cm_tech/implements/implants.dm
@@ -49,7 +49,7 @@
/obj/item/device/implanter
name = "implanter"
desc = "An injector that drives an implant into your body. The injection stings quite badly."
- icon = 'icons/obj/items/devices.dmi'
+ icon = 'icons/obj/items/syringe.dmi'
icon_state = "implanter"
w_class = SIZE_SMALL
diff --git a/code/modules/cm_tech/implements/medical_czsp.dm b/code/modules/cm_tech/implements/medical_czsp.dm
index 69bb90b3ee13..8ed9d6c2b927 100644
--- a/code/modules/cm_tech/implements/medical_czsp.dm
+++ b/code/modules/cm_tech/implements/medical_czsp.dm
@@ -137,7 +137,7 @@
/obj/item/weapon/gun/pill
name = "pill gun"
desc = "A spring-loaded rifle designed to fit pills, designed to inject patients from a distance."
- icon = 'icons/obj/items/weapons/guns/legacy/old_cmguns.dmi'
+ icon = 'icons/obj/items/weapons/guns/guns_by_faction/event.dmi'
icon_state = "syringegun"
item_state = "syringegun"
w_class = SIZE_MEDIUM
diff --git a/code/modules/decorators/christmas.dm b/code/modules/decorators/christmas.dm
index 290ac6302448..6aa252177d7e 100644
--- a/code/modules/decorators/christmas.dm
+++ b/code/modules/decorators/christmas.dm
@@ -47,8 +47,8 @@
return
helmet.name = "\improper USCM [helmet.specialty] santa hat"
helmet.desc = "Ho ho ho, Merry Christmas!"
- helmet.icon = 'icons/obj/items/clothing/hats.dmi'
- helmet.icon_override = 'icons/mob/humans/onmob/head_0.dmi'
+ helmet.icon = 'icons/obj/items/clothing/hats/hats.dmi'
+ helmet.icon_override = 'icons/mob/humans/onmob/clothing/head/hats.dmi'
helmet.flags_inv_hide = HIDEEARS|HIDEALLHAIR
helmet.flags_marine_helmet = NO_FLAGS
helmet.flags_atom |= NO_SNOW_TYPE|NO_NAME_OVERRIDE
diff --git a/code/modules/defenses/bell_tower.dm b/code/modules/defenses/bell_tower.dm
index 7ce252b3f4d7..fa904092c0da 100644
--- a/code/modules/defenses/bell_tower.dm
+++ b/code/modules/defenses/bell_tower.dm
@@ -223,7 +223,10 @@
/obj/item/storage/backpack/imp
name = "IMP frame mount"
- icon = 'icons/obj/items/clothing/backpacks.dmi'
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi'
+ item_icons = list(
+ WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi'
+ )
icon_state = "bell_backpack"
max_storage_space = 10
worn_accessible = TRUE
diff --git a/code/modules/defenses/planted_flag.dm b/code/modules/defenses/planted_flag.dm
index d44f22f38b68..40db224f8e7f 100644
--- a/code/modules/defenses/planted_flag.dm
+++ b/code/modules/defenses/planted_flag.dm
@@ -151,7 +151,7 @@
/obj/item/storage/backpack/jima
name = "JIMA frame mount"
- icon = 'icons/obj/items/clothing/backpacks.dmi'
+ icon = 'icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi'
icon_state = "flag_backpack"
max_storage_space = 10
worn_accessible = TRUE
diff --git a/code/modules/desert_dam/filtration/filtration.dm b/code/modules/desert_dam/filtration/filtration.dm
index c289ae878bad..fcb23328723e 100644
--- a/code/modules/desert_dam/filtration/filtration.dm
+++ b/code/modules/desert_dam/filtration/filtration.dm
@@ -263,7 +263,7 @@ Each var depends on others
/obj/structure/machinery/filtration_button
name = "\improper Filtration Activation"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/stationobjs.dmi'
icon_state = "launcherbtt"
desc = "Activates the filtration mechanism."
var/id = null
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index b5489f192287..6e98b4c485d7 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -2,7 +2,7 @@
name = "15 dollars"
desc = "You have 15 dollars."
gender = PLURAL
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/economy.dmi'
icon_state = "spacecash1"
opacity = FALSE
density = FALSE
@@ -69,14 +69,14 @@
while(sum >= i && num < 50)
sum -= i
num++
- var/image/banknote = image('icons/obj/items/items.dmi', "spacecash[i]")
+ var/image/banknote = image('icons/obj/items/economy.dmi', "spacecash[i]")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
banknote.transform = M
overlays += banknote
if(num == 0) // Less than one thaler, let's just make it look like 1 for ease
- var/image/banknote = image('icons/obj/items/items.dmi', "spacecash1")
+ var/image/banknote = image('icons/obj/items/economy.dmi', "spacecash1")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 4573052c29df..7c3daf03e1fb 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -59,8 +59,8 @@ Gunshots/explosions/opening doors/less rare audio (done)
halitem.layer = 50
switch(rand(1,6))
if(1) //revolver
- halitem.icon = 'icons/obj/items/weapons/guns/legacy/old_bayguns.dmi'
- halitem.icon_state = "revolver"
+ halitem.icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
+ halitem.icon_state = "m44r"
halitem.name = "Revolver"
if(2) //c4
halitem.icon = 'icons/obj/items/assemblies.dmi'
@@ -69,11 +69,11 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(prob(25))
halitem.icon_state = "c4small_1"
if(3) //sword
- halitem.icon = 'icons/obj/items/weapons/weapons.dmi'
+ halitem.icon = 'icons/obj/items/weapons/melee/swords.dmi'
halitem.icon_state = "sword1"
halitem.name = "Sword"
if(4) //stun baton
- halitem.icon = 'icons/obj/items/weapons/weapons.dmi'
+ halitem.icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
halitem.icon_state = "stunbaton"
halitem.name = "Stun Baton"
if(5) //emag
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index 0d457036ce9d..2ba777869462 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -423,7 +423,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/MP/provost/marshal(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index 0bc77ed2130f..5b2f80633aa0 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -4,7 +4,7 @@
/obj/item/grown // Grown things that are not edible
name = "grown_weapon"
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/harvest.dmi'
var/plantname
var/potency = 1
@@ -79,7 +79,7 @@
/obj/item/grown/nettle // -- Skie
plantname = "nettle"
desc = "It's probably not wise to touch it with bare hands..."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/harvest.dmi'
name = "nettle"
icon_state = "nettle"
damtype = "fire"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 91ed3dad21d1..2a16ed7ef140 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -502,7 +502,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
for(var/i in 1 to length(marine_helmet.helmet_overlays))
// Add small numbers to the head garb layer so we don't have a layer conflict
// the i-1 bit is to make it 0-based, not 1-based like BYOND wants
- overlays_standing[HEAD_GARB_LAYER + (i-1)] = image('icons/mob/humans/onmob/helmet_garb.dmi', src, marine_helmet.helmet_overlays[i])
+ // overlays_standing[HEAD_GARB_LAYER + (i-1)] = image('icons/mob/humans/onmob/helmet_garb.dmi', src, marine_helmet.helmet_overlays[i])
num_helmet_overlays++
// null out the rest of the space allocated for helmet overlays
@@ -587,8 +587,6 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
update_inv_shoes()
update_inv_gloves()
- update_collar()
-
/mob/living/carbon/human/update_inv_pockets()
@@ -715,20 +713,6 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
return tail_icon
-
-//Adds a collar overlay above the helmet layer if the suit has one
-// Suit needs an identically named sprite in icons/mob/collar.dmi
-/mob/living/carbon/human/proc/update_collar()
- remove_overlay(COLLAR_LAYER)
- if(!istype(wear_suit,/obj/item/clothing/suit))
- return
- var/obj/item/clothing/suit/S = wear_suit
- var/image/I = S.get_collar()
- if(I)
- I.layer = -COLLAR_LAYER
- overlays_standing[COLLAR_LAYER] = I
- apply_overlay(COLLAR_LAYER)
-
/mob/living/carbon/human/update_burst()
remove_overlay(BURST_LAYER)
var/image/standing
diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
index 4f71d8c43ce1..37fbbf69338b 100644
--- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
@@ -3,7 +3,7 @@
/obj/item/alien_embryo
name = "alien embryo"
desc = "All slimy and yucky."
- icon = 'icons/mob/xenos/larva.dmi'
+ icon = 'icons/mob/xenos/castes/tier_0/larva.dmi'
icon_state = "Embryo"
var/mob/living/affected_mob
var/stage = 0
diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
index 2535917d3d61..003ed94f1e75 100644
--- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
@@ -8,6 +8,9 @@
name = "facehugger"
desc = "It has some sort of a tube at the end of its tail."
icon = 'icons/mob/xenos/effects.dmi'
+ item_icons = list(
+ WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi'
+ )
icon_state = "facehugger"
item_state = "facehugger"
w_class = SIZE_TINY //Note: can be picked up by aliens unlike most other items of w_class below 4
@@ -43,7 +46,7 @@
var/death_timer
var/icon_xeno = 'icons/mob/xenos/effects.dmi'
- var/icon_xenonid = 'icons/mob/xenonids/xenonid_crab.dmi'
+ var/icon_xenonid = 'icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi'
/obj/item/clothing/mask/facehugger/Initialize(mapload, hive)
. = ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm
index f7e906a82b28..e239e5023e64 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm
@@ -41,7 +41,7 @@
caste_type = XENO_CASTE_BOILER
name = XENO_CASTE_BOILER
desc = "A huge, grotesque xenomorph covered in glowing, oozing acid slime."
- icon = 'icons/mob/xenos/boiler.dmi'
+ icon = 'icons/mob/xenos/castes/tier_3/boiler.dmi'
icon_size = 64
icon_state = "Boiler Walking"
plasma_types = list(PLASMA_NEUROTOXIN)
@@ -55,8 +55,8 @@
tileoffset = 3
viewsize = 7
- icon_xeno = 'icons/mob/xenos/boiler.dmi'
- icon_xenonid = 'icons/mob/xenonids/boiler.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_3/boiler.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_3/boiler.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Boiler_1","Boiler_2","Boiler_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm
index 106dcdcacb62..8efbd30866f9 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm
@@ -41,7 +41,7 @@
caste_type = XENO_CASTE_BURROWER
name = XENO_CASTE_BURROWER
desc = "A beefy alien with sharp claws."
- icon = 'icons/mob/xenos/burrower.dmi'
+ icon = 'icons/mob/xenos/castes/tier_2/burrower.dmi'
icon_size = 64
icon_state = "Burrower Walking"
layer = MOB_LAYER
@@ -76,8 +76,8 @@
/mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher,
)
- icon_xeno = 'icons/mob/xenos/burrower.dmi'
- icon_xenonid = 'icons/mob/xenonids/burrower.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_2/burrower.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_2/burrower.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Burrower_1","Burrower_2","Burrower_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm
index a2a1a29db2c2..a6847d010fd2 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm
@@ -47,7 +47,7 @@
name = XENO_CASTE_CARRIER
desc = "A strange-looking alien creature. It carries a number of scuttling jointed crablike creatures."
icon_size = 64
- icon_xeno = 'icons/mob/xenos/carrier.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_2/carrier.dmi'
icon_state = "Carrier Walking"
plasma_types = list(PLASMA_PURPLE)
@@ -80,7 +80,7 @@
/mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher,
)
- icon_xenonid = 'icons/mob/xenonids/carrier.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_2/carrier.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Carrier_1","Carrier_2","Carrier_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm
index a84b9965f9c3..cfa85a7a914e 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm
@@ -65,8 +65,8 @@
claw_type = CLAW_TYPE_VERY_SHARP
- icon_xeno = 'icons/mob/xenos/crusher.dmi'
- icon_xenonid = 'icons/mob/xenonids/crusher.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_3/crusher.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_3/crusher.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Crusher_1","Crusher_2","Crusher_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm
index 548b0389e683..41dcf1931ef2 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm
@@ -32,7 +32,7 @@
caste_type = XENO_CASTE_DEFENDER
name = XENO_CASTE_DEFENDER
desc = "A alien with an armored crest."
- icon = 'icons/mob/xenos/defender.dmi'
+ icon = 'icons/mob/xenos/castes/tier_1/defender.dmi'
icon_size = 64
icon_state = "Defender Walking"
plasma_types = list(PLASMA_CHITIN)
@@ -53,8 +53,8 @@
/datum/action/xeno_action/onclick/tacmap,
)
- icon_xeno = 'icons/mob/xenos/defender.dmi'
- icon_xenonid = 'icons/mob/xenonids/defender.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_1/defender.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_1/defender.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Defender_1","Defender_2","Defender_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm
index 12d94f0d5ec2..d5637cf32356 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm
@@ -48,7 +48,7 @@
caste_type = XENO_CASTE_DRONE
name = XENO_CASTE_DRONE
desc = "An alien drone"
- icon = 'icons/mob/xenos/drone.dmi'
+ icon = 'icons/mob/xenos/castes/tier_1/drone.dmi'
icon_size = 48
icon_state = "Drone Walking"
plasma_types = list(PLASMA_PURPLE)
@@ -76,8 +76,8 @@
/mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher,
)
- icon_xeno = 'icons/mob/xenos/drone.dmi'
- icon_xenonid = 'icons/mob/xenonids/drone.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_1/drone.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_1/drone.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_48x48.dmi'
weed_food_states = list("Drone_1","Drone_2","Drone_3")
weed_food_states_flipped = list("Drone_1","Drone_2","Drone_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
index 43c5b78514af..913c6f1b39ea 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
@@ -61,8 +61,8 @@
/mob/living/carbon/xenomorph/proc/vent_crawl,
)
- icon_xeno = 'icons/mob/xenos/facehugger.dmi'
- icon_xenonid = 'icons/mob/xenonids/facehugger.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_0/facehugger.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_48x48.dmi'
weed_food_states = list("Facehugger_1","Facehugger_2","Facehugger_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm
index b49712527973..b58f802ecd08 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm
@@ -35,7 +35,7 @@
caste_type = XENO_CASTE_HELLHOUND
name = XENO_CASTE_HELLHOUND
desc = "A disgusting beast from hell, it has four menacing spikes growing from its head."
- icon = 'icons/mob/xenos/hellhound.dmi'
+ icon = 'icons/mob/xenos/castes/hellhound.dmi'
icon_state = "Hellhound Walking"
icon_size = 32
layer = MOB_LAYER
@@ -67,8 +67,8 @@
/mob/living/carbon/xenomorph/proc/vent_crawl,
)
- icon_xeno = 'icons/mob/xenos/hellhound.dmi'
- icon_xenonid = 'icons/mob/xenos/hellhound.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/hellhound.dmi'
+ icon_xenonid = 'icons/mob/xenos/castes/hellhound.dmi'
weed_food_icon = 'icons/mob/xenos/weeds.dmi'
weed_food_states = list("Hellhound_1","Hellhound_2","Hellhound_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm
index 8024ed366405..e2687c8379f5 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm
@@ -47,7 +47,7 @@
caste_type = XENO_CASTE_HIVELORD
name = XENO_CASTE_HIVELORD
desc = "A builder of really big hives."
- icon = 'icons/mob/xenos/hivelord.dmi'
+ icon = 'icons/mob/xenos/castes/tier_2/hivelord.dmi'
icon_size = 64
icon_state = "Hivelord Walking"
plasma_types = list(PLASMA_PURPLE,PLASMA_PHEROMONE)
@@ -80,8 +80,8 @@
/mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher,
)
- icon_xeno = 'icons/mob/xenos/hivelord.dmi'
- icon_xenonid = 'icons/mob/xenonids/hivelord.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_2/hivelord.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_2/hivelord.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Hivelord_1","Hivelord_2","Hivelord_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
index 3f873f3635c3..9c7ba6135513 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
@@ -54,8 +54,8 @@
var/state_override
var/is_bloody = TRUE //We're still "bloody"
- icon_xeno = 'icons/mob/xenos/larva.dmi'
- icon_xenonid = 'icons/mob/xenonids/larva.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_0/larva.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_0/larva.dmi'
/mob/living/carbon/xenomorph/larva/Life()
if(is_bloody && (evolution_stored >= evolution_threshold / 2)) //We're no longer bloody so update our name...
@@ -102,7 +102,7 @@
/mob/living/carbon/xenomorph/larva/predalien
AUTOWIKI_SKIP(TRUE)
- icon_xeno = 'icons/mob/xenos/predalien_larva.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_0/predalien_larva.dmi'
icon_state = "Predalien Larva"
caste_type = XENO_CASTE_PREDALIEN_LARVA
burrowable = FALSE //Not interchangeable with regular larvas in the hive core.
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
index 1dca7eb23f70..e47e94dc2483 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
@@ -57,8 +57,8 @@
tackle_min = 2
tackle_max = 6
- icon_xeno = 'icons/mob/xenos/lurker.dmi'
- icon_xenonid = 'icons/mob/xenonids/lurker.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_2/lurker.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_2/lurker.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_48x48.dmi'
weed_food_states = list("Drone_1","Drone_2","Drone_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm
index 70d33b905a00..b8730fac6f0b 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm
@@ -67,8 +67,8 @@
/datum/action/xeno_action/onclick/tacmap,
)
- icon_xeno = 'icons/mob/xenos/praetorian.dmi'
- icon_xenonid = 'icons/mob/xenonids/praetorian.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_3/praetorian.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_3/praetorian.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Praetorian_1","Praetorian_2","Praetorian_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm
index c6194a44012a..d658d2e83195 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm
@@ -35,9 +35,9 @@
caste_type = XENO_CASTE_PREDALIEN
name = "Abomination" //snowflake name
desc = "A strange looking creature with fleshy strands on its head. It appears like a mixture of armor and flesh, smooth, but well carapaced."
- icon = 'icons/mob/xenos/predalien.dmi'
- icon_xeno = 'icons/mob/xenos/predalien.dmi'
- icon_xenonid = 'icons/mob/xenos/predalien.dmi'
+ icon = 'icons/mob/xenos/castes/tier_4/predalien.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_4/predalien.dmi'
+ icon_xenonid = 'icons/mob/xenos/castes/tier_4/predalien.dmi'
icon_state = "Predalien Walking"
speaking_noise = 'sound/voice/predalien_click.ogg'
plasma_types = list(PLASMA_CATECHOLAMINE)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index cb351c50766c..952dcd280ba9 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -276,8 +276,8 @@
pull_speed = 3 //screech/neurodragging is cancer, at the very absolute least get some runner to do it for teamwork
organ_value = 8000 // queen is expensive
- icon_xeno = 'icons/mob/xenos/queen.dmi'
- icon_xenonid = 'icons/mob/xenonids/queen.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_4/queen.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_4/queen.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Queen_1","Queen_2","Queen_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm
index eefbc74b03b1..937f8bd44297 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm
@@ -40,7 +40,7 @@
caste_type = XENO_CASTE_RAVAGER
name = XENO_CASTE_RAVAGER
desc = "A huge, nasty red alien with enormous scythed claws."
- icon = 'icons/mob/xenos/ravager.dmi'
+ icon = 'icons/mob/xenos/castes/tier_3/ravager.dmi'
icon_size = 64
icon_state = "Ravager Walking"
plasma_types = list(PLASMA_CATECHOLAMINE)
@@ -62,8 +62,8 @@
/datum/action/xeno_action/onclick/tacmap,
)
- icon_xeno = 'icons/mob/xenos/ravager.dmi'
- icon_xenonid = 'icons/mob/xenonids/ravager.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_3/ravager.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_3/ravager.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Ravager_1","Ravager_2","Ravager_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
index 12fdb8d02843..7efc4d7251b5 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
@@ -35,7 +35,7 @@
caste_type = XENO_CASTE_RUNNER
name = XENO_CASTE_RUNNER
desc = "A small red alien that looks like it could run fairly quickly..."
- icon = 'icons/mob/xenos/runner.dmi'
+ icon = 'icons/mob/xenos/castes/tier_1/runner.dmi'
icon_state = "Runner Walking"
icon_size = 64
layer = MOB_LAYER
@@ -66,8 +66,8 @@
/mob/living/carbon/xenomorph/proc/vent_crawl,
)
- icon_xeno = 'icons/mob/xenos/runner.dmi'
- icon_xenonid = 'icons/mob/xenonids/runner.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_1/runner.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_1/runner.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Runner_1","Runner_2","Runner_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm
index 3693b2174f12..085b2805dc29 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm
@@ -55,8 +55,8 @@
/mob/living/carbon/xenomorph/proc/vent_crawl,
)
- icon_xeno = 'icons/mob/xenos/sentinel.dmi'
- icon_xenonid = 'icons/mob/xenonids/sentinel.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_1/sentinel.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_1/sentinel.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_48x48.dmi'
weed_food_states = list("Drone_1","Drone_2","Drone_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm
index 006f66b7f1b2..7a9ecea9c21b 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm
@@ -57,8 +57,8 @@
/mob/living/carbon/xenomorph/proc/vent_crawl,
)
- icon_xeno = 'icons/mob/xenos/spitter.dmi'
- icon_xenonid = 'icons/mob/xenonids/spitter.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_2/spitter.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_2/spitter.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_48x48.dmi'
weed_food_states = list("Drone_1","Drone_2","Drone_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
index 2885dd6ac553..9f19213b19a4 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
@@ -35,7 +35,7 @@
caste_type = XENO_CASTE_WARRIOR
name = XENO_CASTE_WARRIOR
desc = "A beefy alien with an armored carapace."
- icon = 'icons/mob/xenos/warrior.dmi'
+ icon = 'icons/mob/xenos/castes/tier_2/warrior.dmi'
icon_size = 64
icon_state = "Warrior Walking"
plasma_types = list(PLASMA_CATECHOLAMINE)
@@ -57,8 +57,8 @@
claw_type = CLAW_TYPE_SHARP
- icon_xeno = 'icons/mob/xenos/warrior.dmi'
- icon_xenonid = 'icons/mob/xenonids/warrior.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_2/warrior.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_2/warrior.dmi'
weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi'
weed_food_states = list("Warrior_1","Warrior_2","Warrior_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
index 9be9e21fd983..531f7f2d9b14 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
@@ -41,7 +41,7 @@
caste_type = XENO_CASTE_LESSER_DRONE
name = XENO_CASTE_LESSER_DRONE
desc = "An alien drone. Looks... smaller."
- icon = 'icons/mob/xenos/drone.dmi'
+ icon = 'icons/mob/xenos/castes/tier_1/drone.dmi'
icon_size = 48
icon_state = "Lesser Drone Walking"
plasma_types = list(PLASMA_PURPLE)
@@ -75,8 +75,8 @@
/mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher,
)
- icon_xeno = 'icons/mob/xenos/lesser_drone.dmi'
- icon_xenonid = 'icons/mob/xenonids/lesser_drone.dmi'
+ icon_xeno = 'icons/mob/xenos/castes/tier_0/lesser_drone.dmi'
+ icon_xenonid = 'icons/mob/xenonids/castes/tier_0/lesser_drone.dmi'
weed_food_icon = 'icons/mob/xenos/weeds.dmi'
weed_food_states = list("Lesser_Drone_1","Lesser_Drone_2","Lesser_Drone_3")
diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm
index ebf58133308f..3d3edc166657 100644
--- a/code/modules/mob/living/carbon/xenomorph/death.dm
+++ b/code/modules/mob/living/carbon/xenomorph/death.dm
@@ -158,7 +158,7 @@
src_boiler.smoke.set_up(2, 0, get_turf(src), new_cause_data = src_boiler.smoke.cause_data)
src_boiler.smoke.start()
if(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA)
- icon_path = 'icons/mob/xenos/larva.dmi'
+ icon_path = 'icons/mob/xenos/castes/tier_0/larva.dmi'
remains.icon_state = gib_state
remains.icon = icon_path
@@ -181,7 +181,7 @@
if(XENO_CASTE_BOILER)
to_flick = "gibbed-a-boiler"
if(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA)
- icon_path = 'icons/mob/xenos/larva.dmi'
+ icon_path = 'icons/mob/xenos/castes/tier_0/larva.dmi'
to_flick = "larva_gib"
new /obj/effect/overlay/temp/gib_animation/xeno(loc, src, to_flick, icon_path)
diff --git a/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm b/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm
index 4c63fc2b5923..a23fc9dc52f6 100644
--- a/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm
+++ b/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm
@@ -1,7 +1,7 @@
/obj/item/iff_tag
name = "xenomorph IFF tag"
desc = "A tag containing a small IFF computer that gets inserted into the carapace of a xenomorph. You can modify the IFF groups by using an access tuner on it, or on the xeno if it's already implanted."
- icon = 'icons/obj/items/xeno_tag.dmi'
+ icon = 'icons/obj/items/Marine_Research.dmi'
icon_state = "xeno_tag"
var/list/faction_groups = list()
@@ -61,7 +61,7 @@
/obj/item/storage/xeno_tag_case
name = "xenomorph tag case"
desc = "A sturdy case designed to store and charge xenomorph IFF tags. Provided by the Wey-Yu Research and Data(TM) Division."
- icon = 'icons/obj/items/xeno_tag.dmi'
+ icon = 'icons/obj/items/Marine_Research.dmi'
icon_state = "tag_box"
use_sound = "toolbox"
storage_slots = 8
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm
index da331f0f6568..87b8aeafc49e 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm
@@ -362,7 +362,7 @@
/datum/behavior_delegate/drone_gardener/on_update_icons()
if(!fruit_sac_overlay_icon)
- fruit_sac_overlay_icon = mutable_appearance('icons/mob/xenos/drone_strain_overlays.dmi', "Gardener Drone Walking")
+ fruit_sac_overlay_icon = mutable_appearance('icons/mob/xenos/castes/tier_1/drone_strain_overlays.dmi', "Gardener Drone Walking")
bound_xeno.overlays -= fruit_sac_overlay_icon
fruit_sac_overlay_icon.overlays.Cut()
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
index 20006eaacbca..ec4cc78d25b0 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
@@ -151,7 +151,7 @@
/datum/behavior_delegate/drone_healer/on_update_icons()
if(!salve_applied_icon)
- salve_applied_icon = mutable_appearance('icons/mob/xenos/drone_strain_overlays.dmi',"Healer Drone Walking")
+ salve_applied_icon = mutable_appearance('icons/mob/xenos/castes/tier_1/drone_strain_overlays.dmi',"Healer Drone Walking")
bound_xeno.overlays -= salve_applied_icon
salve_applied_icon.overlays.Cut()
diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
index 64f9949e94cd..d6de17f4ba33 100644
--- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm
+++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
@@ -33,13 +33,13 @@
if(isqueen(src))
var/mob/living/carbon/xenomorph/queen/Q = src
Q.queen_standing_icon = icon_xenonid
- Q.queen_ovipositor_icon = 'icons/mob/xenonids/ovipositor.dmi'
+ Q.queen_ovipositor_icon = 'icons/mob/xenonids/castes/tier_4/ovipositor.dmi'
else
icon = icon_xeno
if(isqueen(src))
var/mob/living/carbon/xenomorph/queen/Q = src
Q.queen_standing_icon = icon_xeno
- Q.queen_ovipositor_icon = 'icons/mob/xenos/ovipositor.dmi'
+ Q.queen_ovipositor_icon = 'icons/mob/xenos/castes/tier_4/ovipositor.dmi'
var/mutation_caste_state = "[get_strain_icon()] [caste.caste_type]"
if(!walking_state_cache[mutation_caste_state])
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 5b896203a704..1149a8e912a9 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -23,7 +23,6 @@
dead_black_market_value = 0
var/obj/item/inventory_head
var/obj/item/inventory_back
- var/facehugger
//IAN! SQUEEEEEEEEE~
/mob/living/simple_animal/corgi/Ian
@@ -137,12 +136,6 @@
if(back_icon)
overlays += back_icon
- if(facehugger)
- if(istype(src, /mob/living/simple_animal/corgi/puppy))
- overlays += image('icons/mob/humans/onmob/mask.dmi',"facehugger_corgipuppy")
- else
- overlays += image('icons/mob/humans/onmob/mask.dmi',"facehugger_corgi")
-
return
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index b89c956737e1..cefa07344353 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -2,7 +2,7 @@
name = "Drone"
var/caste_name = null
desc = "A builder of hives. Only drones may evolve into Queens."
- icon = 'icons/mob/xenos/drone.dmi'
+ icon = 'icons/mob/xenos/castes/tier_1/drone.dmi'
icon_gib = "syndicate_gib"
layer = BIG_XENO_LAYER
response_help = "pokes"
@@ -155,7 +155,7 @@
/mob/living/simple_animal/hostile/alien/ravager
name = "Ravager"
desc = "A huge, nasty red alien with enormous scythed claws."
- icon = 'icons/mob/xenos/ravager.dmi'
+ icon = 'icons/mob/xenos/castes/tier_3/ravager.dmi'
melee_damage_lower = XENO_DAMAGE_TIER_5
melee_damage_upper = XENO_DAMAGE_TIER_5
health = XENO_HEALTH_TIER_7
@@ -168,7 +168,7 @@
/mob/living/simple_animal/hostile/alien/lurker
name = "Lurker"
desc = "A fast, powerful backline combatant."
- icon = 'icons/mob/xenos/lurker.dmi'
+ icon = 'icons/mob/xenos/castes/tier_2/lurker.dmi'
melee_damage_lower = XENO_DAMAGE_TIER_3
melee_damage_upper = XENO_DAMAGE_TIER_3
health = XENO_HEALTH_TIER_3
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
deleted file mode 100644
index e54c3a5cf5d2..000000000000
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-/mob/living/simple_animal/hostile/pirate
- name = "Pirate"
- desc = "Does what he wants cause a pirate is free."
- icon_state = "piratemelee"
- icon_living = "piratemelee"
- icon_dead = "piratemelee_dead"
- speak_chance = 0
- turns_per_move = 5
- response_help = "pushes the"
- response_disarm = "shoves"
- response_harm = "hits the"
- speed = 4
- stop_automated_movement_when_pulled = 0
- maxHealth = 100
- health = 100
-
- harm_intent_damage = 5
- melee_damage_lower = 30
- melee_damage_upper = 30
- attacktext = "slashes"
- attack_sound = 'sound/weapons/bladeslice.ogg'
-
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
- unsuitable_atoms_damage = 15
- var/corpse = /obj/effect/landmark/corpsespawner/realpirate
- var/weapon1 = /obj/item/weapon/energy/sword/pirate
-
- faction = FACTION_PIRATE
-
-/mob/living/simple_animal/hostile/pirate/death()
- ..()
- if(corpse)
- new corpse (src.loc)
- if(weapon1)
- new weapon1 (src.loc)
- qdel(src)
- return
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
deleted file mode 100644
index 1394ec113e6b..000000000000
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ /dev/null
@@ -1,106 +0,0 @@
-/mob/living/simple_animal/hostile/russian
- name = "Russian"
- desc = "For the Motherland!"
- icon_state = "russianmelee"
- icon_living = "russianmelee"
- icon_dead = "russianmelee_dead"
- icon_gib = "syndicate_gib"
- speak_chance = 0
- turns_per_move = 5
- response_help = "pokes the"
- response_disarm = "shoves the"
- response_harm = "hits the"
- speed = 4
- stop_automated_movement_when_pulled = 0
- maxHealth = 100
- health = 100
- harm_intent_damage = 5
- melee_damage_lower = 15
- melee_damage_upper = 15
- attacktext = "punches"
- a_intent = INTENT_HARM
- var/corpse = /obj/effect/landmark/corpsespawner/russian
- var/weapon1 = /obj/item/tool/kitchen/knife
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
- unsuitable_atoms_damage = 15
- faction = FACTION_UPP
- status_flags = CANPUSH
-
-
-/mob/living/simple_animal/hostile/russian/ranged
- icon_state = "russianranged"
- icon_living = "russianranged"
- corpse = /obj/effect/landmark/corpsespawner/russian/ranged
- weapon1 = /obj/item/weapon/gun/pistol
- ranged = 1
- projectiletype = /obj/projectile
- projectilesound = 'sound/weapons/Gunshot.ogg'
- casingtype = null
-
-
-/mob/living/simple_animal/hostile/UPP
- name = "UPP Soldier"
- desc = "A soldier in the service of the UPP Navy."
- icon_state = "uppmarine"
- icon_living = "uppmarine"
- icon_dead = "uppmarinedead"
- icon_gib = "syndicate_gib"
- speak_chance = 0
- turns_per_move = 5
- response_help = "pokes the"
- response_disarm = "shoves the"
- response_harm = "hits the"
- speed = 4
- stop_automated_movement_when_pulled = 0
- maxHealth = 100
- health = 100
- harm_intent_damage = 5
- melee_damage_lower = 15
- melee_damage_upper = 15
- attacktext = "punches"
- a_intent = INTENT_HARM
- //var/corpse = /obj/effect/landmark/corpsespawner/russian
- //var/weapon1 = /obj/item/tool/kitchen/knife
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
- unsuitable_atoms_damage = 15
- faction = FACTION_UPP
- status_flags = CANPUSH
-
-
-/mob/living/simple_animal/hostile/UPP/ranged
- //weapon1 = /obj/item/weapon/gun/projectile/mateba
- ranged = 1
- projectiletype = /obj/projectile
- projectilesound = 'sound/weapons/Gunshot.ogg'
- casingtype = null
-
-
-/mob/living/simple_animal/hostile/russian/death()
- ..()
- if(corpse)
- new corpse (src.loc)
- if(weapon1)
- new weapon1 (src.loc)
- qdel(src)
- return
-/*
-/mob/living/simple_animal/hostile/russian/UPP
- name = "UPP Soldier"
- icon_state = "uppmarine"
- icon_living = "uppmarine"
- icon_dead = "uppmarinedead"
-*/
diff --git a/code/modules/paperwork/notepad.dm b/code/modules/paperwork/notepad.dm
index bbfec5428830..c7f47d7816a0 100644
--- a/code/modules/paperwork/notepad.dm
+++ b/code/modules/paperwork/notepad.dm
@@ -1,7 +1,7 @@
/obj/item/notepad
name = "notepad"
gender = PLURAL
- icon = 'icons/obj/items/notepads.dmi'
+ icon = 'icons/obj/items/paper.dmi'
icon_state = "notebook"
item_state = "paper"
throwforce = 0
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 449099d744f3..940627c0e59e 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -11,7 +11,7 @@
*******/
/obj/item/device/camera_film
name = "film cartridge"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/paper.dmi'
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
@@ -27,8 +27,8 @@
********/
/obj/item/photo
name = "photo"
- icon = 'icons/obj/items/items.dmi'
- icon_state = "photo"
+ icon = 'icons/obj/items/paper.dmi'
+ icon_state = "photo_item"
item_state = "paper"
w_class = SIZE_TINY
var/icon/img //Big photo image
@@ -86,7 +86,7 @@
**************/
/obj/item/storage/photo_album
name = "Photo album"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/paper.dmi'
icon_state = "album"
item_state = "briefcase"
can_hold = list(/obj/item/photo,)
@@ -121,13 +121,13 @@
*********/
/obj/item/device/camera
name = "camera"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/paper.dmi'
desc = "A polaroid camera."
icon_state = "camera"
item_state = "camera"
item_icons = list(
- WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_0.dmi',
- WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_0.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/paperwork_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/paperwork_righthand.dmi'
)
flags_item = TWOHANDED
w_class = SIZE_SMALL
@@ -313,7 +313,7 @@
var/icon/small_img = icon(photoimage)
var/icon/tiny_img = icon(photoimage)
- var/icon/item_icon = icon('icons/obj/items/items.dmi',"photo")
+ var/icon/item_icon = icon('icons/obj/items/paper.dmi',"photo_item")
var/icon/paper_icon = icon('icons/obj/items/paper.dmi', "photo")
small_img.Scale(8, 8)
tiny_img.Scale(4, 4)
@@ -353,6 +353,7 @@
desc = "Actively document everything you see, from the mundanity of shipside to the brutal battlefields below. Has a built-in printer for action shots."
icon_state = "broadcastingcamera"
item_state = "broadcastingcamera"
+ icon = 'icons/obj/items/tools.dmi'
unacidable = TRUE
explo_proof = TRUE
pictures_left = 20
diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm
index d0eb5aeaba60..7d978de26424 100644
--- a/code/modules/power/fractal_reactor.dm
+++ b/code/modules/power/fractal_reactor.dm
@@ -7,7 +7,7 @@
name = "Fractal Energy Reactor"
desc = "This thing drains power from fractal-subspace. (DEBUG ITEM: INFINITE POWERSOURCE FOR MAP TESTING. CONTACT DEVELOPERS IF FOUND.)"
icon = 'icons/obj/structures/machinery/power.dmi'
- icon_state = "tracker" //ICON stolen from solar tracker. There is no need to make new texture for debug item
+ icon_state = "bbox_on"
anchored = TRUE
density = TRUE
directwired = 1
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
deleted file mode 100644
index 7c25b137cdc8..000000000000
--- a/code/modules/power/generator.dm
+++ /dev/null
@@ -1,37 +0,0 @@
-/obj/structure/machinery/power/generator
- name = "thermoelectric generator"
- desc = "It's a high efficiency thermoelectric generator."
- icon_state = "teg"
- density = TRUE
- anchored = FALSE
-
- use_power = USE_POWER_IDLE
- idle_power_usage = 100 //Watts, I hope. Just enough to do the computer and display things.
-
-/obj/structure/machinery/power/generator/attackby(obj/item/W as obj, mob/user as mob)
- if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
- anchored = !anchored
- to_chat(user, SPAN_NOTICE(" You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."))
- use_power = anchored
- else
- ..()
-
-/obj/structure/machinery/power/generator/verb/rotate_clock()
- set category = "Object"
- set name = "Rotate Generator (Clockwise)"
- set src in view(1)
-
- if (usr.stat || usr.is_mob_restrained() || anchored)
- return
-
- src.setDir(turn(src.dir, 90))
-
-/obj/structure/machinery/power/generator/verb/rotate_anticlock()
- set category = "Object"
- set name = "Rotate Generator (Counterclockwise)"
- set src in view(1)
-
- if (usr.stat || usr.is_mob_restrained() || anchored)
- return
-
- src.setDir(turn(src.dir, -90))
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index e23f5ab9b20e..461cd68b869b 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -20,8 +20,8 @@
force = 5
attack_verb = null
item_icons = list(
- WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi',
- WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_righthand.dmi',
)
flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT
flags_item = TWOHANDED
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
index 2847021c4775..3a2706723c5a 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -26,6 +26,10 @@ Defined in conflicts.dm of the #defines folder.
icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi'
icon_state = null
item_state = null
+ item_icons = list(
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi'
+ )
var/attach_icon //the sprite to show when the attachment is attached when we want it different from the icon_state.
var/pixel_shift_x = 16 //Determines the amount of pixels to move the icon state for the overlay.
var/pixel_shift_y = 16 //Uses the bottom left corner of the item.
@@ -371,7 +375,7 @@ Defined in conflicts.dm of the #defines folder.
/obj/item/co2_cartridge //where tf else am I gonna put this?
name = "\improper CO2 cartridge"
desc = "A cartridge of compressed CO2 for the M8 cartridge bayonet. Do not consume or puncture."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tank.dmi'
icon_state = "co2_cartridge"
item_state = ""
w_class = SIZE_TINY
diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm
index 2f762cc7aac8..f126f48423e2 100644
--- a/code/modules/projectiles/guns/revolvers.dm
+++ b/code/modules/projectiles/guns/revolvers.dm
@@ -532,7 +532,7 @@
/obj/item/weapon/mateba_key
name = "mateba barrel key"
desc = "Used to swap the barrels of a mateba revolver."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "matebakey"
flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT
force = 5
diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
index f568f2657dc8..37d4c1a185fc 100644
--- a/code/modules/projectiles/guns/shotguns.dm
+++ b/code/modules/projectiles/guns/shotguns.dm
@@ -676,14 +676,14 @@ can cause issues with ammo types getting mixed up during the burst.
/obj/item/weapon/gun/shotgun/double/cane
name = "fancy cane"
desc = "An ebony cane with a fancy, seemingly-golden tip. Feels hollow to the touch."
- icon = 'icons/obj/items/weapons/weapons.dmi'
+ icon = 'icons/obj/items/weapons/melee/canes.dmi'
icon_state = "fancy_cane"
item_state = "fancy_cane"
pickup_sound = null
drop_sound = null
item_icons = list(
- WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_0.dmi',
- WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_0.dmi'
+ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/canes_lefthand.dmi',
+ WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/canes_righthand.dmi',
)
caliber = ".44"
gauge = ".44" // misery
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index b0cd265974ea..33c209d4e078 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -212,7 +212,7 @@
/obj/item/packageWrap
name = "package wrapper"
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "deliveryPaper"
w_class = SIZE_MEDIUM
var/amount = 50
@@ -326,6 +326,7 @@
name = "destination tagger"
desc = "Used to set the destination of properly wrapped packages."
icon_state = "dest_tagger"
+ icon = 'icons/obj/items/tools.dmi'
var/currTag = 0
w_class = SIZE_SMALL
diff --git a/code/modules/vehicles/interior/interior_landmarks.dm b/code/modules/vehicles/interior/interior_landmarks.dm
index cd9f2e74df15..9a5e2fc11b26 100644
--- a/code/modules/vehicles/interior/interior_landmarks.dm
+++ b/code/modules/vehicles/interior/interior_landmarks.dm
@@ -59,7 +59,7 @@
// Driver's seat spawner
/obj/effect/landmark/interior/spawn/vehicle_driver_seat
name = "driver's seat spawner"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/chairs.dmi'
icon_state = "comfychair"
color = "red"
@@ -83,7 +83,7 @@
// Gunner's seat spawner
/obj/effect/landmark/interior/spawn/vehicle_gunner_seat
name = "gunner's seat spawner"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures/props/chairs.dmi'
icon_state = "comfychair"
color = "blue"
diff --git a/code/modules/vehicles/vehicle_misc_objects.dm b/code/modules/vehicles/vehicle_misc_objects.dm
index e3fa57f9097c..68a253a14e94 100644
--- a/code/modules/vehicles/vehicle_misc_objects.dm
+++ b/code/modules/vehicles/vehicle_misc_objects.dm
@@ -3,6 +3,6 @@
name = "Vehicle Clamp"
desc = "Good old vehicle clamp, except this one was reinforced and can be applied to military vehicles. Use screwdriver to uninstall it."
- icon = 'icons/obj/items/items.dmi'
+ icon = 'icons/obj/items/tools.dmi'
icon_state = "vehicle_clamp"
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 423b66356dd5..9aa4c5ae8809 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -1135,7 +1135,6 @@
#include "code\game\objects\items\devices\clue_scanner.dm"
#include "code\game\objects\items\devices\coins.dm"
#include "code\game\objects\items\devices\data_detector.dm"
-#include "code\game\objects\items\devices\debugger.dm"
#include "code\game\objects\items\devices\defibrillator.dm"
#include "code\game\objects\items\devices\device.dm"
#include "code\game\objects\items\devices\dummy_tablet.dm"
@@ -1185,7 +1184,6 @@
#include "code\game\objects\items\frames\table_rack.dm"
#include "code\game\objects\items\implants\implant.dm"
#include "code\game\objects\items\implants\implantcase.dm"
-#include "code\game\objects\items\implants\implantchair.dm"
#include "code\game\objects\items\implants\implanter.dm"
#include "code\game\objects\items\implants\implantfreedom.dm"
#include "code\game\objects\items\implants\implantneurostim.dm"
@@ -1217,7 +1215,6 @@
#include "code\game\objects\items\reagent_containers\food\drinks\drinkingglass.dm"
#include "code\game\objects\items\reagent_containers\food\drinks\jar.dm"
#include "code\game\objects\items\reagent_containers\food\snacks\grown.dm"
-#include "code\game\objects\items\reagent_containers\food\snacks\honey.dm"
#include "code\game\objects\items\reagent_containers\food\snacks\meat.dm"
#include "code\game\objects\items\reagent_containers\glass\bottle.dm"
#include "code\game\objects\items\reagent_containers\glass\bottle\robot.dm"
@@ -1603,7 +1600,6 @@
#include "code\modules\clothing\shoes\marine_shoes.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
#include "code\modules\clothing\spacesuits\breaches.dm"
-#include "code\modules\clothing\spacesuits\captain.dm"
#include "code\modules\clothing\spacesuits\miscellaneous.dm"
#include "code\modules\clothing\spacesuits\spacesuits.dm"
#include "code\modules\clothing\spacesuits\void.dm"
@@ -2148,8 +2144,6 @@
#include "code\modules\mob\living\simple_animal\hostile\creature.dm"
#include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm"
#include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
-#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
-#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\drone.dm"
@@ -2221,7 +2215,6 @@
#include "code\modules\power\cable_heavyduty.dm"
#include "code\modules\power\cell.dm"
#include "code\modules\power\fractal_reactor.dm"
-#include "code\modules\power\generator.dm"
#include "code\modules\power\lighting.dm"
#include "code\modules\power\port_gen.dm"
#include "code\modules\power\power.dm"
diff --git a/icons/480x480.dmi b/icons/480x480.dmi
deleted file mode 100644
index 90ea9fbd55cb..000000000000
Binary files a/icons/480x480.dmi and /dev/null differ
diff --git a/icons/VendingMachineBG.png b/icons/VendingMachineBG.png
deleted file mode 100644
index 5d7f010d1d78..000000000000
Binary files a/icons/VendingMachineBG.png and /dev/null differ
diff --git a/icons/dispensebutton_bg.png b/icons/dispensebutton_bg.png
deleted file mode 100644
index 195c02114eac..000000000000
Binary files a/icons/dispensebutton_bg.png and /dev/null differ
diff --git a/icons/effects/160x160.dmi b/icons/effects/160x160.dmi
index cd0d0fc90e91..6879ce244dce 100644
Binary files a/icons/effects/160x160.dmi and b/icons/effects/160x160.dmi differ
diff --git a/icons/effects/224x224.dmi b/icons/effects/224x224.dmi
deleted file mode 100644
index 3e24a77ed334..000000000000
Binary files a/icons/effects/224x224.dmi and /dev/null differ
diff --git a/icons/effects/288x288.dmi b/icons/effects/288x288.dmi
deleted file mode 100644
index 1779b5748192..000000000000
Binary files a/icons/effects/288x288.dmi and /dev/null differ
diff --git a/icons/effects/attacks.dmi b/icons/effects/attacks.dmi
index 7d9200d29b81..c7886cc8a924 100644
Binary files a/icons/effects/attacks.dmi and b/icons/effects/attacks.dmi differ
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index 6b48e437853c..3441f33075a0 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/cameravis.dmi b/icons/effects/cameravis.dmi
deleted file mode 100644
index 3ecc9eb80ac4..000000000000
Binary files a/icons/effects/cameravis.dmi and /dev/null differ
diff --git a/icons/effects/contamination.dmi b/icons/effects/contamination.dmi
deleted file mode 100644
index 367394213be9..000000000000
Binary files a/icons/effects/contamination.dmi and /dev/null differ
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
deleted file mode 100644
index fa46a2d6c094..000000000000
Binary files a/icons/effects/genetics.dmi and /dev/null differ
diff --git a/icons/effects/kutjevo_decals.dmi b/icons/effects/kutjevo_decals.dmi
deleted file mode 100644
index 9bd0fc3269d2..000000000000
Binary files a/icons/effects/kutjevo_decals.dmi and /dev/null differ
diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi
index 99588092d085..173bac49ea4d 100644
Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ
diff --git a/icons/effects/tile_effects.dmi b/icons/effects/tile_effects.dmi
deleted file mode 100644
index b08f1ac3dec4..000000000000
Binary files a/icons/effects/tile_effects.dmi and /dev/null differ
diff --git a/icons/effects/view_blocker.dmi b/icons/effects/view_blocker.dmi
deleted file mode 100644
index 97acaa3746f7..000000000000
Binary files a/icons/effects/view_blocker.dmi and /dev/null differ
diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi
deleted file mode 100644
index 4525fea606a6..000000000000
Binary files a/icons/mob/AI.dmi and /dev/null differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 8246bb4f70aa..6cdd593d24a9 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/critter.dmi b/icons/mob/critter.dmi
index ec4e4ad620a2..c592c917f7ce 100644
Binary files a/icons/mob/critter.dmi and b/icons/mob/critter.dmi differ
diff --git a/icons/mob/do_afters.dmi b/icons/mob/do_afters.dmi
new file mode 100644
index 000000000000..60e0b5b2db89
Binary files /dev/null and b/icons/mob/do_afters.dmi differ
diff --git a/icons/mob/hivebot.dmi b/icons/mob/hivebot.dmi
deleted file mode 100644
index 1e536f7ac515..000000000000
Binary files a/icons/mob/hivebot.dmi and /dev/null differ
diff --git a/icons/mob/hud/alien_standard.dmi b/icons/mob/hud/alien_standard.dmi
index 0f3902ebf27d..2e7d7ab3dcb9 100644
Binary files a/icons/mob/hud/alien_standard.dmi and b/icons/mob/hud/alien_standard.dmi differ
diff --git a/icons/mob/hud/human_bronze.dmi b/icons/mob/hud/human_bronze.dmi
index 7548f66b05b6..be6ee46d5fa2 100644
Binary files a/icons/mob/hud/human_bronze.dmi and b/icons/mob/hud/human_bronze.dmi differ
diff --git a/icons/mob/hud/human_dark.dmi b/icons/mob/hud/human_dark.dmi
index 5b75acf1b360..0cbfd1b6ccc2 100644
Binary files a/icons/mob/hud/human_dark.dmi and b/icons/mob/hud/human_dark.dmi differ
diff --git a/icons/mob/hud/human_glass.dmi b/icons/mob/hud/human_glass.dmi
index b3d8f56ce4e6..62cbf7af4912 100644
Binary files a/icons/mob/hud/human_glass.dmi and b/icons/mob/hud/human_glass.dmi differ
diff --git a/icons/mob/hud/human_green.dmi b/icons/mob/hud/human_green.dmi
index a07e7a327154..bbf01ed7a6cb 100644
Binary files a/icons/mob/hud/human_green.dmi and b/icons/mob/hud/human_green.dmi differ
diff --git a/icons/mob/hud/human_grey.dmi b/icons/mob/hud/human_grey.dmi
index 6c5c2f326500..c52297d94f59 100644
Binary files a/icons/mob/hud/human_grey.dmi and b/icons/mob/hud/human_grey.dmi differ
diff --git a/icons/mob/hud/human_holo.dmi b/icons/mob/hud/human_holo.dmi
index 568e364314e9..003286c78c6f 100644
Binary files a/icons/mob/hud/human_holo.dmi and b/icons/mob/hud/human_holo.dmi differ
diff --git a/icons/mob/hud/human_midnight.dmi b/icons/mob/hud/human_midnight.dmi
index 78a0b105610e..d76eccca7f23 100644
Binary files a/icons/mob/hud/human_midnight.dmi and b/icons/mob/hud/human_midnight.dmi differ
diff --git a/icons/mob/hud/human_old.dmi b/icons/mob/hud/human_old.dmi
index 66e3f846615b..4a2e7218b87b 100644
Binary files a/icons/mob/hud/human_old.dmi and b/icons/mob/hud/human_old.dmi differ
diff --git a/icons/mob/hud/human_orange.dmi b/icons/mob/hud/human_orange.dmi
index 4ab6f7558cbd..f075dc37099d 100644
Binary files a/icons/mob/hud/human_orange.dmi and b/icons/mob/hud/human_orange.dmi differ
diff --git a/icons/mob/hud/human_red.dmi b/icons/mob/hud/human_red.dmi
index 17de42f5a17c..0cf363b5f7c0 100644
Binary files a/icons/mob/hud/human_red.dmi and b/icons/mob/hud/human_red.dmi differ
diff --git a/icons/mob/hud/human_white.dmi b/icons/mob/hud/human_white.dmi
index 7b6429e0ed04..832caa2db639 100644
Binary files a/icons/mob/hud/human_white.dmi and b/icons/mob/hud/human_white.dmi differ
diff --git a/icons/mob/hud/screen1.dmi b/icons/mob/hud/screen1.dmi
index 17d390d9e490..e262363e87c7 100644
Binary files a/icons/mob/hud/screen1.dmi and b/icons/mob/hud/screen1.dmi differ
diff --git a/icons/mob/hud/screen1_robot.dmi b/icons/mob/hud/screen1_robot.dmi
deleted file mode 100644
index 679a555c97a6..000000000000
Binary files a/icons/mob/hud/screen1_robot.dmi and /dev/null differ
diff --git a/icons/mob/hud/talk.dmi b/icons/mob/hud/talk.dmi
deleted file mode 100644
index c6f043bfd781..000000000000
Binary files a/icons/mob/hud/talk.dmi and /dev/null differ
diff --git a/icons/mob/humans/green_armors.dmi b/icons/mob/humans/green_armors.dmi
deleted file mode 100644
index 5022b6c4bbc7..000000000000
Binary files a/icons/mob/humans/green_armors.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/OnFire.dmi b/icons/mob/humans/onmob/OnFire.dmi
index dd325cea67e2..450bb7e8a0d3 100644
Binary files a/icons/mob/humans/onmob/OnFire.dmi and b/icons/mob/humans/onmob/OnFire.dmi differ
diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi
deleted file mode 100644
index f7dffb722a89..000000000000
Binary files a/icons/mob/humans/onmob/back.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi
deleted file mode 100644
index 31c0e9865696..000000000000
Binary files a/icons/mob/humans/onmob/belt.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/armbands.dmi b/icons/mob/humans/onmob/clothing/accessory/armbands.dmi
new file mode 100644
index 000000000000..ff78eb0adc05
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/armbands.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/medals.dmi b/icons/mob/humans/onmob/clothing/accessory/medals.dmi
new file mode 100644
index 000000000000..66628ba5dee8
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/medals.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/misc.dmi b/icons/mob/humans/onmob/clothing/accessory/misc.dmi
new file mode 100644
index 000000000000..d6e8cc3ea2b3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/misc.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/patches.dmi b/icons/mob/humans/onmob/clothing/accessory/patches.dmi
new file mode 100644
index 000000000000..e6536bfa29c6
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/patches.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/ponchos.dmi b/icons/mob/humans/onmob/clothing/accessory/ponchos.dmi
new file mode 100644
index 000000000000..06c225855f35
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/ponchos.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/ranks.dmi b/icons/mob/humans/onmob/clothing/accessory/ranks.dmi
new file mode 100644
index 000000000000..5fad72f75070
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/ranks.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/ties.dmi b/icons/mob/humans/onmob/clothing/accessory/ties.dmi
new file mode 100644
index 000000000000..4de744ff535e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/ties.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/watches.dmi b/icons/mob/humans/onmob/clothing/accessory/watches.dmi
new file mode 100644
index 000000000000..ec4ac7b19d01
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/watches.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/accessory/webbings.dmi b/icons/mob/humans/onmob/clothing/accessory/webbings.dmi
new file mode 100644
index 000000000000..a21a61515165
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/accessory/webbings.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/ammo_boxes.dmi b/icons/mob/humans/onmob/clothing/back/ammo_boxes.dmi
new file mode 100644
index 000000000000..862b04c268f3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/ammo_boxes.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks.dmi b/icons/mob/humans/onmob/clothing/back/backpacks.dmi
new file mode 100644
index 000000000000..cd020bdf3fb2
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/TWE.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/TWE.dmi
new file mode 100644
index 000000000000..88ba29c5effd
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/TWE.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi
new file mode 100644
index 000000000000..2c8c56c6dc30
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UPP.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UPP.dmi
new file mode 100644
index 000000000000..4b681f390acc
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UPP.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/WY.dmi
new file mode 100644
index 000000000000..fe0d4917d317
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/WY.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi
new file mode 100644
index 000000000000..45580098f0e7
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/desert.dmi
new file mode 100644
index 000000000000..93dcb031db94
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/jungle.dmi
new file mode 100644
index 000000000000..6bb671f082c4
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/snow.dmi
new file mode 100644
index 000000000000..3399130a4b4e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/urban.dmi
new file mode 100644
index 000000000000..3399130a4b4e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/urban.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/donator.dmi b/icons/mob/humans/onmob/clothing/back/donator.dmi
new file mode 100644
index 000000000000..7fe7cf011a7b
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/donator.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/assault_rifles.dmi b/icons/mob/humans/onmob/clothing/back/guns/assault_rifles.dmi
new file mode 100644
index 000000000000..7839fa965694
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/assault_rifles.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/energy_weapons.dmi b/icons/mob/humans/onmob/clothing/back/guns/energy_weapons.dmi
new file mode 100644
index 000000000000..deeabb1b7150
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/energy_weapons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/flamers.dmi b/icons/mob/humans/onmob/clothing/back/guns/flamers.dmi
new file mode 100644
index 000000000000..440702c8f4e9
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/flamers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/grenade_launchers.dmi b/icons/mob/humans/onmob/clothing/back/guns/grenade_launchers.dmi
new file mode 100644
index 000000000000..31cc689858ed
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/grenade_launchers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/machineguns.dmi b/icons/mob/humans/onmob/clothing/back/guns/machineguns.dmi
new file mode 100644
index 000000000000..22111991e009
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/machineguns.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/marksman_rifles.dmi b/icons/mob/humans/onmob/clothing/back/guns/marksman_rifles.dmi
new file mode 100644
index 000000000000..b722dc010d91
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/marksman_rifles.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/shotguns.dmi b/icons/mob/humans/onmob/clothing/back/guns/shotguns.dmi
new file mode 100644
index 000000000000..ae55e54ed5ce
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/shotguns.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/guns/smgs.dmi b/icons/mob/humans/onmob/clothing/back/guns/smgs.dmi
new file mode 100644
index 000000000000..e50e739ac9e9
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns/smgs.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/holster.dmi b/icons/mob/humans/onmob/clothing/back/holster.dmi
new file mode 100644
index 000000000000..592152ebd300
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/holster.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/melee_weapons.dmi b/icons/mob/humans/onmob/clothing/back/melee_weapons.dmi
new file mode 100644
index 000000000000..851664bc5c85
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/melee_weapons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/misc.dmi b/icons/mob/humans/onmob/clothing/back/misc.dmi
new file mode 100644
index 000000000000..0206ed8f7559
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/misc.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/smartpack.dmi b/icons/mob/humans/onmob/clothing/back/smartpack.dmi
new file mode 100644
index 000000000000..13c7c8bf2d93
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/smartpack.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/sprayers.dmi b/icons/mob/humans/onmob/clothing/back/sprayers.dmi
new file mode 100644
index 000000000000..eb5975a15c8b
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/sprayers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts.dmi b/icons/mob/humans/onmob/clothing/belts/belts.dmi
new file mode 100644
index 000000000000..e1571b5ff7d5
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_faction/TWE.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_faction/TWE.dmi
new file mode 100644
index 000000000000..5a3b4222b996
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_faction/TWE.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_faction/UPP.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_faction/UPP.dmi
new file mode 100644
index 000000000000..296ca6fb95b2
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_faction/UPP.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi
new file mode 100644
index 000000000000..64d0581cc876
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi
new file mode 100644
index 000000000000..97365c047608
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi
new file mode 100644
index 000000000000..64d0581cc876
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi
new file mode 100644
index 000000000000..46fc51f14824
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi
new file mode 100644
index 000000000000..46fc51f14824
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi differ
diff --git a/icons/obj/items/clothing/donor/MISC.dmi b/icons/mob/humans/onmob/clothing/belts/donator.dmi
similarity index 100%
rename from icons/obj/items/clothing/donor/MISC.dmi
rename to icons/mob/humans/onmob/clothing/belts/donator.dmi
diff --git a/icons/mob/humans/onmob/clothing/belts/guns.dmi b/icons/mob/humans/onmob/clothing/belts/guns.dmi
new file mode 100644
index 000000000000..463cff5471e0
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/guns.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/misc.dmi b/icons/mob/humans/onmob/clothing/belts/misc.dmi
new file mode 100644
index 000000000000..3528e92492ca
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/misc.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/scabbards.dmi b/icons/mob/humans/onmob/clothing/belts/scabbards.dmi
new file mode 100644
index 000000000000..138a72458ffc
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/scabbards.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/tools.dmi b/icons/mob/humans/onmob/clothing/belts/tools.dmi
new file mode 100644
index 000000000000..11b3c2b35f20
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/tools.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/belts/weapons.dmi b/icons/mob/humans/onmob/clothing/belts/weapons.dmi
new file mode 100644
index 000000000000..2667fa8ac289
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/belts/weapons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/berets.dmi b/icons/mob/humans/onmob/clothing/head/berets.dmi
new file mode 100644
index 000000000000..15e9681f950e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/berets.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/critters.dmi b/icons/mob/humans/onmob/clothing/head/critters.dmi
new file mode 100644
index 000000000000..fda8cdb0c105
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/critters.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/donator.dmi b/icons/mob/humans/onmob/clothing/head/donator.dmi
new file mode 100644
index 000000000000..34e92a89ce83
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/donator.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/formal_hats.dmi b/icons/mob/humans/onmob/clothing/head/formal_hats.dmi
new file mode 100644
index 000000000000..153ee2e163a6
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/formal_hats.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hardhats.dmi b/icons/mob/humans/onmob/clothing/head/hardhats.dmi
new file mode 100644
index 000000000000..2b8e6030dd79
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hardhats.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats.dmi b/icons/mob/humans/onmob/clothing/head/hats.dmi
new file mode 100644
index 000000000000..2c5a7b2e3394
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/CLF.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/CLF.dmi
new file mode 100644
index 000000000000..145c34787b40
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/CLF.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/CMB.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/CMB.dmi
new file mode 100644
index 000000000000..c0538bb6ce5a
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/CMB.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/TWE.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/TWE.dmi
new file mode 100644
index 000000000000..4c6b5d3f6fe7
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/TWE.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi
new file mode 100644
index 000000000000..5a4d5058bab1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/UA.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/UPP.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/UPP.dmi
new file mode 100644
index 000000000000..8a67776eaa87
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/UPP.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi
new file mode 100644
index 000000000000..745eb740e728
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi
new file mode 100644
index 000000000000..e9fd39b38c82
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi
new file mode 100644
index 000000000000..3e4ba9042bbc
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi
new file mode 100644
index 000000000000..fa29f4239a02
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi
new file mode 100644
index 000000000000..4db090884ac8
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi
new file mode 100644
index 000000000000..7ec01525d8da
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hazard.dmi b/icons/mob/humans/onmob/clothing/head/hazard.dmi
new file mode 100644
index 000000000000..547969f8b8e4
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hazard.dmi differ
diff --git a/icons/mob/humans/onmob/head_64.dmi b/icons/mob/humans/onmob/clothing/head/head_64.dmi
similarity index 100%
rename from icons/mob/humans/onmob/head_64.dmi
rename to icons/mob/humans/onmob/clothing/head/head_64.dmi
diff --git a/icons/mob/humans/onmob/clothing/head/headbands.dmi b/icons/mob/humans/onmob/clothing/head/headbands.dmi
new file mode 100644
index 000000000000..db98af1c6599
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/headbands.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi b/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi
new file mode 100644
index 000000000000..8d4c91daa1e6
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/objects.dmi b/icons/mob/humans/onmob/clothing/head/objects.dmi
new file mode 100644
index 000000000000..b64bbe1e8e2e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/objects.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/overlays.dmi b/icons/mob/humans/onmob/clothing/head/overlays.dmi
new file mode 100644
index 000000000000..34cafe82b7c2
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/overlays.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/soft_caps.dmi b/icons/mob/humans/onmob/clothing/head/soft_caps.dmi
new file mode 100644
index 000000000000..1454099e7aa3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/soft_caps.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi b/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi
new file mode 100644
index 000000000000..e99ddf7361c1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/ammo.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/ammo.dmi
new file mode 100644
index 000000000000..522f70fa42b7
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/ammo.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/cards.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/cards.dmi
new file mode 100644
index 000000000000..db8a16b45166
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/cards.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/crayons.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/crayons.dmi
new file mode 100644
index 000000000000..a683ff2dafae
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/crayons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/food.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/food.dmi
new file mode 100644
index 000000000000..9d1e4143766a
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/food.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/glasses.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/glasses.dmi
new file mode 100644
index 000000000000..5a5434c174eb
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/glasses.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi
new file mode 100644
index 000000000000..1b027f6b00e4
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi
new file mode 100644
index 000000000000..57ae9f135bc3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi
new file mode 100644
index 000000000000..5031832b303f
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi
new file mode 100644
index 000000000000..5bd0da24f5c9
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/medical.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/medical.dmi
new file mode 100644
index 000000000000..9f19e5cfd750
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/medical.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi
new file mode 100644
index 000000000000..276d2e865663
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi
new file mode 100644
index 000000000000..461d19fcca56
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/patches_flairs.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi
new file mode 100644
index 000000000000..9d7a149e333f
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/visors.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/visors.dmi
new file mode 100644
index 000000000000..c9f14661249c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/visors.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/walkman.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/walkman.dmi
new file mode 100644
index 000000000000..1b4077bf28f5
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/helmet_garb/walkman.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/balaclava.dmi b/icons/mob/humans/onmob/clothing/masks/balaclava.dmi
new file mode 100644
index 000000000000..ab306965eed1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/balaclava.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/donator.dmi b/icons/mob/humans/onmob/clothing/masks/donator.dmi
new file mode 100644
index 000000000000..1fd5f3227730
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/donator.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/gasmasks.dmi b/icons/mob/humans/onmob/clothing/masks/gasmasks.dmi
new file mode 100644
index 000000000000..7dd9edc7731d
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/gasmasks.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/glasses_masks.dmi b/icons/mob/humans/onmob/clothing/masks/glasses_masks.dmi
new file mode 100644
index 000000000000..fe186b2214b0
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/glasses_masks.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/masks.dmi b/icons/mob/humans/onmob/clothing/masks/masks.dmi
new file mode 100644
index 000000000000..29f3fdbb3668
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/masks.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/masks_by_faction/TWE.dmi b/icons/mob/humans/onmob/clothing/masks/masks_by_faction/TWE.dmi
new file mode 100644
index 000000000000..d7b5e830f0f3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/masks_by_faction/TWE.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/masks_by_faction/UPP.dmi b/icons/mob/humans/onmob/clothing/masks/masks_by_faction/UPP.dmi
new file mode 100644
index 000000000000..013fa822abca
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/masks_by_faction/UPP.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/masks_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/masks/masks_by_faction/WY.dmi
new file mode 100644
index 000000000000..90ff908a7400
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/masks_by_faction/WY.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/objects.dmi b/icons/mob/humans/onmob/clothing/masks/objects.dmi
new file mode 100644
index 000000000000..6e85a4d52d32
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/objects.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/scarves.dmi b/icons/mob/humans/onmob/clothing/masks/scarves.dmi
new file mode 100644
index 000000000000..82961b4d47e7
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/scarves.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/masks/smoking.dmi b/icons/mob/humans/onmob/clothing/masks/smoking.dmi
new file mode 100644
index 000000000000..4d610ae2ccca
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/masks/smoking.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi b/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi
new file mode 100644
index 000000000000..4f44e24c0c34
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/assault_rifles.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/assault_rifles.dmi
new file mode 100644
index 000000000000..3dcbb59111f9
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/assault_rifles.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/energy_weapons.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/energy_weapons.dmi
new file mode 100644
index 000000000000..cbea951abc50
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/energy_weapons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/flamers.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/flamers.dmi
new file mode 100644
index 000000000000..c567b2fb57a6
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/flamers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/grenade_launchers.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/grenade_launchers.dmi
new file mode 100644
index 000000000000..fd204befedae
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/grenade_launchers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/machineguns.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/machineguns.dmi
new file mode 100644
index 000000000000..43a76b6c5696
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/machineguns.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/marksman_rifles.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/marksman_rifles.dmi
new file mode 100644
index 000000000000..4d2845dbac19
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/marksman_rifles.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/misc_weapons.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/misc_weapons.dmi
new file mode 100644
index 000000000000..a628ebe492df
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/misc_weapons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi
new file mode 100644
index 000000000000..ca958a522a94
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/revolvers.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/revolvers.dmi
new file mode 100644
index 000000000000..593d322c333e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/revolvers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/rocket_launchers.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/rocket_launchers.dmi
new file mode 100644
index 000000000000..3d1e81d5d752
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/rocket_launchers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/shotguns.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/shotguns.dmi
new file mode 100644
index 000000000000..6b8d6002014e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/shotguns.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/smgs.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/smgs.dmi
new file mode 100644
index 000000000000..08884c24c241
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/smgs.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/melee.dmi b/icons/mob/humans/onmob/clothing/suit_storage/melee.dmi
new file mode 100644
index 000000000000..faa0c18e76f8
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/melee.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/misc.dmi b/icons/mob/humans/onmob/clothing/suit_storage/misc.dmi
new file mode 100644
index 000000000000..2a20dff8983f
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/misc.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/classic.dmi
new file mode 100644
index 000000000000..66306f6af8e1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/desert.dmi
new file mode 100644
index 000000000000..9db255bb7ab3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/jungle.dmi
new file mode 100644
index 000000000000..66306f6af8e1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/snow.dmi
new file mode 100644
index 000000000000..5543815eb055
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/suit_storage_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suit_storage/tools.dmi b/icons/mob/humans/onmob/clothing/suit_storage/tools.dmi
new file mode 100644
index 000000000000..2dd415945441
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suit_storage/tools.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/armor.dmi b/icons/mob/humans/onmob/clothing/suits/armor.dmi
new file mode 100644
index 000000000000..12b9921bff11
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi b/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi
new file mode 100644
index 000000000000..59b995d09a35
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/donator.dmi b/icons/mob/humans/onmob/clothing/suits/donator.dmi
new file mode 100644
index 000000000000..ce16e3c99dd1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/donator.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/hazard.dmi b/icons/mob/humans/onmob/clothing/suits/hazard.dmi
new file mode 100644
index 000000000000..1366ec411208
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/hazard.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/jackets.dmi b/icons/mob/humans/onmob/clothing/suits/jackets.dmi
new file mode 100644
index 000000000000..c6ec37372a0a
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/jackets.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi b/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi
new file mode 100644
index 000000000000..f7bc95924bd1
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/objects.dmi b/icons/mob/humans/onmob/clothing/suits/objects.dmi
new file mode 100644
index 000000000000..6a26285e2336
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/objects.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/CLF.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/CLF.dmi
new file mode 100644
index 000000000000..dd54f86e83f3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/CLF.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/CMB.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/CMB.dmi
new file mode 100644
index 000000000000..c746b424bd28
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/CMB.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/TWE.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/TWE.dmi
new file mode 100644
index 000000000000..87edc5e5548c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/TWE.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi
new file mode 100644
index 000000000000..f651672c45c0
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi
new file mode 100644
index 000000000000..552b6d2d14aa
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi
new file mode 100644
index 000000000000..8b21a564046f
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi
new file mode 100644
index 000000000000..3beba1e2e8d2
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi
new file mode 100644
index 000000000000..780bc00a5e04
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi
new file mode 100644
index 000000000000..88b65c0271cc
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi
new file mode 100644
index 000000000000..f6a22251705c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi
new file mode 100644
index 000000000000..94e5c2a8e73c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi b/icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi
new file mode 100644
index 000000000000..9836d0cd3bad
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/suits/windbreakers.dmi b/icons/mob/humans/onmob/clothing/suits/windbreakers.dmi
new file mode 100644
index 000000000000..3b6a96e62da9
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/suits/windbreakers.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/donator.dmi b/icons/mob/humans/onmob/clothing/uniforms/donator.dmi
new file mode 100644
index 000000000000..34ef6e644276
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/donator.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi b/icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi
new file mode 100644
index 000000000000..7ab20b3707d9
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi b/icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi
new file mode 100644
index 000000000000..a7439992707c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/jumpsuits.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi b/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi
new file mode 100644
index 000000000000..cbd75557711a
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/synthetic_uniforms.dmi b/icons/mob/humans/onmob/clothing/uniforms/synthetic_uniforms.dmi
new file mode 100644
index 000000000000..85413d17e23b
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/synthetic_uniforms.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi b/icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi
new file mode 100644
index 000000000000..0f17079ae218
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi
new file mode 100644
index 000000000000..f93f564700d2
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/cargo.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi
new file mode 100644
index 000000000000..719cc6475ac7
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/engineering.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi
new file mode 100644
index 000000000000..c86cb8b22dcf
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi
new file mode 100644
index 000000000000..c20088df7f7e
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi
new file mode 100644
index 000000000000..ca63c1a0776f
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/security.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi
new file mode 100644
index 000000000000..8807de1f4fb3
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/service.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CLF.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CLF.dmi
new file mode 100644
index 000000000000..7b6dcb215f08
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CLF.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CMB.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CMB.dmi
new file mode 100644
index 000000000000..b78c468fa8c4
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/CMB.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi
new file mode 100644
index 000000000000..e083f68741ac
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/TWE.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/TWE.dmi
new file mode 100644
index 000000000000..2d2647711685
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/TWE.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi
new file mode 100644
index 000000000000..4085676cfda2
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UPP.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UPP.dmi
new file mode 100644
index 000000000000..e1c844ca2df4
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UPP.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi
new file mode 100644
index 000000000000..3376898083de
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi
new file mode 100644
index 000000000000..a41a278d7bf7
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi
new file mode 100644
index 000000000000..fdbc29b6cf80
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi
new file mode 100644
index 000000000000..e7f2947af283
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi
new file mode 100644
index 000000000000..f2e56b448a39
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi
new file mode 100644
index 000000000000..d3155a2e20fc
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/uniforms/workwear.dmi b/icons/mob/humans/onmob/clothing/uniforms/workwear.dmi
new file mode 100644
index 000000000000..ef8e26907cc6
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/uniforms/workwear.dmi differ
diff --git a/icons/mob/humans/onmob/collar.dmi b/icons/mob/humans/onmob/collar.dmi
deleted file mode 100644
index fccfe6dd53bd..000000000000
Binary files a/icons/mob/humans/onmob/collar.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/contained/marinedressblues.dmi b/icons/mob/humans/onmob/contained/marinedressblues.dmi
deleted file mode 100644
index 5934b1f2a442..000000000000
Binary files a/icons/mob/humans/onmob/contained/marinedressblues.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/contained/royal_marines_commando.dmi b/icons/mob/humans/onmob/contained/royal_marines_commando.dmi
deleted file mode 100644
index 4e9891fe65e9..000000000000
Binary files a/icons/mob/humans/onmob/contained/royal_marines_commando.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/contained/wy_goons.dmi b/icons/mob/humans/onmob/contained/wy_goons.dmi
deleted file mode 100644
index 475f1d7dde94..000000000000
Binary files a/icons/mob/humans/onmob/contained/wy_goons.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/cuffs.dmi b/icons/mob/humans/onmob/cuffs.dmi
new file mode 100644
index 000000000000..129a21de94d3
Binary files /dev/null and b/icons/mob/humans/onmob/cuffs.dmi differ
diff --git a/icons/mob/humans/onmob/feet.dmi b/icons/mob/humans/onmob/feet.dmi
index b0245d499d59..fc2ba0b67240 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/hands.dmi b/icons/mob/humans/onmob/hands.dmi
index 923a417f4f89..f280ef035a36 100644
Binary files a/icons/mob/humans/onmob/hands.dmi and b/icons/mob/humans/onmob/hands.dmi differ
diff --git a/icons/mob/humans/onmob/head_0.dmi b/icons/mob/humans/onmob/head_0.dmi
deleted file mode 100644
index 862953a27be3..000000000000
Binary files a/icons/mob/humans/onmob/head_0.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi
deleted file mode 100644
index 5ee07890f72a..000000000000
Binary files a/icons/mob/humans/onmob/head_1.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi
deleted file mode 100644
index 5611d28c8480..000000000000
Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/ids.dmi b/icons/mob/humans/onmob/ids.dmi
new file mode 100644
index 000000000000..f61dbe188ecd
Binary files /dev/null and b/icons/mob/humans/onmob/ids.dmi differ
diff --git a/icons/mob/humans/onmob/__inhand_template.dmi b/icons/mob/humans/onmob/inhands/__inhand_template.dmi
similarity index 100%
rename from icons/mob/humans/onmob/__inhand_template.dmi
rename to icons/mob/humans/onmob/inhands/__inhand_template.dmi
diff --git a/icons/mob/humans/onmob/inhands/clothing/backpacks_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/backpacks_lefthand.dmi
new file mode 100644
index 000000000000..22e9800dec1f
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/backpacks_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/backpacks_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/backpacks_righthand.dmi
new file mode 100644
index 000000000000..8243df7a027a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/backpacks_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi
new file mode 100644
index 000000000000..439b2c6a1716
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/belts_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi
new file mode 100644
index 000000000000..9bdc5aeb3fc1
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/belts_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/boots_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/boots_lefthand.dmi
new file mode 100644
index 000000000000..42ab02a287aa
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/boots_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/boots_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/boots_righthand.dmi
new file mode 100644
index 000000000000..59652112d1eb
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/boots_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/glasses_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/glasses_righthand.dmi
new file mode 100644
index 000000000000..0533dae0eaf0
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/glasses_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/glassses_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/glassses_lefthand.dmi
new file mode 100644
index 000000000000..5a1a196120e5
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/glassses_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/gloves_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/gloves_lefthand.dmi
new file mode 100644
index 000000000000..4a5057a08111
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/gloves_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/gloves_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/gloves_righthand.dmi
new file mode 100644
index 000000000000..41e1fb0c2f84
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/gloves_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/hats_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/hats_lefthand.dmi
new file mode 100644
index 000000000000..d5e4ea292c41
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/hats_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/hats_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/hats_righthand.dmi
new file mode 100644
index 000000000000..6b43ec8e659a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/hats_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/masks_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/masks_lefthand.dmi
new file mode 100644
index 000000000000..b815b0b0d981
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/masks_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/masks_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/masks_righthand.dmi
new file mode 100644
index 000000000000..53a3cf2958bd
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/masks_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/pouches_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/pouches_lefthand.dmi
new file mode 100644
index 000000000000..283bf8e7b4ab
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/pouches_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/pouches_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/pouches_righthand.dmi
new file mode 100644
index 000000000000..7d61d917a074
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/pouches_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi
new file mode 100644
index 000000000000..443f76391479
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi
new file mode 100644
index 000000000000..b122d657a432
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/uniforms_lefthand.dmi b/icons/mob/humans/onmob/inhands/clothing/uniforms_lefthand.dmi
new file mode 100644
index 000000000000..472c5666b2a1
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/uniforms_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/clothing/uniforms_righthand.dmi b/icons/mob/humans/onmob/inhands/clothing/uniforms_righthand.dmi
new file mode 100644
index 000000000000..e4b8e73d4f22
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/clothing/uniforms_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi
new file mode 100644
index 000000000000..e6f511c03610
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/briefcases_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi
new file mode 100644
index 000000000000..95a2586a382b
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/briefcases_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/construction_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/construction_lefthand.dmi
new file mode 100644
index 000000000000..e659d73038a6
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/construction_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/construction_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/construction_righthand.dmi
new file mode 100644
index 000000000000..7b9002020b7c
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/construction_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi
new file mode 100644
index 000000000000..3a9edad59baf
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi
new file mode 100644
index 000000000000..ecadefd69367
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/hydroponics_tools_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/hydroponics_tools_lefthand.dmi
new file mode 100644
index 000000000000..59118927a5fa
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/hydroponics_tools_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/hydroponics_tools_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/hydroponics_tools_righthand.dmi
new file mode 100644
index 000000000000..0f256c86dd87
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/hydroponics_tools_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/janitor_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/janitor_lefthand.dmi
new file mode 100644
index 000000000000..3519ecb84b86
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/janitor_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/janitor_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/janitor_righthand.dmi
new file mode 100644
index 000000000000..3c5ef7fadc96
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/janitor_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/kitchen_tools_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/kitchen_tools_lefthand.dmi
new file mode 100644
index 000000000000..75cf509abf0c
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/kitchen_tools_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/kitchen_tools_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/kitchen_tools_righthand.dmi
new file mode 100644
index 000000000000..7dcfb12afa8f
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/kitchen_tools_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi
new file mode 100644
index 000000000000..915ac197530b
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi
new file mode 100644
index 000000000000..b66df16669c4
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/paint_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/paint_lefthand.dmi
new file mode 100644
index 000000000000..38c7263f61ba
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/paint_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/paint_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/paint_righthand.dmi
new file mode 100644
index 000000000000..ca5009bf6ac6
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/paint_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/paperwork_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/paperwork_lefthand.dmi
new file mode 100644
index 000000000000..1ebb5df90056
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/paperwork_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/paperwork_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/paperwork_righthand.dmi
new file mode 100644
index 000000000000..6d02fdaec9be
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/paperwork_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/security_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/security_lefthand.dmi
new file mode 100644
index 000000000000..83b85559f48a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/security_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/security_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/security_righthand.dmi
new file mode 100644
index 000000000000..045c9db20bf4
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/security_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/tanks_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/tanks_lefthand.dmi
new file mode 100644
index 000000000000..fcda92422910
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/tanks_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/tanks_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/tanks_righthand.dmi
new file mode 100644
index 000000000000..6eff45ee6cca
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/tanks_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/toolboxes_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/toolboxes_lefthand.dmi
new file mode 100644
index 000000000000..e6ed9c7f285d
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/toolboxes_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/toolboxes_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/toolboxes_righthand.dmi
new file mode 100644
index 000000000000..f3178fd0fcda
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/toolboxes_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi
new file mode 100644
index 000000000000..766883de3dd9
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi
new file mode 100644
index 000000000000..ac0ef207c055
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/bedsheets_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/bedsheets_lefthand.dmi
new file mode 100644
index 000000000000..07b9aa00c993
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/bedsheets_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/bedsheets_righthand.dmi b/icons/mob/humans/onmob/inhands/items/bedsheets_righthand.dmi
new file mode 100644
index 000000000000..69928ea6b1f2
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/bedsheets_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi
new file mode 100644
index 000000000000..e29f34edb7a8
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/books_righthand.dmi b/icons/mob/humans/onmob/inhands/items/books_righthand.dmi
new file mode 100644
index 000000000000..5e8362a85992
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/books_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/bottles_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/bottles_lefthand.dmi
new file mode 100644
index 000000000000..dd26d0d7aa45
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/bottles_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/bottles_righthand.dmi b/icons/mob/humans/onmob/inhands/items/bottles_righthand.dmi
new file mode 100644
index 000000000000..5f0507d7b859
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/bottles_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/critters_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/critters_lefthand.dmi
new file mode 100644
index 000000000000..7e39c7000402
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/critters_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/critters_righthand.dmi b/icons/mob/humans/onmob/inhands/items/critters_righthand.dmi
new file mode 100644
index 000000000000..c2ea5824c616
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/critters_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/food_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/food_lefthand.dmi
new file mode 100644
index 000000000000..34a859cfac69
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/food_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/food_righthand.dmi b/icons/mob/humans/onmob/inhands/items/food_righthand.dmi
new file mode 100644
index 000000000000..fc3dcbc22ace
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/food_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/furniture_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/furniture_lefthand.dmi
new file mode 100644
index 000000000000..38f3a0b5880a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/furniture_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/furniture_righthand.dmi b/icons/mob/humans/onmob/inhands/items/furniture_righthand.dmi
new file mode 100644
index 000000000000..0ff1a8628959
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/furniture_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/ids_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/ids_lefthand.dmi
new file mode 100644
index 000000000000..a2da0282232e
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/ids_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/ids_righthand.dmi b/icons/mob/humans/onmob/inhands/items/ids_righthand.dmi
new file mode 100644
index 000000000000..c946c2b73531
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/ids_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/items_lefthand_64.dmi b/icons/mob/humans/onmob/inhands/items/items_lefthand_64.dmi
similarity index 100%
rename from icons/mob/humans/onmob/items_lefthand_64.dmi
rename to icons/mob/humans/onmob/inhands/items/items_lefthand_64.dmi
diff --git a/icons/mob/humans/onmob/items_righthand_64.dmi b/icons/mob/humans/onmob/inhands/items/items_righthand_64.dmi
similarity index 100%
rename from icons/mob/humans/onmob/items_righthand_64.dmi
rename to icons/mob/humans/onmob/inhands/items/items_righthand_64.dmi
diff --git a/icons/mob/humans/onmob/inhands/items/lightning_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/lightning_lefthand.dmi
new file mode 100644
index 000000000000..e5e7077bb9a9
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/lightning_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/lightning_righthand.dmi b/icons/mob/humans/onmob/inhands/items/lightning_righthand.dmi
new file mode 100644
index 000000000000..e45ced9decf4
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/lightning_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/material_stacks_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/material_stacks_lefthand.dmi
new file mode 100644
index 000000000000..fbd69b294825
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/material_stacks_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/material_stacks_righthand.dmi b/icons/mob/humans/onmob/inhands/items/material_stacks_righthand.dmi
new file mode 100644
index 000000000000..76a97ee5b195
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/material_stacks_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/organs_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/organs_lefthand.dmi
new file mode 100644
index 000000000000..0f9ef0cefa8b
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/organs_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/organs_righthand.dmi b/icons/mob/humans/onmob/inhands/items/organs_righthand.dmi
new file mode 100644
index 000000000000..312a7adcd771
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/organs_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi
new file mode 100644
index 000000000000..34327d62f06c
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi b/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi
new file mode 100644
index 000000000000..53726b6baaff
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/toys_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/toys_lefthand.dmi
new file mode 100644
index 000000000000..cbf3e21f8eaa
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/toys_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items/toys_righthand.dmi b/icons/mob/humans/onmob/inhands/items/toys_righthand.dmi
new file mode 100644
index 000000000000..d2898d0cf0d6
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items/toys_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi
new file mode 100644
index 000000000000..5c1588117c40
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi
new file mode 100644
index 000000000000..a8296b45faff
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi
new file mode 100644
index 000000000000..e1796eaccdf3
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi
new file mode 100644
index 000000000000..761dd6cf92e1
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi
new file mode 100644
index 000000000000..528459b5f0ee
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi
new file mode 100644
index 000000000000..caf9e635d1a7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi
new file mode 100644
index 000000000000..8982a0be5331
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi
new file mode 100644
index 000000000000..4cc01307685b
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi
new file mode 100644
index 000000000000..d20fee6ee9d9
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi b/icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi
new file mode 100644
index 000000000000..179c286b10b2
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/ammo_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/ammo_lefthand.dmi
new file mode 100644
index 000000000000..62c6738309cd
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/ammo_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/ammo_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/ammo_righthand.dmi
new file mode 100644
index 000000000000..ad40eefdd9d1
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/ammo_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/grenades_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/grenades_lefthand.dmi
new file mode 100644
index 000000000000..aff7aed542a1
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/grenades_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/grenades_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/grenades_righthand.dmi
new file mode 100644
index 000000000000..cd90896e48d0
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/grenades_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/assault_rifles_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/assault_rifles_lefthand.dmi
new file mode 100644
index 000000000000..0ad882035ee8
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/assault_rifles_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/assault_rifles_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/assault_rifles_righthand.dmi
new file mode 100644
index 000000000000..1d23a0e7977a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/assault_rifles_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/energy_weapons_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/energy_weapons_lefthand.dmi
new file mode 100644
index 000000000000..63310e471b1f
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/energy_weapons_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/energy_weapons_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/energy_weapons_righthand.dmi
new file mode 100644
index 000000000000..2dae89236b8c
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/energy_weapons_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/flamers_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/flamers_lefthand.dmi
new file mode 100644
index 000000000000..754cc802ccfa
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/flamers_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/flamers_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/flamers_righthand.dmi
new file mode 100644
index 000000000000..b386e2a4bb82
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/flamers_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/grenade_launchers_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/grenade_launchers_lefthand.dmi
new file mode 100644
index 000000000000..70277733b568
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/grenade_launchers_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/grenade_launchers_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/grenade_launchers_righthand.dmi
new file mode 100644
index 000000000000..d281a505cbf7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/grenade_launchers_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi
new file mode 100644
index 000000000000..0b55cfedeb3f
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi
new file mode 100644
index 000000000000..778780632438
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/marksman_rifles_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/marksman_rifles_lefthand.dmi
new file mode 100644
index 000000000000..a2898d35963d
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/marksman_rifles_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/marksman_rifles_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/marksman_rifles_righthand.dmi
new file mode 100644
index 000000000000..6cf067da6c3f
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/marksman_rifles_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_lefthand.dmi
new file mode 100644
index 000000000000..463a39092559
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_righthand.dmi
new file mode 100644
index 000000000000..401e1cd1d009
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/misc_weapons_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi
new file mode 100644
index 000000000000..f6370e8db792
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi
new file mode 100644
index 000000000000..c63206c3a3f7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi
new file mode 100644
index 000000000000..1000bb01a8c7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi
new file mode 100644
index 000000000000..f77ed64b357e
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_lefthand.dmi
new file mode 100644
index 000000000000..a64e62a49787
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_righthand.dmi
new file mode 100644
index 000000000000..35cb49daad9d
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/shotguns_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/shotguns_lefthand.dmi
new file mode 100644
index 000000000000..f156f2b3ace1
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/shotguns_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/shotguns_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/shotguns_righthand.dmi
new file mode 100644
index 000000000000..3b0b208a627f
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/shotguns_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi
new file mode 100644
index 000000000000..2fa6950428ce
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi
new file mode 100644
index 000000000000..aae2c591b940
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/axes_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/axes_lefthand.dmi
new file mode 100644
index 000000000000..9d0b3d7ef725
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/axes_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/axes_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/axes_righthand.dmi
new file mode 100644
index 000000000000..09e322c444f7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/axes_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/canes_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/canes_lefthand.dmi
new file mode 100644
index 000000000000..d06ba468a891
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/canes_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/canes_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/canes_righthand.dmi
new file mode 100644
index 000000000000..db2bfbb22d8a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/canes_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/energy_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/energy_lefthand.dmi
new file mode 100644
index 000000000000..6d6f819001e7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/energy_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/energy_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/energy_righthand.dmi
new file mode 100644
index 000000000000..a7eb34bf70ad
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/energy_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi
new file mode 100644
index 000000000000..c8ac7b334ef3
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi
new file mode 100644
index 000000000000..9181ecd2c21a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/misc_weapons_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/misc_weapons_lefthand.dmi
new file mode 100644
index 000000000000..50c0e50e6c77
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/misc_weapons_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/misc_weapons_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/misc_weapons_righthand.dmi
new file mode 100644
index 000000000000..27f06d3a7471
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/misc_weapons_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi
new file mode 100644
index 000000000000..873bccb3693a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi
new file mode 100644
index 000000000000..8a2927b89c3a
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi
new file mode 100644
index 000000000000..54e7895a309e
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi
new file mode 100644
index 000000000000..ab817ef441d7
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/spears_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/spears_lefthand.dmi
new file mode 100644
index 000000000000..06775133e0a4
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/spears_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/spears_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/spears_righthand.dmi
new file mode 100644
index 000000000000..13d2440522a3
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/spears_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi
new file mode 100644
index 000000000000..e2084f56f769
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi differ
diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi
new file mode 100644
index 000000000000..52f165677b11
Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi differ
diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi
deleted file mode 100644
index f949062be7b7..000000000000
Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi
deleted file mode 100644
index bc243d0228c3..000000000000
Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi
deleted file mode 100644
index 1f70077321ee..000000000000
Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi
deleted file mode 100644
index 29f8cd8e1043..000000000000
Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/mask.dmi b/icons/mob/humans/onmob/mask.dmi
deleted file mode 100644
index 0c4ac97807d9..000000000000
Binary files a/icons/mob/humans/onmob/mask.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi
deleted file mode 100644
index db5514a0f3b8..000000000000
Binary files a/icons/mob/humans/onmob/suit_0.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi
deleted file mode 100644
index c028f6eae887..000000000000
Binary files a/icons/mob/humans/onmob/suit_1.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi
deleted file mode 100644
index cde35b456048..000000000000
Binary files a/icons/mob/humans/onmob/suit_slot.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi
deleted file mode 100644
index b4dc3d6ad9e8..000000000000
Binary files a/icons/mob/humans/onmob/ties.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi
deleted file mode 100644
index d1fb32f6d05d..000000000000
Binary files a/icons/mob/humans/onmob/uniform_0.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/uniform_1.dmi b/icons/mob/humans/onmob/uniform_1.dmi
deleted file mode 100644
index 34a85bae0e1e..000000000000
Binary files a/icons/mob/humans/onmob/uniform_1.dmi and /dev/null differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index f3485de9aa9a..477fddffe539 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 0ec19bef4a29..6429fd26c191 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/mob/screen_ghost.dmi b/icons/mob/screen_ghost.dmi
index 3fedae4c80b1..651c2abf5fc4 100644
Binary files a/icons/mob/screen_ghost.dmi and b/icons/mob/screen_ghost.dmi differ
diff --git a/icons/mob/xenonids/larva.dmi b/icons/mob/xenonids/castes/tier_0/larva.dmi
similarity index 100%
rename from icons/mob/xenonids/larva.dmi
rename to icons/mob/xenonids/castes/tier_0/larva.dmi
diff --git a/icons/mob/xenonids/lesser_drone.dmi b/icons/mob/xenonids/castes/tier_0/lesser_drone.dmi
similarity index 100%
rename from icons/mob/xenonids/lesser_drone.dmi
rename to icons/mob/xenonids/castes/tier_0/lesser_drone.dmi
diff --git a/icons/mob/xenonids/xenonid_crab.dmi b/icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi
similarity index 100%
rename from icons/mob/xenonids/xenonid_crab.dmi
rename to icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi
diff --git a/icons/mob/xenonids/defender.dmi b/icons/mob/xenonids/castes/tier_1/defender.dmi
similarity index 100%
rename from icons/mob/xenonids/defender.dmi
rename to icons/mob/xenonids/castes/tier_1/defender.dmi
diff --git a/icons/mob/xenonids/drone.dmi b/icons/mob/xenonids/castes/tier_1/drone.dmi
similarity index 100%
rename from icons/mob/xenonids/drone.dmi
rename to icons/mob/xenonids/castes/tier_1/drone.dmi
diff --git a/icons/mob/xenonids/runner.dmi b/icons/mob/xenonids/castes/tier_1/runner.dmi
similarity index 100%
rename from icons/mob/xenonids/runner.dmi
rename to icons/mob/xenonids/castes/tier_1/runner.dmi
diff --git a/icons/mob/xenonids/sentinel.dmi b/icons/mob/xenonids/castes/tier_1/sentinel.dmi
similarity index 100%
rename from icons/mob/xenonids/sentinel.dmi
rename to icons/mob/xenonids/castes/tier_1/sentinel.dmi
diff --git a/icons/mob/xenonids/burrower.dmi b/icons/mob/xenonids/castes/tier_2/burrower.dmi
similarity index 100%
rename from icons/mob/xenonids/burrower.dmi
rename to icons/mob/xenonids/castes/tier_2/burrower.dmi
diff --git a/icons/mob/xenonids/carrier.dmi b/icons/mob/xenonids/castes/tier_2/carrier.dmi
similarity index 100%
rename from icons/mob/xenonids/carrier.dmi
rename to icons/mob/xenonids/castes/tier_2/carrier.dmi
diff --git a/icons/mob/xenonids/hivelord.dmi b/icons/mob/xenonids/castes/tier_2/hivelord.dmi
similarity index 100%
rename from icons/mob/xenonids/hivelord.dmi
rename to icons/mob/xenonids/castes/tier_2/hivelord.dmi
diff --git a/icons/mob/xenonids/lurker.dmi b/icons/mob/xenonids/castes/tier_2/lurker.dmi
similarity index 100%
rename from icons/mob/xenonids/lurker.dmi
rename to icons/mob/xenonids/castes/tier_2/lurker.dmi
diff --git a/icons/mob/xenonids/spitter.dmi b/icons/mob/xenonids/castes/tier_2/spitter.dmi
similarity index 100%
rename from icons/mob/xenonids/spitter.dmi
rename to icons/mob/xenonids/castes/tier_2/spitter.dmi
diff --git a/icons/mob/xenonids/warrior.dmi b/icons/mob/xenonids/castes/tier_2/warrior.dmi
similarity index 100%
rename from icons/mob/xenonids/warrior.dmi
rename to icons/mob/xenonids/castes/tier_2/warrior.dmi
diff --git a/icons/mob/xenonids/boiler.dmi b/icons/mob/xenonids/castes/tier_3/boiler.dmi
similarity index 100%
rename from icons/mob/xenonids/boiler.dmi
rename to icons/mob/xenonids/castes/tier_3/boiler.dmi
diff --git a/icons/mob/xenonids/crusher.dmi b/icons/mob/xenonids/castes/tier_3/crusher.dmi
similarity index 100%
rename from icons/mob/xenonids/crusher.dmi
rename to icons/mob/xenonids/castes/tier_3/crusher.dmi
diff --git a/icons/mob/xenonids/praetorian.dmi b/icons/mob/xenonids/castes/tier_3/praetorian.dmi
similarity index 100%
rename from icons/mob/xenonids/praetorian.dmi
rename to icons/mob/xenonids/castes/tier_3/praetorian.dmi
diff --git a/icons/mob/xenonids/ravager.dmi b/icons/mob/xenonids/castes/tier_3/ravager.dmi
similarity index 100%
rename from icons/mob/xenonids/ravager.dmi
rename to icons/mob/xenonids/castes/tier_3/ravager.dmi
diff --git a/icons/mob/xenonids/ovipositor.dmi b/icons/mob/xenonids/castes/tier_4/ovipositor.dmi
similarity index 100%
rename from icons/mob/xenonids/ovipositor.dmi
rename to icons/mob/xenonids/castes/tier_4/ovipositor.dmi
diff --git a/icons/mob/xenonids/queen.dmi b/icons/mob/xenonids/castes/tier_4/queen.dmi
similarity index 100%
rename from icons/mob/xenonids/queen.dmi
rename to icons/mob/xenonids/castes/tier_4/queen.dmi
diff --git a/icons/mob/xenonids/facehugger.dmi b/icons/mob/xenonids/facehugger.dmi
deleted file mode 100644
index cd688d441d64..000000000000
Binary files a/icons/mob/xenonids/facehugger.dmi and /dev/null differ
diff --git a/icons/mob/xenos/hellhound.dmi b/icons/mob/xenos/castes/hellhound.dmi
similarity index 100%
rename from icons/mob/xenos/hellhound.dmi
rename to icons/mob/xenos/castes/hellhound.dmi
diff --git a/icons/mob/xenos/facehugger.dmi b/icons/mob/xenos/castes/tier_0/facehugger.dmi
similarity index 100%
rename from icons/mob/xenos/facehugger.dmi
rename to icons/mob/xenos/castes/tier_0/facehugger.dmi
diff --git a/icons/mob/xenos/larva.dmi b/icons/mob/xenos/castes/tier_0/larva.dmi
similarity index 100%
rename from icons/mob/xenos/larva.dmi
rename to icons/mob/xenos/castes/tier_0/larva.dmi
diff --git a/icons/mob/xenos/lesser_drone.dmi b/icons/mob/xenos/castes/tier_0/lesser_drone.dmi
similarity index 100%
rename from icons/mob/xenos/lesser_drone.dmi
rename to icons/mob/xenos/castes/tier_0/lesser_drone.dmi
diff --git a/icons/mob/xenos/predalien_larva.dmi b/icons/mob/xenos/castes/tier_0/predalien_larva.dmi
similarity index 100%
rename from icons/mob/xenos/predalien_larva.dmi
rename to icons/mob/xenos/castes/tier_0/predalien_larva.dmi
diff --git a/icons/mob/xenos/defender.dmi b/icons/mob/xenos/castes/tier_1/defender.dmi
similarity index 100%
rename from icons/mob/xenos/defender.dmi
rename to icons/mob/xenos/castes/tier_1/defender.dmi
diff --git a/icons/mob/xenos/drone.dmi b/icons/mob/xenos/castes/tier_1/drone.dmi
similarity index 100%
rename from icons/mob/xenos/drone.dmi
rename to icons/mob/xenos/castes/tier_1/drone.dmi
diff --git a/icons/mob/xenos/drone_strain_overlays.dmi b/icons/mob/xenos/castes/tier_1/drone_strain_overlays.dmi
similarity index 100%
rename from icons/mob/xenos/drone_strain_overlays.dmi
rename to icons/mob/xenos/castes/tier_1/drone_strain_overlays.dmi
diff --git a/icons/mob/xenos/runner.dmi b/icons/mob/xenos/castes/tier_1/runner.dmi
similarity index 100%
rename from icons/mob/xenos/runner.dmi
rename to icons/mob/xenos/castes/tier_1/runner.dmi
diff --git a/icons/mob/xenos/sentinel.dmi b/icons/mob/xenos/castes/tier_1/sentinel.dmi
similarity index 100%
rename from icons/mob/xenos/sentinel.dmi
rename to icons/mob/xenos/castes/tier_1/sentinel.dmi
diff --git a/icons/mob/xenos/burrower.dmi b/icons/mob/xenos/castes/tier_2/burrower.dmi
similarity index 100%
rename from icons/mob/xenos/burrower.dmi
rename to icons/mob/xenos/castes/tier_2/burrower.dmi
diff --git a/icons/mob/xenos/carrier.dmi b/icons/mob/xenos/castes/tier_2/carrier.dmi
similarity index 100%
rename from icons/mob/xenos/carrier.dmi
rename to icons/mob/xenos/castes/tier_2/carrier.dmi
diff --git a/icons/mob/xenos/hivelord.dmi b/icons/mob/xenos/castes/tier_2/hivelord.dmi
similarity index 100%
rename from icons/mob/xenos/hivelord.dmi
rename to icons/mob/xenos/castes/tier_2/hivelord.dmi
diff --git a/icons/mob/xenos/lurker.dmi b/icons/mob/xenos/castes/tier_2/lurker.dmi
similarity index 100%
rename from icons/mob/xenos/lurker.dmi
rename to icons/mob/xenos/castes/tier_2/lurker.dmi
diff --git a/icons/mob/xenos/spitter.dmi b/icons/mob/xenos/castes/tier_2/spitter.dmi
similarity index 100%
rename from icons/mob/xenos/spitter.dmi
rename to icons/mob/xenos/castes/tier_2/spitter.dmi
diff --git a/icons/mob/xenos/warrior.dmi b/icons/mob/xenos/castes/tier_2/warrior.dmi
similarity index 100%
rename from icons/mob/xenos/warrior.dmi
rename to icons/mob/xenos/castes/tier_2/warrior.dmi
diff --git a/icons/mob/xenos/boiler.dmi b/icons/mob/xenos/castes/tier_3/boiler.dmi
similarity index 100%
rename from icons/mob/xenos/boiler.dmi
rename to icons/mob/xenos/castes/tier_3/boiler.dmi
diff --git a/icons/mob/xenos/crusher.dmi b/icons/mob/xenos/castes/tier_3/crusher.dmi
similarity index 100%
rename from icons/mob/xenos/crusher.dmi
rename to icons/mob/xenos/castes/tier_3/crusher.dmi
diff --git a/icons/mob/xenos/praetorian.dmi b/icons/mob/xenos/castes/tier_3/praetorian.dmi
similarity index 100%
rename from icons/mob/xenos/praetorian.dmi
rename to icons/mob/xenos/castes/tier_3/praetorian.dmi
diff --git a/icons/mob/xenos/ravager.dmi b/icons/mob/xenos/castes/tier_3/ravager.dmi
similarity index 100%
rename from icons/mob/xenos/ravager.dmi
rename to icons/mob/xenos/castes/tier_3/ravager.dmi
diff --git a/icons/mob/xenos/ovipositor.dmi b/icons/mob/xenos/castes/tier_4/ovipositor.dmi
similarity index 100%
rename from icons/mob/xenos/ovipositor.dmi
rename to icons/mob/xenos/castes/tier_4/ovipositor.dmi
diff --git a/icons/mob/xenos/predalien.dmi b/icons/mob/xenos/castes/tier_4/predalien.dmi
similarity index 100%
rename from icons/mob/xenos/predalien.dmi
rename to icons/mob/xenos/castes/tier_4/predalien.dmi
diff --git a/icons/mob/xenos/queen.dmi b/icons/mob/xenos/castes/tier_4/queen.dmi
similarity index 100%
rename from icons/mob/xenos/queen.dmi
rename to icons/mob/xenos/castes/tier_4/queen.dmi
diff --git a/icons/mob/xenos/xenonid_crab.dmi b/icons/mob/xenos/xenonid_crab.dmi
deleted file mode 100644
index 1ad5715463f6..000000000000
Binary files a/icons/mob/xenos/xenonid_crab.dmi and /dev/null differ
diff --git a/icons/monkey_icos.dmi b/icons/monkey_icos.dmi
deleted file mode 100644
index f8cf37cb39c5..000000000000
Binary files a/icons/monkey_icos.dmi and /dev/null differ
diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi
index 157a7692b2a8..3a60dbaf51fa 100644
Binary files a/icons/obj/bodybag.dmi and b/icons/obj/bodybag.dmi differ
diff --git a/icons/obj/cryobag.dmi b/icons/obj/cryobag.dmi
deleted file mode 100644
index d27485711e65..000000000000
Binary files a/icons/obj/cryobag.dmi and /dev/null differ
diff --git a/icons/obj/items/Marine_Research.dmi b/icons/obj/items/Marine_Research.dmi
index 972008a9210c..1b7623440f4d 100644
Binary files a/icons/obj/items/Marine_Research.dmi and b/icons/obj/items/Marine_Research.dmi differ
diff --git a/icons/obj/items/bedrolls.dmi b/icons/obj/items/bedrolls.dmi
deleted file mode 100644
index c36e07002a3d..000000000000
Binary files a/icons/obj/items/bedrolls.dmi and /dev/null differ
diff --git a/icons/obj/items/bedsheets.dmi b/icons/obj/items/bedsheets.dmi
new file mode 100644
index 000000000000..933a8094e239
Binary files /dev/null and b/icons/obj/items/bedsheets.dmi differ
diff --git a/icons/obj/items/binoculars.dmi b/icons/obj/items/binoculars.dmi
index b861687ba654..6f942628d3f4 100644
Binary files a/icons/obj/items/binoculars.dmi and b/icons/obj/items/binoculars.dmi differ
diff --git a/icons/obj/items/books.dmi b/icons/obj/items/books.dmi
index 9b53dc652807..9c73a15230cb 100644
Binary files a/icons/obj/items/books.dmi and b/icons/obj/items/books.dmi differ
diff --git a/icons/obj/items/candle.dmi b/icons/obj/items/candle.dmi
index 07ab47a69836..ae5baa5d1e6a 100644
Binary files a/icons/obj/items/candle.dmi and b/icons/obj/items/candle.dmi differ
diff --git a/icons/obj/items/ceramic_plates.dmi b/icons/obj/items/ceramic_plates.dmi
new file mode 100644
index 000000000000..de96f01420a1
Binary files /dev/null and b/icons/obj/items/ceramic_plates.dmi differ
diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi
deleted file mode 100644
index 89b3ca2195fa..000000000000
Binary files a/icons/obj/items/cigarettes.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/accessory/armbands.dmi b/icons/obj/items/clothing/accessory/armbands.dmi
new file mode 100644
index 000000000000..417e24791088
Binary files /dev/null and b/icons/obj/items/clothing/accessory/armbands.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi
new file mode 100644
index 000000000000..edb203489bfd
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/armbands.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi
new file mode 100644
index 000000000000..4a79e556ed4b
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi
new file mode 100644
index 000000000000..6ae22d5d4326
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/ponchos.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/ponchos.dmi
new file mode 100644
index 000000000000..e1546ca61904
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/ponchos.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi
new file mode 100644
index 000000000000..7a22812d8283
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/ties.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/ties.dmi
new file mode 100644
index 000000000000..07f26d7bbe99
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/ties.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi
new file mode 100644
index 000000000000..08d18dc15466
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi differ
diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/yautja.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/yautja.dmi
new file mode 100644
index 000000000000..8348da5adbef
Binary files /dev/null and b/icons/obj/items/clothing/accessory/inventory_overlays/yautja.dmi differ
diff --git a/icons/obj/items/clothing/accessory/medals.dmi b/icons/obj/items/clothing/accessory/medals.dmi
new file mode 100644
index 000000000000..f6150c0a8dff
Binary files /dev/null and b/icons/obj/items/clothing/accessory/medals.dmi differ
diff --git a/icons/obj/items/clothing/accessory/misc.dmi b/icons/obj/items/clothing/accessory/misc.dmi
new file mode 100644
index 000000000000..e5fc84f0af84
Binary files /dev/null and b/icons/obj/items/clothing/accessory/misc.dmi differ
diff --git a/icons/obj/items/clothing/accessory/patches.dmi b/icons/obj/items/clothing/accessory/patches.dmi
new file mode 100644
index 000000000000..6fe5fe8487ee
Binary files /dev/null and b/icons/obj/items/clothing/accessory/patches.dmi differ
diff --git a/icons/obj/items/clothing/accessory/ponchos.dmi b/icons/obj/items/clothing/accessory/ponchos.dmi
new file mode 100644
index 000000000000..174cbc86c32a
Binary files /dev/null and b/icons/obj/items/clothing/accessory/ponchos.dmi differ
diff --git a/icons/obj/items/clothing/accessory/ranks.dmi b/icons/obj/items/clothing/accessory/ranks.dmi
new file mode 100644
index 000000000000..8abca6c6a82a
Binary files /dev/null and b/icons/obj/items/clothing/accessory/ranks.dmi differ
diff --git a/icons/obj/items/clothing/accessory/ties.dmi b/icons/obj/items/clothing/accessory/ties.dmi
new file mode 100644
index 000000000000..447386c6878f
Binary files /dev/null and b/icons/obj/items/clothing/accessory/ties.dmi differ
diff --git a/icons/obj/items/clothing/accessory/watches.dmi b/icons/obj/items/clothing/accessory/watches.dmi
new file mode 100644
index 000000000000..b5b85b72f435
Binary files /dev/null and b/icons/obj/items/clothing/accessory/watches.dmi differ
diff --git a/icons/obj/items/clothing/accessory/webbings.dmi b/icons/obj/items/clothing/accessory/webbings.dmi
new file mode 100644
index 000000000000..382d6e871edc
Binary files /dev/null and b/icons/obj/items/clothing/accessory/webbings.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks.dmi b/icons/obj/items/clothing/backpack/backpacks.dmi
new file mode 100644
index 000000000000..c1c417303764
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_faction/TWE.dmi b/icons/obj/items/clothing/backpack/backpacks_by_faction/TWE.dmi
new file mode 100644
index 000000000000..236e2a668397
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_faction/TWE.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi b/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi
new file mode 100644
index 000000000000..3e898f86b5b2
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_faction/UPP.dmi b/icons/obj/items/clothing/backpack/backpacks_by_faction/UPP.dmi
new file mode 100644
index 000000000000..a1944c0d5741
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_faction/UPP.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_faction/WY.dmi b/icons/obj/items/clothing/backpack/backpacks_by_faction/WY.dmi
new file mode 100644
index 000000000000..dc2c3b6948e6
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_faction/WY.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi
new file mode 100644
index 000000000000..abf38383257a
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi
new file mode 100644
index 000000000000..e9d39618da07
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi
new file mode 100644
index 000000000000..abf38383257a
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi
new file mode 100644
index 000000000000..96298ed62a4d
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi differ
diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi
new file mode 100644
index 000000000000..96298ed62a4d
Binary files /dev/null and b/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi differ
diff --git a/icons/obj/items/clothing/backpack/donator.dmi b/icons/obj/items/clothing/backpack/donator.dmi
new file mode 100644
index 000000000000..96adee6f8bf5
Binary files /dev/null and b/icons/obj/items/clothing/backpack/donator.dmi differ
diff --git a/icons/obj/items/clothing/backpack/smartpack.dmi b/icons/obj/items/clothing/backpack/smartpack.dmi
new file mode 100644
index 000000000000..8eded0114c96
Binary files /dev/null and b/icons/obj/items/clothing/backpack/smartpack.dmi differ
diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi
deleted file mode 100644
index 4ac5ae6b39b6..000000000000
Binary files a/icons/obj/items/clothing/backpacks.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi
deleted file mode 100644
index 80070b88b560..000000000000
Binary files a/icons/obj/items/clothing/belts.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/belts/belts.dmi b/icons/obj/items/clothing/belts/belts.dmi
new file mode 100644
index 000000000000..6d74da4a9318
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_faction/TWE.dmi b/icons/obj/items/clothing/belts/belts_by_faction/TWE.dmi
new file mode 100644
index 000000000000..2560cae03a51
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_faction/TWE.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_faction/UPP.dmi b/icons/obj/items/clothing/belts/belts_by_faction/UPP.dmi
new file mode 100644
index 000000000000..f32bb86f844f
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_faction/UPP.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_map/classic.dmi b/icons/obj/items/clothing/belts/belts_by_map/classic.dmi
new file mode 100644
index 000000000000..55fd279f3235
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_map/classic.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_map/desert.dmi b/icons/obj/items/clothing/belts/belts_by_map/desert.dmi
new file mode 100644
index 000000000000..ac7e1fc9e073
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_map/desert.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi b/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi
new file mode 100644
index 000000000000..55fd279f3235
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_map/snow.dmi b/icons/obj/items/clothing/belts/belts_by_map/snow.dmi
new file mode 100644
index 000000000000..1e5c6634d9fc
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_map/snow.dmi differ
diff --git a/icons/obj/items/clothing/belts/belts_by_map/urban.dmi b/icons/obj/items/clothing/belts/belts_by_map/urban.dmi
new file mode 100644
index 000000000000..1e5c6634d9fc
Binary files /dev/null and b/icons/obj/items/clothing/belts/belts_by_map/urban.dmi differ
diff --git a/icons/obj/items/clothing/belts/donator.dmi b/icons/obj/items/clothing/belts/donator.dmi
new file mode 100644
index 000000000000..880a0d17d587
Binary files /dev/null and b/icons/obj/items/clothing/belts/donator.dmi differ
diff --git a/icons/obj/items/clothing/belts/holstered_guns.dmi b/icons/obj/items/clothing/belts/holstered_guns.dmi
new file mode 100644
index 000000000000..72eb754f8ca7
Binary files /dev/null and b/icons/obj/items/clothing/belts/holstered_guns.dmi differ
diff --git a/icons/obj/items/clothing/belts/misc.dmi b/icons/obj/items/clothing/belts/misc.dmi
new file mode 100644
index 000000000000..232a88f2d83c
Binary files /dev/null and b/icons/obj/items/clothing/belts/misc.dmi differ
diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi
deleted file mode 100644
index 4710917b0870..000000000000
Binary files a/icons/obj/items/clothing/cm_hats.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi
deleted file mode 100644
index 67590892bf67..000000000000
Binary files a/icons/obj/items/clothing/cm_suits.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/BOOT.dmi b/icons/obj/items/clothing/donor/BOOT.dmi
deleted file mode 100644
index 4973fda386ea..000000000000
Binary files a/icons/obj/items/clothing/donor/BOOT.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/HEAD.dmi b/icons/obj/items/clothing/donor/HEAD.dmi
deleted file mode 100644
index 23a29f5a2a58..000000000000
Binary files a/icons/obj/items/clothing/donor/HEAD.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/MASKS.dmi b/icons/obj/items/clothing/donor/MASKS.dmi
deleted file mode 100644
index 975890512760..000000000000
Binary files a/icons/obj/items/clothing/donor/MASKS.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/RainbowCoat.dmi b/icons/obj/items/clothing/donor/RainbowCoat.dmi
deleted file mode 100644
index c1d1c82e61db..000000000000
Binary files a/icons/obj/items/clothing/donor/RainbowCoat.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/SUITS.dmi b/icons/obj/items/clothing/donor/SUITS.dmi
deleted file mode 100644
index e6e4ffef14e5..000000000000
Binary files a/icons/obj/items/clothing/donor/SUITS.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/donor/UNIFORM.dmi b/icons/obj/items/clothing/donor/UNIFORM.dmi
deleted file mode 100644
index 5c43f7503a46..000000000000
Binary files a/icons/obj/items/clothing/donor/UNIFORM.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/gloves.dmi b/icons/obj/items/clothing/gloves.dmi
index b290778d2d28..d45e750a7a8f 100644
Binary files a/icons/obj/items/clothing/gloves.dmi and b/icons/obj/items/clothing/gloves.dmi differ
diff --git a/icons/obj/items/clothing/halloween_clothes.dmi b/icons/obj/items/clothing/halloween_clothes.dmi
index 530b7cf5a905..9645ebfb4fe9 100644
Binary files a/icons/obj/items/clothing/halloween_clothes.dmi and b/icons/obj/items/clothing/halloween_clothes.dmi differ
diff --git a/icons/obj/items/clothing/hats.dmi b/icons/obj/items/clothing/hats.dmi
deleted file mode 100644
index 45e09ebf7eaa..000000000000
Binary files a/icons/obj/items/clothing/hats.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/hats/berets.dmi b/icons/obj/items/clothing/hats/berets.dmi
new file mode 100644
index 000000000000..7ff0f399b7fd
Binary files /dev/null and b/icons/obj/items/clothing/hats/berets.dmi differ
diff --git a/icons/obj/items/clothing/hats/donator.dmi b/icons/obj/items/clothing/hats/donator.dmi
new file mode 100644
index 000000000000..da742504be3f
Binary files /dev/null and b/icons/obj/items/clothing/hats/donator.dmi differ
diff --git a/icons/obj/items/clothing/hats/formal_hats.dmi b/icons/obj/items/clothing/hats/formal_hats.dmi
new file mode 100644
index 000000000000..ca1470c5929b
Binary files /dev/null and b/icons/obj/items/clothing/hats/formal_hats.dmi differ
diff --git a/icons/obj/items/clothing/hats/hardhats.dmi b/icons/obj/items/clothing/hats/hardhats.dmi
new file mode 100644
index 000000000000..655cc1a05e63
Binary files /dev/null and b/icons/obj/items/clothing/hats/hardhats.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats.dmi b/icons/obj/items/clothing/hats/hats.dmi
new file mode 100644
index 000000000000..b69440dd979d
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/CLF.dmi b/icons/obj/items/clothing/hats/hats_by_faction/CLF.dmi
new file mode 100644
index 000000000000..25b17fe9957b
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_faction/CLF.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/CMB.dmi b/icons/obj/items/clothing/hats/hats_by_faction/CMB.dmi
new file mode 100644
index 000000000000..aac0e3e7e7d5
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_faction/CMB.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/TWE.dmi b/icons/obj/items/clothing/hats/hats_by_faction/TWE.dmi
new file mode 100644
index 000000000000..c23d27669792
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_faction/TWE.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi b/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi
new file mode 100644
index 000000000000..555f5faa4dc3
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/UPP.dmi b/icons/obj/items/clothing/hats/hats_by_faction/UPP.dmi
new file mode 100644
index 000000000000..cdb763e86f7e
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_faction/UPP.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi b/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi
new file mode 100644
index 000000000000..ea721abda8ea
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/classic.dmi b/icons/obj/items/clothing/hats/hats_by_map/classic.dmi
new file mode 100644
index 000000000000..f69d3afc0c7b
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_map/classic.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/desert.dmi b/icons/obj/items/clothing/hats/hats_by_map/desert.dmi
new file mode 100644
index 000000000000..0391e163e36f
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_map/desert.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi b/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi
new file mode 100644
index 000000000000..992ef4fae0cc
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/snow.dmi b/icons/obj/items/clothing/hats/hats_by_map/snow.dmi
new file mode 100644
index 000000000000..c7a1d89b1aee
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_map/snow.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_map/urban.dmi b/icons/obj/items/clothing/hats/hats_by_map/urban.dmi
new file mode 100644
index 000000000000..d65f56f9c902
Binary files /dev/null and b/icons/obj/items/clothing/hats/hats_by_map/urban.dmi differ
diff --git a/icons/obj/items/clothing/hats/hazard.dmi b/icons/obj/items/clothing/hats/hazard.dmi
new file mode 100644
index 000000000000..12c52cf6623f
Binary files /dev/null and b/icons/obj/items/clothing/hats/hazard.dmi differ
diff --git a/icons/obj/items/clothing/hats/headbands.dmi b/icons/obj/items/clothing/hats/headbands.dmi
new file mode 100644
index 000000000000..56531a4d2fcc
Binary files /dev/null and b/icons/obj/items/clothing/hats/headbands.dmi differ
diff --git a/icons/obj/items/clothing/hats/misc_ert_colony.dmi b/icons/obj/items/clothing/hats/misc_ert_colony.dmi
new file mode 100644
index 000000000000..1095f3568a84
Binary files /dev/null and b/icons/obj/items/clothing/hats/misc_ert_colony.dmi differ
diff --git a/icons/obj/items/clothing/hats/soft_caps.dmi b/icons/obj/items/clothing/hats/soft_caps.dmi
new file mode 100644
index 000000000000..4e500a7b9e23
Binary files /dev/null and b/icons/obj/items/clothing/hats/soft_caps.dmi differ
diff --git a/icons/obj/items/clothing/hats/surgical_caps.dmi b/icons/obj/items/clothing/hats/surgical_caps.dmi
new file mode 100644
index 000000000000..b507e3497051
Binary files /dev/null and b/icons/obj/items/clothing/hats/surgical_caps.dmi differ
diff --git a/icons/obj/items/clothing/legacy_tiered_armor.dmi b/icons/obj/items/clothing/legacy_tiered_armor.dmi
deleted file mode 100644
index 0bb2139b06d9..000000000000
Binary files a/icons/obj/items/clothing/legacy_tiered_armor.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/masks.dmi b/icons/obj/items/clothing/masks.dmi
deleted file mode 100644
index 037ee8aba119..000000000000
Binary files a/icons/obj/items/clothing/masks.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/masks/balaclava.dmi b/icons/obj/items/clothing/masks/balaclava.dmi
new file mode 100644
index 000000000000..c73fef1deab3
Binary files /dev/null and b/icons/obj/items/clothing/masks/balaclava.dmi differ
diff --git a/icons/obj/items/clothing/masks/donator.dmi b/icons/obj/items/clothing/masks/donator.dmi
new file mode 100644
index 000000000000..3d6ee0c40806
Binary files /dev/null and b/icons/obj/items/clothing/masks/donator.dmi differ
diff --git a/icons/obj/items/clothing/masks/gasmasks.dmi b/icons/obj/items/clothing/masks/gasmasks.dmi
new file mode 100644
index 000000000000..f5e8afde58ed
Binary files /dev/null and b/icons/obj/items/clothing/masks/gasmasks.dmi differ
diff --git a/icons/obj/items/clothing/masks/masks.dmi b/icons/obj/items/clothing/masks/masks.dmi
new file mode 100644
index 000000000000..48667bea9c5a
Binary files /dev/null and b/icons/obj/items/clothing/masks/masks.dmi differ
diff --git a/icons/obj/items/clothing/masks/masks_by_faction/TWE.dmi b/icons/obj/items/clothing/masks/masks_by_faction/TWE.dmi
new file mode 100644
index 000000000000..d7b5e830f0f3
Binary files /dev/null and b/icons/obj/items/clothing/masks/masks_by_faction/TWE.dmi differ
diff --git a/icons/obj/items/clothing/masks/masks_by_faction/UPP.dmi b/icons/obj/items/clothing/masks/masks_by_faction/UPP.dmi
new file mode 100644
index 000000000000..013fa822abca
Binary files /dev/null and b/icons/obj/items/clothing/masks/masks_by_faction/UPP.dmi differ
diff --git a/icons/obj/items/clothing/masks/masks_by_faction/WY.dmi b/icons/obj/items/clothing/masks/masks_by_faction/WY.dmi
new file mode 100644
index 000000000000..90ff908a7400
Binary files /dev/null and b/icons/obj/items/clothing/masks/masks_by_faction/WY.dmi differ
diff --git a/icons/obj/items/clothing/masks/scarves.dmi b/icons/obj/items/clothing/masks/scarves.dmi
new file mode 100644
index 000000000000..0309a3f96f99
Binary files /dev/null and b/icons/obj/items/clothing/masks/scarves.dmi differ
diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi
deleted file mode 100644
index cdb81b742d78..000000000000
Binary files a/icons/obj/items/clothing/suits.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/suits/armor.dmi b/icons/obj/items/clothing/suits/armor.dmi
new file mode 100644
index 000000000000..de9cd105e20e
Binary files /dev/null and b/icons/obj/items/clothing/suits/armor.dmi differ
diff --git a/icons/obj/items/clothing/suits/coats_robes.dmi b/icons/obj/items/clothing/suits/coats_robes.dmi
new file mode 100644
index 000000000000..c5c600f93d2d
Binary files /dev/null and b/icons/obj/items/clothing/suits/coats_robes.dmi differ
diff --git a/icons/obj/items/clothing/suits/donator.dmi b/icons/obj/items/clothing/suits/donator.dmi
new file mode 100644
index 000000000000..f1dafdb8ab25
Binary files /dev/null and b/icons/obj/items/clothing/suits/donator.dmi differ
diff --git a/icons/obj/items/clothing/suits/halloween.dmi b/icons/obj/items/clothing/suits/halloween.dmi
new file mode 100644
index 000000000000..0eb68917a4e3
Binary files /dev/null and b/icons/obj/items/clothing/suits/halloween.dmi differ
diff --git a/icons/obj/items/clothing/suits/hazard.dmi b/icons/obj/items/clothing/suits/hazard.dmi
new file mode 100644
index 000000000000..b542895bbf42
Binary files /dev/null and b/icons/obj/items/clothing/suits/hazard.dmi differ
diff --git a/icons/obj/items/clothing/suits/jackets.dmi b/icons/obj/items/clothing/suits/jackets.dmi
new file mode 100644
index 000000000000..496f97bc5b2d
Binary files /dev/null and b/icons/obj/items/clothing/suits/jackets.dmi differ
diff --git a/icons/obj/items/clothing/suits/misc_ert.dmi b/icons/obj/items/clothing/suits/misc_ert.dmi
new file mode 100644
index 000000000000..13ba63070eec
Binary files /dev/null and b/icons/obj/items/clothing/suits/misc_ert.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_faction/CLF.dmi b/icons/obj/items/clothing/suits/suits_by_faction/CLF.dmi
new file mode 100644
index 000000000000..a38dc6a71710
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_faction/CLF.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_faction/CMB.dmi b/icons/obj/items/clothing/suits/suits_by_faction/CMB.dmi
new file mode 100644
index 000000000000..a2c27d96ef6a
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_faction/CMB.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_faction/TWE.dmi b/icons/obj/items/clothing/suits/suits_by_faction/TWE.dmi
new file mode 100644
index 000000000000..1c8d59bcf393
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_faction/TWE.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi b/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi
new file mode 100644
index 000000000000..c88e9178d7dc
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi b/icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi
new file mode 100644
index 000000000000..00fd79f30364
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi b/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi
new file mode 100644
index 000000000000..195d0ac96889
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_map/classic.dmi b/icons/obj/items/clothing/suits/suits_by_map/classic.dmi
new file mode 100644
index 000000000000..f21996f86b4a
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_map/classic.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_map/desert.dmi b/icons/obj/items/clothing/suits/suits_by_map/desert.dmi
new file mode 100644
index 000000000000..abe3169f42f2
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_map/desert.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi b/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi
new file mode 100644
index 000000000000..3b244452b5dd
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_map/snow.dmi b/icons/obj/items/clothing/suits/suits_by_map/snow.dmi
new file mode 100644
index 000000000000..d9f0ddf88e9e
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_map/snow.dmi differ
diff --git a/icons/obj/items/clothing/suits/suits_by_map/urban.dmi b/icons/obj/items/clothing/suits/suits_by_map/urban.dmi
new file mode 100644
index 000000000000..3e095fce7d5e
Binary files /dev/null and b/icons/obj/items/clothing/suits/suits_by_map/urban.dmi differ
diff --git a/icons/obj/items/clothing/suits/vests_aprons.dmi b/icons/obj/items/clothing/suits/vests_aprons.dmi
new file mode 100644
index 000000000000..716ca3afb8b9
Binary files /dev/null and b/icons/obj/items/clothing/suits/vests_aprons.dmi differ
diff --git a/icons/obj/items/clothing/suits/windbreakers.dmi b/icons/obj/items/clothing/suits/windbreakers.dmi
new file mode 100644
index 000000000000..0bead52ef066
Binary files /dev/null and b/icons/obj/items/clothing/suits/windbreakers.dmi differ
diff --git a/icons/obj/items/clothing/ties.dmi b/icons/obj/items/clothing/ties.dmi
deleted file mode 100644
index 496dd3dc07e5..000000000000
Binary files a/icons/obj/items/clothing/ties.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi
deleted file mode 100644
index 8db72b11cbe3..000000000000
Binary files a/icons/obj/items/clothing/ties_overlay.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi
deleted file mode 100644
index 19a8671a4faf..000000000000
Binary files a/icons/obj/items/clothing/uniforms.dmi and /dev/null differ
diff --git a/icons/obj/items/clothing/uniforms/donator.dmi b/icons/obj/items/clothing/uniforms/donator.dmi
new file mode 100644
index 000000000000..d57adea8bfe3
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/donator.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/formal_uniforms.dmi b/icons/obj/items/clothing/uniforms/formal_uniforms.dmi
new file mode 100644
index 000000000000..455fd83fdc0d
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/formal_uniforms.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/jumpsuits.dmi b/icons/obj/items/clothing/uniforms/jumpsuits.dmi
new file mode 100644
index 000000000000..38ae19156752
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/jumpsuits.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi b/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi
new file mode 100644
index 000000000000..646478fce9b3
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/synthetic_uniforms.dmi b/icons/obj/items/clothing/uniforms/synthetic_uniforms.dmi
new file mode 100644
index 000000000000..5fe3e734b17a
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/synthetic_uniforms.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/underwear_uniforms.dmi b/icons/obj/items/clothing/uniforms/underwear_uniforms.dmi
new file mode 100644
index 000000000000..b8b1b4e77f30
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/underwear_uniforms.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi
new file mode 100644
index 000000000000..57cb6680810a
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_department/cargo.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi
new file mode 100644
index 000000000000..e2f1f8133bd2
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_department/engineering.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi
new file mode 100644
index 000000000000..7cd49668d3c2
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi
new file mode 100644
index 000000000000..51a50bb2eff1
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi
new file mode 100644
index 000000000000..a24d3f47b8e4
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_department/security.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi
new file mode 100644
index 000000000000..6e208b241f19
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_department/service.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/CLF.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/CLF.dmi
new file mode 100644
index 000000000000..a1dc3234f7dc
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/CLF.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/CMB.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/CMB.dmi
new file mode 100644
index 000000000000..befc849dda0b
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/CMB.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi
new file mode 100644
index 000000000000..c915ec03b02b
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/SEEGSON.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/TWE.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/TWE.dmi
new file mode 100644
index 000000000000..390356bb8492
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/TWE.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi
new file mode 100644
index 000000000000..406d49809b18
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/UPP.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/UPP.dmi
new file mode 100644
index 000000000000..ba78b1f7c7db
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/UPP.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi
new file mode 100644
index 000000000000..54cb468eea1c
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/WY.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi
new file mode 100644
index 000000000000..5135a648011e
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi
new file mode 100644
index 000000000000..09faea53e50d
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi
new file mode 100644
index 000000000000..063d69a6d938
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi
new file mode 100644
index 000000000000..079a282a87cd
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi
new file mode 100644
index 000000000000..5e0773ee4c20
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi differ
diff --git a/icons/obj/items/clothing/uniforms/workwear.dmi b/icons/obj/items/clothing/uniforms/workwear.dmi
new file mode 100644
index 000000000000..8f49b208e7ff
Binary files /dev/null and b/icons/obj/items/clothing/uniforms/workwear.dmi differ
diff --git a/icons/obj/items/clothing/weyland.dmi b/icons/obj/items/clothing/weyland.dmi
deleted file mode 100644
index fdf26eb52e63..000000000000
Binary files a/icons/obj/items/clothing/weyland.dmi and /dev/null differ
diff --git a/icons/obj/items/crayons.dmi b/icons/obj/items/crayons.dmi
deleted file mode 100644
index 1c7053a8a958..000000000000
Binary files a/icons/obj/items/crayons.dmi and /dev/null differ
diff --git a/icons/obj/items/cup.dmi b/icons/obj/items/cup.dmi
deleted file mode 100644
index adc3e4e2e4d4..000000000000
Binary files a/icons/obj/items/cup.dmi and /dev/null differ
diff --git a/icons/obj/items/devices.dmi b/icons/obj/items/devices.dmi
index 07bcd88a2ca3..7a1d3bbc3c74 100644
Binary files a/icons/obj/items/devices.dmi and b/icons/obj/items/devices.dmi differ
diff --git a/icons/obj/items/drinks.dmi b/icons/obj/items/drinks.dmi
index 1203f3d18edd..3661cbcf26d8 100644
Binary files a/icons/obj/items/drinks.dmi and b/icons/obj/items/drinks.dmi differ
diff --git a/icons/obj/items/economy.dmi b/icons/obj/items/economy.dmi
new file mode 100644
index 000000000000..b2e2f057b75e
Binary files /dev/null and b/icons/obj/items/economy.dmi differ
diff --git a/icons/obj/items/experimental_tools.dmi b/icons/obj/items/experimental_tools.dmi
index d490d78c7ffa..ef32c058a86e 100644
Binary files a/icons/obj/items/experimental_tools.dmi and b/icons/obj/items/experimental_tools.dmi differ
diff --git a/icons/obj/items/floor_tiles.dmi b/icons/obj/items/floor_tiles.dmi
new file mode 100644
index 000000000000..438aa98966e0
Binary files /dev/null and b/icons/obj/items/floor_tiles.dmi differ
diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi
deleted file mode 100644
index 12093cd2c45b..000000000000
Binary files a/icons/obj/items/food.dmi and /dev/null differ
diff --git a/icons/obj/items/food/bakery.dmi b/icons/obj/items/food/bakery.dmi
new file mode 100644
index 000000000000..6cf2444d1ec3
Binary files /dev/null and b/icons/obj/items/food/bakery.dmi differ
diff --git a/icons/obj/items/food/bread.dmi b/icons/obj/items/food/bread.dmi
new file mode 100644
index 000000000000..b3231f8a54c1
Binary files /dev/null and b/icons/obj/items/food/bread.dmi differ
diff --git a/icons/obj/items/food/burgers.dmi b/icons/obj/items/food/burgers.dmi
new file mode 100644
index 000000000000..f32822f5db17
Binary files /dev/null and b/icons/obj/items/food/burgers.dmi differ
diff --git a/icons/obj/items/food/cakes.dmi b/icons/obj/items/food/cakes.dmi
new file mode 100644
index 000000000000..0c7bd007aefa
Binary files /dev/null and b/icons/obj/items/food/cakes.dmi differ
diff --git a/icons/obj/items/food/candies.dmi b/icons/obj/items/food/candies.dmi
new file mode 100644
index 000000000000..a4bcd36fee26
Binary files /dev/null and b/icons/obj/items/food/candies.dmi differ
diff --git a/icons/obj/items/food/cheese.dmi b/icons/obj/items/food/cheese.dmi
new file mode 100644
index 000000000000..0536f6fe5b10
Binary files /dev/null and b/icons/obj/items/food/cheese.dmi differ
diff --git a/icons/obj/items/food/condiments.dmi b/icons/obj/items/food/condiments.dmi
new file mode 100644
index 000000000000..db0e2c7aa3a9
Binary files /dev/null and b/icons/obj/items/food/condiments.dmi differ
diff --git a/icons/obj/items/food/dishes.dmi b/icons/obj/items/food/dishes.dmi
new file mode 100644
index 000000000000..f4ebd26ec738
Binary files /dev/null and b/icons/obj/items/food/dishes.dmi differ
diff --git a/icons/obj/items/food/donuts.dmi b/icons/obj/items/food/donuts.dmi
new file mode 100644
index 000000000000..26fca868b738
Binary files /dev/null and b/icons/obj/items/food/donuts.dmi differ
diff --git a/icons/obj/items/food/eggs.dmi b/icons/obj/items/food/eggs.dmi
new file mode 100644
index 000000000000..cbb5fb4ca9c9
Binary files /dev/null and b/icons/obj/items/food/eggs.dmi differ
diff --git a/icons/obj/items/food/fish.dmi b/icons/obj/items/food/fish.dmi
new file mode 100644
index 000000000000..29f219c141cf
Binary files /dev/null and b/icons/obj/items/food/fish.dmi differ
diff --git a/icons/obj/items/food/food_ingredients.dmi b/icons/obj/items/food/food_ingredients.dmi
new file mode 100644
index 000000000000..5522c3430a9a
Binary files /dev/null and b/icons/obj/items/food/food_ingredients.dmi differ
diff --git a/icons/obj/items/food/junkfood.dmi b/icons/obj/items/food/junkfood.dmi
new file mode 100644
index 000000000000..9be85e6af039
Binary files /dev/null and b/icons/obj/items/food/junkfood.dmi differ
diff --git a/icons/obj/items/food/meat.dmi b/icons/obj/items/food/meat.dmi
new file mode 100644
index 000000000000..a1fb000623fb
Binary files /dev/null and b/icons/obj/items/food/meat.dmi differ
diff --git a/icons/obj/items/food/monkeycubes.dmi b/icons/obj/items/food/monkeycubes.dmi
new file mode 100644
index 000000000000..0f119bfde934
Binary files /dev/null and b/icons/obj/items/food/monkeycubes.dmi differ
diff --git a/icons/obj/items/food/mre_food.dmi b/icons/obj/items/food/mre_food.dmi
new file mode 100644
index 000000000000..246461dbb8ad
Binary files /dev/null and b/icons/obj/items/food/mre_food.dmi differ
diff --git a/icons/obj/items/food/pizza.dmi b/icons/obj/items/food/pizza.dmi
new file mode 100644
index 000000000000..78161912f32f
Binary files /dev/null and b/icons/obj/items/food/pizza.dmi differ
diff --git a/icons/obj/items/food/slices.dmi b/icons/obj/items/food/slices.dmi
new file mode 100644
index 000000000000..00660c7ed416
Binary files /dev/null and b/icons/obj/items/food/slices.dmi differ
diff --git a/icons/obj/items/food/soups_salads.dmi b/icons/obj/items/food/soups_salads.dmi
new file mode 100644
index 000000000000..908e7f4a19ca
Binary files /dev/null and b/icons/obj/items/food/soups_salads.dmi differ
diff --git a/icons/obj/items/food/trays.dmi b/icons/obj/items/food/trays.dmi
new file mode 100644
index 000000000000..41feb024ab6c
Binary files /dev/null and b/icons/obj/items/food/trays.dmi differ
diff --git a/icons/obj/items/food_ingredients.dmi b/icons/obj/items/food_ingredients.dmi
deleted file mode 100644
index c0a0213e6db4..000000000000
Binary files a/icons/obj/items/food_ingredients.dmi and /dev/null differ
diff --git a/icons/obj/items/gifts.dmi b/icons/obj/items/gifts.dmi
new file mode 100644
index 000000000000..0a2dd2f60cca
Binary files /dev/null and b/icons/obj/items/gifts.dmi differ
diff --git a/icons/obj/items/handheld_distress_beacon.dmi b/icons/obj/items/handheld_distress_beacon.dmi
deleted file mode 100644
index 7984f4c47ebf..000000000000
Binary files a/icons/obj/items/handheld_distress_beacon.dmi and /dev/null differ
diff --git a/icons/obj/items/harvest.dmi b/icons/obj/items/harvest.dmi
index dda5e6565b94..6f03066e0ff3 100644
Binary files a/icons/obj/items/harvest.dmi and b/icons/obj/items/harvest.dmi differ
diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi
deleted file mode 100644
index 81a0e526f1b7..000000000000
Binary files a/icons/obj/items/items.dmi and /dev/null differ
diff --git a/icons/obj/items/kitchen_tools.dmi b/icons/obj/items/kitchen_tools.dmi
index 572053258961..48a6566ebc4c 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/marine-items.dmi b/icons/obj/items/marine-items.dmi
index 6cf420a1f6ab..238050263d78 100644
Binary files a/icons/obj/items/marine-items.dmi and b/icons/obj/items/marine-items.dmi differ
diff --git a/icons/obj/items/medical_stacks.dmi b/icons/obj/items/medical_stacks.dmi
new file mode 100644
index 000000000000..e574cc5e5011
Binary files /dev/null and b/icons/obj/items/medical_stacks.dmi differ
diff --git a/icons/obj/items/misc.dmi b/icons/obj/items/misc.dmi
deleted file mode 100644
index 5e1b9cdca434..000000000000
Binary files a/icons/obj/items/misc.dmi and /dev/null differ
diff --git a/icons/obj/items/notepads.dmi b/icons/obj/items/notepads.dmi
deleted file mode 100644
index 007be4dc0e71..000000000000
Binary files a/icons/obj/items/notepads.dmi and /dev/null differ
diff --git a/icons/obj/items/paint.dmi b/icons/obj/items/paint.dmi
new file mode 100644
index 000000000000..e540b5bdfe72
Binary files /dev/null and b/icons/obj/items/paint.dmi differ
diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi
index b15d4be6076d..bb24ac6b3377 100644
Binary files a/icons/obj/items/paper.dmi and b/icons/obj/items/paper.dmi differ
diff --git a/icons/obj/items/plush.dmi b/icons/obj/items/plush.dmi
deleted file mode 100644
index 8596fd69df9c..000000000000
Binary files a/icons/obj/items/plush.dmi and /dev/null differ
diff --git a/icons/obj/items/policetape.dmi b/icons/obj/items/policetape.dmi
deleted file mode 100644
index 326173a88084..000000000000
Binary files a/icons/obj/items/policetape.dmi and /dev/null differ
diff --git a/icons/obj/items/radio.dmi b/icons/obj/items/radio.dmi
index 6352a14baef0..5ef6000c37c8 100644
Binary files a/icons/obj/items/radio.dmi and b/icons/obj/items/radio.dmi differ
diff --git a/icons/obj/items/security.dmi b/icons/obj/items/security.dmi
new file mode 100644
index 000000000000..1c6baddcdfc4
Binary files /dev/null and b/icons/obj/items/security.dmi differ
diff --git a/icons/obj/items/ashtray.dmi b/icons/obj/items/smoking/ashtray.dmi
similarity index 100%
rename from icons/obj/items/ashtray.dmi
rename to icons/obj/items/smoking/ashtray.dmi
diff --git a/icons/obj/items/smoking/cigarettes.dmi b/icons/obj/items/smoking/cigarettes.dmi
new file mode 100644
index 000000000000..7a11e2a5d342
Binary files /dev/null and b/icons/obj/items/smoking/cigarettes.dmi differ
diff --git a/icons/obj/items/smoking/cigars.dmi b/icons/obj/items/smoking/cigars.dmi
new file mode 100644
index 000000000000..ba54cce8b481
Binary files /dev/null and b/icons/obj/items/smoking/cigars.dmi differ
diff --git a/icons/obj/items/smoking/lighters.dmi b/icons/obj/items/smoking/lighters.dmi
new file mode 100644
index 000000000000..9235ad814efd
Binary files /dev/null and b/icons/obj/items/smoking/lighters.dmi differ
diff --git a/icons/obj/items/smoking/matches.dmi b/icons/obj/items/smoking/matches.dmi
new file mode 100644
index 000000000000..d2f39c21c26e
Binary files /dev/null and b/icons/obj/items/smoking/matches.dmi differ
diff --git a/icons/obj/items/smoking/packets/arcturian_ace.dmi b/icons/obj/items/smoking/packets/arcturian_ace.dmi
new file mode 100644
index 000000000000..25b2ccb8ffb2
Binary files /dev/null and b/icons/obj/items/smoking/packets/arcturian_ace.dmi differ
diff --git a/icons/obj/items/smoking/packets/executive_select.dmi b/icons/obj/items/smoking/packets/executive_select.dmi
new file mode 100644
index 000000000000..247dd6d410c6
Binary files /dev/null and b/icons/obj/items/smoking/packets/executive_select.dmi differ
diff --git a/icons/obj/items/smoking/packets/koorlander.dmi b/icons/obj/items/smoking/packets/koorlander.dmi
new file mode 100644
index 000000000000..a0a25b1553e8
Binary files /dev/null and b/icons/obj/items/smoking/packets/koorlander.dmi differ
diff --git a/icons/obj/items/smoking/packets/lady_fingers.dmi b/icons/obj/items/smoking/packets/lady_fingers.dmi
new file mode 100644
index 000000000000..6849ec5fe2db
Binary files /dev/null and b/icons/obj/items/smoking/packets/lady_fingers.dmi differ
diff --git a/icons/obj/items/smoking/packets/lucky_strike.dmi b/icons/obj/items/smoking/packets/lucky_strike.dmi
new file mode 100644
index 000000000000..58fd9825c336
Binary files /dev/null and b/icons/obj/items/smoking/packets/lucky_strike.dmi differ
diff --git a/icons/obj/items/smoking/packets/lucky_strike_mini.dmi b/icons/obj/items/smoking/packets/lucky_strike_mini.dmi
new file mode 100644
index 000000000000..e1da4a459888
Binary files /dev/null and b/icons/obj/items/smoking/packets/lucky_strike_mini.dmi differ
diff --git a/icons/obj/items/smoking/packets/normal.dmi b/icons/obj/items/smoking/packets/normal.dmi
new file mode 100644
index 000000000000..0045486623f8
Binary files /dev/null and b/icons/obj/items/smoking/packets/normal.dmi differ
diff --git a/icons/obj/items/smoking/packets/trading_card.dmi b/icons/obj/items/smoking/packets/trading_card.dmi
new file mode 100644
index 000000000000..5a06cc2bc231
Binary files /dev/null and b/icons/obj/items/smoking/packets/trading_card.dmi differ
diff --git a/icons/obj/items/smoking/packets/wy_gold.dmi b/icons/obj/items/smoking/packets/wy_gold.dmi
new file mode 100644
index 000000000000..e09ab7a59ac4
Binary files /dev/null and b/icons/obj/items/smoking/packets/wy_gold.dmi differ
diff --git a/icons/obj/items/smoking/pipes.dmi b/icons/obj/items/smoking/pipes.dmi
new file mode 100644
index 000000000000..383e82a4d1a6
Binary files /dev/null and b/icons/obj/items/smoking/pipes.dmi differ
diff --git a/icons/obj/items/stacks.dmi b/icons/obj/items/stacks.dmi
new file mode 100644
index 000000000000..346bd390b801
Binary files /dev/null and b/icons/obj/items/stacks.dmi differ
diff --git a/icons/obj/items/storage/bag.dmi b/icons/obj/items/storage/bag.dmi
deleted file mode 100644
index 312951909261..000000000000
Binary files a/icons/obj/items/storage/bag.dmi and /dev/null differ
diff --git a/icons/obj/items/storage/box.dmi b/icons/obj/items/storage/box.dmi
deleted file mode 100644
index a530753da27a..000000000000
Binary files a/icons/obj/items/storage/box.dmi and /dev/null differ
diff --git a/icons/obj/items/storage/boxes.dmi b/icons/obj/items/storage/boxes.dmi
index 055f2869f6a0..af3e219c1e95 100644
Binary files a/icons/obj/items/storage/boxes.dmi and b/icons/obj/items/storage/boxes.dmi differ
diff --git a/icons/obj/items/storage/holster.dmi b/icons/obj/items/storage/holster.dmi
deleted file mode 100644
index c367f7e36d66..000000000000
Binary files a/icons/obj/items/storage/holster.dmi and /dev/null differ
diff --git a/icons/obj/items/storage/holsters.dmi b/icons/obj/items/storage/holsters.dmi
index c367f7e36d66..a712c0b49b9f 100644
Binary files a/icons/obj/items/storage/holsters.dmi and b/icons/obj/items/storage/holsters.dmi differ
diff --git a/icons/obj/items/surgery_tools.dmi b/icons/obj/items/surgery_tools.dmi
index c5e30c0c8c2f..d25c96801aa6 100644
Binary files a/icons/obj/items/surgery_tools.dmi and b/icons/obj/items/surgery_tools.dmi differ
diff --git a/icons/obj/items/syringe.dmi b/icons/obj/items/syringe.dmi
index d08b2a8c2d9f..dd7128a0b71f 100644
Binary files a/icons/obj/items/syringe.dmi and b/icons/obj/items/syringe.dmi differ
diff --git a/icons/obj/items/table_decorations.dmi b/icons/obj/items/table_decorations.dmi
new file mode 100644
index 000000000000..e22554d67e87
Binary files /dev/null and b/icons/obj/items/table_decorations.dmi differ
diff --git a/icons/obj/items/table_parts.dmi b/icons/obj/items/table_parts.dmi
new file mode 100644
index 000000000000..e44e2eba8f2c
Binary files /dev/null and b/icons/obj/items/table_parts.dmi differ
diff --git a/icons/obj/items/tank.dmi b/icons/obj/items/tank.dmi
index af1ef3c9b1c9..37479dfde18b 100644
Binary files a/icons/obj/items/tank.dmi and b/icons/obj/items/tank.dmi differ
diff --git a/icons/obj/items/tools.dmi b/icons/obj/items/tools.dmi
new file mode 100644
index 000000000000..2a885c0f7b18
Binary files /dev/null and b/icons/obj/items/tools.dmi differ
diff --git a/icons/obj/items/toy.dmi b/icons/obj/items/toy.dmi
index 4a40561475c6..9d0ad8f88072 100644
Binary files a/icons/obj/items/toy.dmi and b/icons/obj/items/toy.dmi differ
diff --git a/icons/obj/items/trash.dmi b/icons/obj/items/trash.dmi
index f9efbc2fadfb..be822006bc93 100644
Binary files a/icons/obj/items/trash.dmi and b/icons/obj/items/trash.dmi differ
diff --git a/icons/obj/items/weapons/grenade.dmi b/icons/obj/items/weapons/grenade.dmi
index 61c9707e43df..fcd26cd86889 100644
Binary files a/icons/obj/items/weapons/grenade.dmi and b/icons/obj/items/weapons/grenade.dmi differ
diff --git a/icons/obj/items/weapons/guns/attachments.dmi b/icons/obj/items/weapons/guns/attachments.dmi
deleted file mode 100644
index eb36689805d8..000000000000
Binary files a/icons/obj/items/weapons/guns/attachments.dmi and /dev/null differ
diff --git a/icons/obj/items/weapons/guns/guns_by_faction/event.dmi b/icons/obj/items/weapons/guns/guns_by_faction/event.dmi
index 4c517b712bb2..a250391a5226 100644
Binary files a/icons/obj/items/weapons/guns/guns_by_faction/event.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/event.dmi differ
diff --git a/icons/obj/items/weapons/guns/legacy/marine-weapons.dmi b/icons/obj/items/weapons/guns/legacy/marine-weapons.dmi
deleted file mode 100644
index 29f4f9d80a6a..000000000000
Binary files a/icons/obj/items/weapons/guns/legacy/marine-weapons.dmi and /dev/null differ
diff --git a/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi b/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi
deleted file mode 100644
index 568bfd0ee456..000000000000
Binary files a/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi and /dev/null differ
diff --git a/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi b/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi
deleted file mode 100644
index 0c416b3605e4..000000000000
Binary files a/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi and /dev/null differ
diff --git a/icons/obj/items/weapons/melee/axes.dmi b/icons/obj/items/weapons/melee/axes.dmi
new file mode 100644
index 000000000000..5b9f4bcd7db9
Binary files /dev/null and b/icons/obj/items/weapons/melee/axes.dmi differ
diff --git a/icons/obj/items/weapons/melee/canes.dmi b/icons/obj/items/weapons/melee/canes.dmi
new file mode 100644
index 000000000000..22ad5ade69e6
Binary files /dev/null and b/icons/obj/items/weapons/melee/canes.dmi differ
diff --git a/icons/obj/items/weapons/melee/energy.dmi b/icons/obj/items/weapons/melee/energy.dmi
new file mode 100644
index 000000000000..9fcb93f5e7ad
Binary files /dev/null and b/icons/obj/items/weapons/melee/energy.dmi differ
diff --git a/icons/obj/items/weapons/melee/knives.dmi b/icons/obj/items/weapons/melee/knives.dmi
new file mode 100644
index 000000000000..9e0ba014ba80
Binary files /dev/null and b/icons/obj/items/weapons/melee/knives.dmi differ
diff --git a/icons/obj/items/weapons/melee/misc.dmi b/icons/obj/items/weapons/melee/misc.dmi
new file mode 100644
index 000000000000..23521f4058e0
Binary files /dev/null and b/icons/obj/items/weapons/melee/misc.dmi differ
diff --git a/icons/obj/items/weapons/melee/non_lethal.dmi b/icons/obj/items/weapons/melee/non_lethal.dmi
new file mode 100644
index 000000000000..3db9ec9b9b9d
Binary files /dev/null and b/icons/obj/items/weapons/melee/non_lethal.dmi differ
diff --git a/icons/obj/items/weapons/melee/shields.dmi b/icons/obj/items/weapons/melee/shields.dmi
new file mode 100644
index 000000000000..a4d92bf600df
Binary files /dev/null and b/icons/obj/items/weapons/melee/shields.dmi differ
diff --git a/icons/obj/items/weapons/melee/spears.dmi b/icons/obj/items/weapons/melee/spears.dmi
new file mode 100644
index 000000000000..069f6337aeff
Binary files /dev/null and b/icons/obj/items/weapons/melee/spears.dmi differ
diff --git a/icons/obj/items/weapons/melee/swords.dmi b/icons/obj/items/weapons/melee/swords.dmi
new file mode 100644
index 000000000000..01324e5c25b4
Binary files /dev/null and b/icons/obj/items/weapons/melee/swords.dmi differ
diff --git a/icons/obj/items/weapons/weapons.dmi b/icons/obj/items/weapons/weapons.dmi
deleted file mode 100644
index 6c5f4ad34509..000000000000
Binary files a/icons/obj/items/weapons/weapons.dmi and /dev/null differ
diff --git a/icons/obj/items/xeno_tag.dmi b/icons/obj/items/xeno_tag.dmi
deleted file mode 100644
index 19315fce0b26..000000000000
Binary files a/icons/obj/items/xeno_tag.dmi and /dev/null differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 5989745e26eb..5231c4eef8cb 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 1dc934be2103..94370a35f355 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/structures/crates.dmi b/icons/obj/structures/crates.dmi
index d9f66eca1e70..9abe3f35d418 100644
Binary files a/icons/obj/structures/crates.dmi and b/icons/obj/structures/crates.dmi differ
diff --git a/icons/obj/structures/kegs.dmi b/icons/obj/structures/kegs.dmi
new file mode 100644
index 000000000000..8ad17ed7f171
Binary files /dev/null and b/icons/obj/structures/kegs.dmi differ
diff --git a/icons/obj/structures/liquid_tanks.dmi b/icons/obj/structures/liquid_tanks.dmi
new file mode 100644
index 000000000000..13ff4df7535c
Binary files /dev/null and b/icons/obj/structures/liquid_tanks.dmi differ
diff --git a/icons/obj/structures/machinery/apc.dmi b/icons/obj/structures/machinery/apc.dmi
index 74698aeaf969..393d75698cf6 100644
Binary files a/icons/obj/structures/machinery/apc.dmi and b/icons/obj/structures/machinery/apc.dmi differ
diff --git a/icons/obj/structures/machinery/apc_repair.dmi b/icons/obj/structures/machinery/apc_repair.dmi
deleted file mode 100644
index 953b6d006e8f..000000000000
Binary files a/icons/obj/structures/machinery/apc_repair.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi
index 54c99e3186d9..1addcecb0639 100644
Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ
diff --git a/icons/obj/structures/machinery/computer3.dmi b/icons/obj/structures/machinery/computer3.dmi
index a00ec12ddfa3..c558f4a418b1 100644
Binary files a/icons/obj/structures/machinery/computer3.dmi and b/icons/obj/structures/machinery/computer3.dmi differ
diff --git a/icons/obj/structures/machinery/cryogenics.dmi b/icons/obj/structures/machinery/cryogenics.dmi
index dc061195583f..ad5b9d38b83e 100644
Binary files a/icons/obj/structures/machinery/cryogenics.dmi and b/icons/obj/structures/machinery/cryogenics.dmi differ
diff --git a/icons/obj/structures/machinery/fiber.dmi b/icons/obj/structures/machinery/fiber.dmi
deleted file mode 100644
index 952c391f9b3a..000000000000
Binary files a/icons/obj/structures/machinery/fiber.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/field_generator.dmi b/icons/obj/structures/machinery/field_generator.dmi
deleted file mode 100644
index fcb083f84673..000000000000
Binary files a/icons/obj/structures/machinery/field_generator.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/implantchair.dmi b/icons/obj/structures/machinery/implantchair.dmi
deleted file mode 100644
index 94adefcbf281..000000000000
Binary files a/icons/obj/structures/machinery/implantchair.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/library.dmi b/icons/obj/structures/machinery/library.dmi
index b2e62dc1bb93..fc6467c51b1c 100644
Binary files a/icons/obj/structures/machinery/library.dmi and b/icons/obj/structures/machinery/library.dmi differ
diff --git a/icons/obj/structures/machinery/mining_machines.dmi b/icons/obj/structures/machinery/mining_machines.dmi
deleted file mode 100644
index af660e2475eb..000000000000
Binary files a/icons/obj/structures/machinery/mining_machines.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/motion_sensorv1.dmi b/icons/obj/structures/machinery/motion_sensorv1.dmi
deleted file mode 100644
index 18dc5ab1ef1a..000000000000
Binary files a/icons/obj/structures/machinery/motion_sensorv1.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/particle_accelerator.dmi b/icons/obj/structures/machinery/particle_accelerator.dmi
deleted file mode 100644
index db412286c081..000000000000
Binary files a/icons/obj/structures/machinery/particle_accelerator.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/particle_accelerator2.dmi b/icons/obj/structures/machinery/particle_accelerator2.dmi
deleted file mode 100644
index ace6526b6011..000000000000
Binary files a/icons/obj/structures/machinery/particle_accelerator2.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/power.dmi b/icons/obj/structures/machinery/power.dmi
index d976a23d4a7e..3630067502ba 100644
Binary files a/icons/obj/structures/machinery/power.dmi and b/icons/obj/structures/machinery/power.dmi differ
diff --git a/icons/obj/structures/machinery/research.dmi b/icons/obj/structures/machinery/research.dmi
index 7002a5864ea0..b02deb59f6c4 100644
Binary files a/icons/obj/structures/machinery/research.dmi and b/icons/obj/structures/machinery/research.dmi differ
diff --git a/icons/obj/structures/machinery/science_machines.dmi b/icons/obj/structures/machinery/science_machines.dmi
index badfa37ca528..172d8243d7db 100644
Binary files a/icons/obj/structures/machinery/science_machines.dmi and b/icons/obj/structures/machinery/science_machines.dmi differ
diff --git a/icons/obj/structures/machinery/shielding.dmi b/icons/obj/structures/machinery/shielding.dmi
deleted file mode 100644
index 58dd98641bc8..000000000000
Binary files a/icons/obj/structures/machinery/shielding.dmi and /dev/null differ
diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi
index f2449fcad0ed..56bd4389b073 100644
Binary files a/icons/obj/structures/machinery/vending.dmi and b/icons/obj/structures/machinery/vending.dmi differ
diff --git a/icons/obj/structures/old_barricades.dmi b/icons/obj/structures/old_barricades.dmi
deleted file mode 100644
index 0c9c2bfc47fb..000000000000
Binary files a/icons/obj/structures/old_barricades.dmi and /dev/null differ
diff --git a/icons/obj/structures/props/chairs.dmi b/icons/obj/structures/props/chairs.dmi
new file mode 100644
index 000000000000..129045cc2817
Binary files /dev/null and b/icons/obj/structures/props/chairs.dmi differ
diff --git a/icons/obj/structures/props/misc.dmi b/icons/obj/structures/props/misc.dmi
index ebe231fcbe3e..0070719f0c05 100644
Binary files a/icons/obj/structures/props/misc.dmi and b/icons/obj/structures/props/misc.dmi differ
diff --git a/icons/obj/structures/props/sofas.dmi b/icons/obj/structures/props/sofas.dmi
deleted file mode 100644
index 29e390c9aa10..000000000000
Binary files a/icons/obj/structures/props/sofas.dmi and /dev/null differ
diff --git a/icons/obj/structures/props/stationobjs.dmi b/icons/obj/structures/props/stationobjs.dmi
index 09868e92fd88..eae30a15dd9e 100644
Binary files a/icons/obj/structures/props/stationobjs.dmi and b/icons/obj/structures/props/stationobjs.dmi differ
diff --git a/icons/obj/structures/rollerbed.dmi b/icons/obj/structures/rollerbed.dmi
index c0d32adc116d..5ed961398666 100644
Binary files a/icons/obj/structures/rollerbed.dmi and b/icons/obj/structures/rollerbed.dmi differ
diff --git a/icons/obj/structures/structures.dmi b/icons/obj/structures/structures.dmi
index 824a412cc8c8..3ca4347372ab 100644
Binary files a/icons/obj/structures/structures.dmi and b/icons/obj/structures/structures.dmi differ
diff --git a/icons/obj/structures/tank_dispenser.dmi b/icons/obj/structures/tank_dispenser.dmi
new file mode 100644
index 000000000000..d91b09bf0803
Binary files /dev/null and b/icons/obj/structures/tank_dispenser.dmi differ
diff --git a/icons/obj/structures/wall_dispensers.dmi b/icons/obj/structures/wall_dispensers.dmi
new file mode 100644
index 000000000000..afea85ab4944
Binary files /dev/null and b/icons/obj/structures/wall_dispensers.dmi differ
diff --git a/icons/old_stuff/NTOS/airestore.png b/icons/old_stuff/NTOS/airestore.png
deleted file mode 100644
index d8e5207bfbf2..000000000000
Binary files a/icons/old_stuff/NTOS/airestore.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/aiupload.png b/icons/old_stuff/NTOS/aiupload.png
deleted file mode 100644
index 25a8d8694e35..000000000000
Binary files a/icons/old_stuff/NTOS/aiupload.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/alerts.png b/icons/old_stuff/NTOS/alerts.png
deleted file mode 100644
index d395428c7cd0..000000000000
Binary files a/icons/old_stuff/NTOS/alerts.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_100.gif b/icons/old_stuff/NTOS/battery_icons/batt_100.gif
deleted file mode 100644
index 72f04cff011a..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_100.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_20.gif b/icons/old_stuff/NTOS/battery_icons/batt_20.gif
deleted file mode 100644
index cc56e28214fd..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_20.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_40.gif b/icons/old_stuff/NTOS/battery_icons/batt_40.gif
deleted file mode 100644
index 5d03a30c18ec..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_40.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_5.gif b/icons/old_stuff/NTOS/battery_icons/batt_5.gif
deleted file mode 100644
index eddcc6ae824d..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_5.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_60.gif b/icons/old_stuff/NTOS/battery_icons/batt_60.gif
deleted file mode 100644
index 2a159b8e3c3c..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_60.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_80.gif b/icons/old_stuff/NTOS/battery_icons/batt_80.gif
deleted file mode 100644
index 59efcb225e1f..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_80.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/battery_icons/batt_none.gif b/icons/old_stuff/NTOS/battery_icons/batt_none.gif
deleted file mode 100644
index 64aa24516b37..000000000000
Binary files a/icons/old_stuff/NTOS/battery_icons/batt_none.gif and /dev/null differ
diff --git a/icons/old_stuff/NTOS/borgcontrol.png b/icons/old_stuff/NTOS/borgcontrol.png
deleted file mode 100644
index 63e0815954c4..000000000000
Binary files a/icons/old_stuff/NTOS/borgcontrol.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/borgupload.png b/icons/old_stuff/NTOS/borgupload.png
deleted file mode 100644
index dfb24cecfdb2..000000000000
Binary files a/icons/old_stuff/NTOS/borgupload.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/camera.png b/icons/old_stuff/NTOS/camera.png
deleted file mode 100644
index a9a726b03d45..000000000000
Binary files a/icons/old_stuff/NTOS/camera.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/cardcomp.png b/icons/old_stuff/NTOS/cardcomp.png
deleted file mode 100644
index e7df0ab20711..000000000000
Binary files a/icons/old_stuff/NTOS/cardcomp.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/cloning.png b/icons/old_stuff/NTOS/cloning.png
deleted file mode 100644
index 6fa294250562..000000000000
Binary files a/icons/old_stuff/NTOS/cloning.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/comms.png b/icons/old_stuff/NTOS/comms.png
deleted file mode 100644
index e089889d9302..000000000000
Binary files a/icons/old_stuff/NTOS/comms.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/copyfile.png b/icons/old_stuff/NTOS/copyfile.png
deleted file mode 100644
index 50c10b375787..000000000000
Binary files a/icons/old_stuff/NTOS/copyfile.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/deletefile.png b/icons/old_stuff/NTOS/deletefile.png
deleted file mode 100644
index ada175fad258..000000000000
Binary files a/icons/old_stuff/NTOS/deletefile.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/drive.png b/icons/old_stuff/NTOS/drive.png
deleted file mode 100644
index 69ca021f8b70..000000000000
Binary files a/icons/old_stuff/NTOS/drive.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/exocontrol.png b/icons/old_stuff/NTOS/exocontrol.png
deleted file mode 100644
index 101f32e44db9..000000000000
Binary files a/icons/old_stuff/NTOS/exocontrol.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/file.png b/icons/old_stuff/NTOS/file.png
deleted file mode 100644
index b0ee0a666c48..000000000000
Binary files a/icons/old_stuff/NTOS/file.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/folder.png b/icons/old_stuff/NTOS/folder.png
deleted file mode 100644
index 05780bc651c9..000000000000
Binary files a/icons/old_stuff/NTOS/folder.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/foldermeta.png b/icons/old_stuff/NTOS/foldermeta.png
deleted file mode 100644
index 0d7a26b943fa..000000000000
Binary files a/icons/old_stuff/NTOS/foldermeta.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/genetics.png b/icons/old_stuff/NTOS/genetics.png
deleted file mode 100644
index 6f5b2320fc2a..000000000000
Binary files a/icons/old_stuff/NTOS/genetics.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/medical.png b/icons/old_stuff/NTOS/medical.png
deleted file mode 100644
index a3b6a21b54b4..000000000000
Binary files a/icons/old_stuff/NTOS/medical.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/monitoring.png b/icons/old_stuff/NTOS/monitoring.png
deleted file mode 100644
index a94910e48a0f..000000000000
Binary files a/icons/old_stuff/NTOS/monitoring.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/movefile.png b/icons/old_stuff/NTOS/movefile.png
deleted file mode 100644
index 5b31c6c2a881..000000000000
Binary files a/icons/old_stuff/NTOS/movefile.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/ntos.png b/icons/old_stuff/NTOS/ntos.png
deleted file mode 100644
index 8b9d735cc99d..000000000000
Binary files a/icons/old_stuff/NTOS/ntos.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/operating.png b/icons/old_stuff/NTOS/operating.png
deleted file mode 100644
index ab8f65ef7a83..000000000000
Binary files a/icons/old_stuff/NTOS/operating.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/pda.png b/icons/old_stuff/NTOS/pda.png
deleted file mode 100644
index c6b0bb00fb3d..000000000000
Binary files a/icons/old_stuff/NTOS/pda.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/power.png b/icons/old_stuff/NTOS/power.png
deleted file mode 100644
index b2e4cc837f15..000000000000
Binary files a/icons/old_stuff/NTOS/power.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/prison.png b/icons/old_stuff/NTOS/prison.png
deleted file mode 100644
index a846fe004115..000000000000
Binary files a/icons/old_stuff/NTOS/prison.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/program.png b/icons/old_stuff/NTOS/program.png
deleted file mode 100644
index ac161287636b..000000000000
Binary files a/icons/old_stuff/NTOS/program.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/records.png b/icons/old_stuff/NTOS/records.png
deleted file mode 100644
index eaaf68e50d1a..000000000000
Binary files a/icons/old_stuff/NTOS/records.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/research.png b/icons/old_stuff/NTOS/research.png
deleted file mode 100644
index 5ebd63aafcca..000000000000
Binary files a/icons/old_stuff/NTOS/research.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/server.png b/icons/old_stuff/NTOS/server.png
deleted file mode 100644
index 6d96b1141398..000000000000
Binary files a/icons/old_stuff/NTOS/server.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/tb_close.png b/icons/old_stuff/NTOS/tb_close.png
deleted file mode 100644
index f0819d248dde..000000000000
Binary files a/icons/old_stuff/NTOS/tb_close.png and /dev/null differ
diff --git a/icons/old_stuff/NTOS/tcomms.png b/icons/old_stuff/NTOS/tcomms.png
deleted file mode 100644
index a63b23c8dff0..000000000000
Binary files a/icons/old_stuff/NTOS/tcomms.png and /dev/null differ
diff --git a/icons/old_stuff/Testing/Zone.dmi b/icons/old_stuff/Testing/Zone.dmi
deleted file mode 100644
index 1d8ab8516693..000000000000
Binary files a/icons/old_stuff/Testing/Zone.dmi and /dev/null differ
diff --git a/icons/old_stuff/buildmode.dmi b/icons/old_stuff/buildmode.dmi
deleted file mode 100644
index a3aa535c241b..000000000000
Binary files a/icons/old_stuff/buildmode.dmi and /dev/null differ
diff --git a/icons/old_stuff/imap.dmi b/icons/old_stuff/imap.dmi
deleted file mode 100644
index 3185c883a572..000000000000
Binary files a/icons/old_stuff/imap.dmi and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_atmos.png b/icons/old_stuff/pda_icons/pda_atmos.png
deleted file mode 100644
index 89a55a0a6cbd..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_atmos.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_back.png b/icons/old_stuff/pda_icons/pda_back.png
deleted file mode 100644
index 4708824853f6..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_back.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_bell.png b/icons/old_stuff/pda_icons/pda_bell.png
deleted file mode 100644
index 1e989c274735..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_bell.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_blank.png b/icons/old_stuff/pda_icons/pda_blank.png
deleted file mode 100644
index 665861d3c74c..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_blank.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_boom.png b/icons/old_stuff/pda_icons/pda_boom.png
deleted file mode 100644
index 70e473c3c4c9..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_boom.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_bucket.png b/icons/old_stuff/pda_icons/pda_bucket.png
deleted file mode 100644
index ee030e3a37d8..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_bucket.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_chatroom.png b/icons/old_stuff/pda_icons/pda_chatroom.png
deleted file mode 100644
index a00221c4e0de..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_chatroom.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_crate.png b/icons/old_stuff/pda_icons/pda_crate.png
deleted file mode 100644
index e1e076e27908..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_crate.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_cuffs.png b/icons/old_stuff/pda_icons/pda_cuffs.png
deleted file mode 100644
index 71958c8abc42..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_cuffs.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_eject.png b/icons/old_stuff/pda_icons/pda_eject.png
deleted file mode 100644
index 4168be03f6af..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_eject.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_exit.png b/icons/old_stuff/pda_icons/pda_exit.png
deleted file mode 100644
index cd983a4a9abc..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_exit.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_flashlight.png b/icons/old_stuff/pda_icons/pda_flashlight.png
deleted file mode 100644
index 3476727930b9..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_flashlight.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_honk.png b/icons/old_stuff/pda_icons/pda_honk.png
deleted file mode 100644
index 55632bf40bcd..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_honk.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_locked.PNG b/icons/old_stuff/pda_icons/pda_locked.PNG
deleted file mode 100644
index 79fe58291621..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_locked.PNG and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_mail.png b/icons/old_stuff/pda_icons/pda_mail.png
deleted file mode 100644
index 6bfb1e8cd7bb..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_mail.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_medical.png b/icons/old_stuff/pda_icons/pda_medical.png
deleted file mode 100644
index 448063ecf529..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_medical.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_menu.png b/icons/old_stuff/pda_icons/pda_menu.png
deleted file mode 100644
index abd6ccb22578..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_menu.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_mule.png b/icons/old_stuff/pda_icons/pda_mule.png
deleted file mode 100644
index b8c1b636f5eb..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_mule.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_notes.png b/icons/old_stuff/pda_icons/pda_notes.png
deleted file mode 100644
index eb076d3ca33d..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_notes.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_power.png b/icons/old_stuff/pda_icons/pda_power.png
deleted file mode 100644
index 04175e7c8355..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_power.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_rdoor.png b/icons/old_stuff/pda_icons/pda_rdoor.png
deleted file mode 100644
index 6eab5a8817dd..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_rdoor.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_reagent.png b/icons/old_stuff/pda_icons/pda_reagent.png
deleted file mode 100644
index b900af5ae66b..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_reagent.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_refresh.png b/icons/old_stuff/pda_icons/pda_refresh.png
deleted file mode 100644
index 08439c6bca3e..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_refresh.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_scanner.png b/icons/old_stuff/pda_icons/pda_scanner.png
deleted file mode 100644
index eabdc511cde6..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_scanner.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_signaler.png b/icons/old_stuff/pda_icons/pda_signaler.png
deleted file mode 100644
index f71398f70d26..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_signaler.png and /dev/null differ
diff --git a/icons/old_stuff/pda_icons/pda_status.png b/icons/old_stuff/pda_icons/pda_status.png
deleted file mode 100644
index fe955e66a616..000000000000
Binary files a/icons/old_stuff/pda_icons/pda_status.png and /dev/null differ
diff --git a/icons/reagentname_bg.png b/icons/reagentname_bg.png
deleted file mode 100644
index 879179edd81e..000000000000
Binary files a/icons/reagentname_bg.png and /dev/null differ
diff --git a/icons/rebase_64.dmi b/icons/rebase_64.dmi
deleted file mode 100644
index 6b593a47bffd..000000000000
Binary files a/icons/rebase_64.dmi and /dev/null differ
diff --git a/icons/rebase_icons.dmi b/icons/rebase_icons.dmi
deleted file mode 100644
index 3d9234f3f9f9..000000000000
Binary files a/icons/rebase_icons.dmi and /dev/null differ
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 06a9bd986cd8..8fc6ac720f13 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -19313,7 +19313,7 @@
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
"dOl" = (
-/obj/item/prop/colony/folded_bedroll{
+/obj/item/roller/bedroll{
pixel_x = -5;
pixel_y = -4
},
@@ -21348,7 +21348,7 @@
/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/c)
"fWb" = (
-/obj/item/clothing/under/darkred{
+/obj/item/clothing/under/color/darkred{
pixel_y = 7;
pixel_x = 10
},
@@ -26012,7 +26012,7 @@
/area/bigredv2/caves/mining)
"kWh" = (
/obj/structure/surface/table,
-/obj/item/clothing/under/brown{
+/obj/item/clothing/under/color/brown{
pixel_y = 7;
pixel_x = 12
},
@@ -29179,7 +29179,7 @@
/area/bigredv2/outside/n)
"opn" = (
/obj/structure/machinery/washing_machine,
-/obj/item/clothing/under/brown{
+/obj/item/clothing/under/color/brown{
pixel_y = 11;
pixel_x = 7
},
@@ -29484,7 +29484,7 @@
/turf/open/mars,
/area/bigredv2/outside/n)
"oEz" = (
-/obj/item/clothing/under/lightbrown{
+/obj/item/clothing/under/color/lightbrown{
pixel_x = -7;
pixel_y = -4
},
@@ -29555,7 +29555,7 @@
/turf/open/floor/whitebluefull/northeast,
/area/bigredv2/outside/general_store)
"oHW" = (
-/obj/item/clothing/under/darkred,
+/obj/item/clothing/under/color/darkred,
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/general_offices)
"oIb" = (
@@ -31667,7 +31667,7 @@
/area/bigredv2/outside/nw)
"qOK" = (
/obj/structure/surface/rack,
-/obj/item/clothing/under/lightbrown{
+/obj/item/clothing/under/color/lightbrown{
pixel_x = 10;
pixel_y = -5
},
@@ -34014,7 +34014,7 @@
/turf/open/floor/podhatchfloor,
/area/bigredv2/outside/admin_building)
"taD" = (
-/obj/item/clothing/under/brown{
+/obj/item/clothing/under/color/brown{
pixel_x = 4;
pixel_y = -5
},
diff --git a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
index cce52624863f..7d59954b8b15 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
@@ -347,7 +347,7 @@
/turf/open/floor/platingdmg1,
/area/bigredv2/outside/general_offices)
"fY" = (
-/obj/item/clothing/under/darkred,
+/obj/item/clothing/under/color/darkred,
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/general_offices)
"ge" = (
@@ -577,12 +577,12 @@
/turf/open/floor/plating/platingdmg3,
/area/bigredv2/outside/hydroponics)
"xt" = (
-/obj/item/clothing/under/darkred{
+/obj/item/clothing/under/color/darkred{
pixel_y = 7;
pixel_x = 10
},
/obj/structure/surface/rack,
-/obj/item/clothing/under/darkred,
+/obj/item/clothing/under/color/darkred,
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/general_offices)
"xU" = (
@@ -700,7 +700,7 @@
/area/bigredv2/outside/general_offices)
"GM" = (
/obj/structure/surface/table,
-/obj/item/clothing/under/brown{
+/obj/item/clothing/under/color/brown{
pixel_y = 7;
pixel_x = 12
},
@@ -844,7 +844,7 @@
/area/bigredv2/outside/general_offices)
"RI" = (
/obj/structure/surface/rack,
-/obj/item/clothing/under/lightbrown{
+/obj/item/clothing/under/color/lightbrown{
pixel_x = 10;
pixel_y = -5
},
diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm
index 972e9ddf3b59..97fb9ba48a39 100644
--- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm
+++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm
@@ -850,7 +850,7 @@
/turf/open/desert/dirt/desert_transition_edge1,
/area/desert_dam/exterior/valley/bar_valley_dam)
"rX" = (
-/obj/item/prop/colony/folded_bedroll,
+/obj/item/roller/bedroll,
/obj/item/shard{
icon_state = "medium"
},
diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
index 066d7ab18253..8bfcd7e543be 100644
--- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
+++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
@@ -31898,11 +31898,6 @@
/turf/open/floor/plating,
/area/prison/pirate)
"cvY" = (
-/obj/structure/machinery/power/generator{
- anchored = 1;
- dir = 4;
- icon_state = "teg-broken"
- },
/obj/effect/decal/warning_stripes,
/obj/structure/lattice,
/turf/open/floor/plating,
diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
index 634cb0f24b07..52ea52200284 100644
--- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
@@ -33,12 +33,6 @@
/obj/item/trash/chunk,
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/station/medbay)
-"abJ" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- icon = 'icons/obj/structures/doors/2x1prepdoor.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"ace" = (
/obj/effect/landmark{
icon_state = "hive_spawn";
@@ -66,7 +60,7 @@
/area/fiorina/station/flight_deck)
"acO" = (
/obj/effect/decal{
- icon = 'icons/obj/items/policetape.dmi';
+ icon = 'icons/obj/items/security.dmi';
icon_state = "engineering_v"
},
/obj/structure/machinery/light/double/blue{
@@ -92,6 +86,14 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_tram)
+"aev" = (
+/obj/structure/barricade/handrail/type_b{
+ dir = 4;
+ layer = 3.5
+ },
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"aeF" = (
/obj/effect/decal/cleanable/blood/splatter{
icon_state = "gibup1"
@@ -109,18 +111,36 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"aeV" = (
+/obj/structure/closet/wardrobe/orange,
+/obj/item/clothing/gloves/boxing/yellow,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
+"aff" = (
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"afk" = (
/turf/open/floor/solarpanel,
/area/fiorina/oob)
"afq" = (
/turf/open/floor/prison/whitegreencorner/east,
/area/fiorina/station/medbay)
+"afA" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space,
+/area/fiorina/oob)
"afO" = (
/obj/structure/bed/sofa/vert/grey/bot{
pixel_y = 8
},
/turf/open/floor/prison,
/area/fiorina/station/security)
+"afQ" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"afW" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/prison,
@@ -133,11 +153,6 @@
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"aga" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/spawner/random/pills/lowchance,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"agh" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/cameras{
@@ -195,10 +210,25 @@
},
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/station/chapel)
+"ahb" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/toy/handcard/aceofspades,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"ahm" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"ahF" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/obj/structure/barricade/handrail/type_b{
+ dir = 1
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"aic" = (
/turf/open/floor/prison/darkyellow2/northeast,
/area/fiorina/station/telecomm/lz1_tram)
@@ -213,12 +243,18 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/turf/open/floor/prison/darkbrown2,
/area/fiorina/tumor/aux_engi)
-"aiv" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/east)
+"aiB" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"aiH" = (
+/turf/open/floor/prison/whitepurplecorner/east,
+/area/fiorina/station/research_cells/west)
+"ajl" = (
+/obj/structure/platform_decoration/metal/kutjevo/north,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"aju" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -234,6 +270,10 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"ajC" = (
+/obj/item/tool/wirecutters,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/showers_laundry)
"ajP" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/pizzabox/margherita,
@@ -247,13 +287,13 @@
/obj/effect/landmark/ert_spawns/groundside_xeno,
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/tumor/aux_engi)
+"aki" = (
+/obj/effect/spawner/random/sentry/midchance,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"akp" = (
/turf/open/floor/prison/green,
/area/fiorina/station/chapel)
-"akM" = (
-/obj/structure/surface/table/reinforced/prison,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"akW" = (
/obj/structure/bed/chair/janicart,
/turf/open/floor/prison,
@@ -266,14 +306,13 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/telecomm/lz1_tram)
-"alk" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
+"ali" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
},
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/transit_hub)
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/disco/east_disco)
"alC" = (
/obj/structure/inflatable/popped,
/turf/open/floor/prison/floor_plate,
@@ -306,35 +345,15 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
-"amg" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/park)
-"amn" = (
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/west)
"amF" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/tumor/aux_engi)
-"amZ" = (
-/obj/structure/barricade/wooden{
- dir = 4
- },
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
"ane" = (
/obj/item/weapon/unathiknife{
name = "ceremonial knife"
},
/turf/open/floor/wood,
/area/fiorina/station/chapel)
-"anl" = (
-/obj/item/pamphlet/engineer,
-/obj/structure/closet,
-/obj/item/restraint/handcuffs,
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/lowsec/east)
"anm" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer{
@@ -375,10 +394,18 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"anx" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"any" = (
/obj/item/stack/cable_coil/random,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"anB" = (
+/obj/item/tool/kitchen/knife,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"anJ" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
@@ -412,28 +439,31 @@
},
/turf/open/floor/prison/green/west,
/area/fiorina/station/chapel)
+"anY" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"aoo" = (
/obj/structure/reagent_dispensers/water_cooler/stacks,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/flight_deck)
-"aoG" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/firstaid/regular,
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/whitegreen/southeast,
-/area/fiorina/station/medbay)
-"aoZ" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/reagent_dispensers/water_cooler/stacks{
- pixel_y = 11
+"aoU" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
},
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+/turf/open/space/basic,
+/area/fiorina/oob)
"ape" = (
/obj/structure/bed/chair{
dir = 4;
@@ -444,16 +474,6 @@
"apf" = (
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"apg" = (
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/east)
-"apm" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/east)
"apu" = (
/turf/open/floor/prison/blue,
/area/fiorina/station/power_ring)
@@ -471,16 +491,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
-"arl" = (
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"arn" = (
-/obj/effect/landmark/nightmare{
- insert_tag = "researchprestine"
- },
-/turf/closed/wall/prison,
-/area/fiorina/station/research_cells/west)
"arG" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -489,6 +499,13 @@
},
/turf/open/floor/prison/darkbrown2/east,
/area/fiorina/tumor/aux_engi)
+"arP" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"arT" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_full"
@@ -498,14 +515,6 @@
"arW" = (
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/oob)
-"asf" = (
-/obj/structure/largecrate/random/barrel/white,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
"ask" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -526,28 +535,24 @@
"asz" = (
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/central_ring)
-"asF" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/prison,
-/area/fiorina/station/research_cells/east)
"asI" = (
/obj/item/toy/deck,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"atb" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/botany)
"atd" = (
/obj/structure/bed/chair{
dir = 1
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"ato" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/flight_deck)
"atp" = (
/obj/item/book/manual/security_space_law{
pixel_x = 3;
@@ -559,15 +564,21 @@
/obj/item/reagent_container/food/snacks/eat_bar,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"atD" = (
-/obj/structure/platform_decoration/metal/kutjevo/north,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
-"atY" = (
-/obj/structure/bedsheetbin,
-/turf/open/floor/prison/yellow/west,
-/area/fiorina/station/lowsec/showers_laundry)
+"atV" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
+"aua" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/central_ring)
"auj" = (
/obj/item/frame/rack,
/turf/open/floor/prison/floor_plate,
@@ -585,18 +596,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"auS" = (
-/obj/structure/closet/wardrobe/orange,
-/obj/item/clothing/under/color/orange,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
-"avc" = (
-/obj/structure/stairs/perspective{
- dir = 5;
- icon_state = "p_stair_full"
- },
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/research_cells/west)
"avJ" = (
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison,
@@ -615,12 +614,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"awU" = (
-/obj/structure/machinery/iv_drip{
- pixel_y = 19
- },
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"axb" = (
/obj/item/clothing/suit/storage/marine/specialist,
/turf/open/floor/plating/prison,
@@ -639,9 +632,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"axz" = (
-/turf/closed/wall/r_wall/prison,
-/area/fiorina/station/lowsec/east)
"axA" = (
/obj/structure/prop/almayer/computers/mission_planning_system{
density = 0;
@@ -652,11 +642,10 @@
},
/turf/closed/wall/prison,
/area/fiorina/station/security)
-"axW" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"axX" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/chapel_carpet,
+/area/fiorina/station/chapel)
"aye" = (
/obj/structure/bed/chair{
dir = 1
@@ -670,10 +659,6 @@
},
/turf/open/floor/prison/whitegreen/southwest,
/area/fiorina/station/medbay)
-"ayG" = (
-/obj/structure/machinery/power/apc/power/north,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/disco/east_disco)
"ayH" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper_bin{
@@ -682,11 +667,6 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/flight_deck)
-"ayW" = (
-/obj/item/explosive/grenade/incendiary/molotov,
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"ayX" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
@@ -747,6 +727,10 @@
/obj/structure/bed/sofa/vert/grey,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
+"aBa" = (
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"aBb" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -773,17 +757,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"aBX" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
"aBZ" = (
/obj/effect/landmark/yautja_teleport,
/turf/open/floor/prison,
/area/fiorina/station/park)
-"aCw" = (
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"aCC" = (
/obj/item/tool/soap{
pixel_x = 2;
@@ -791,6 +768,28 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
+"aCP" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/west)
+"aCS" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/disco/east_disco)
"aCZ" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -799,17 +798,27 @@
/obj/structure/reagent_dispensers/water_cooler/stacks,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"aDj" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
"aDx" = (
/turf/open/floor/prison/yellow,
/area/fiorina/station/central_ring)
+"aDO" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft"
+ },
+/turf/open/floor/prison/whitegreen/northwest,
+/area/fiorina/station/medbay)
+"aDR" = (
+/obj/structure/largecrate/random/case,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
+"aDX" = (
+/obj/structure/machinery/door/airlock/almayer/marine{
+ dir = 1;
+ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/research_cells/west)
"aEi" = (
/obj/structure/machinery/door/poddoor/shutters/almayer,
/turf/open/floor/plating/prison,
@@ -825,23 +834,28 @@
/obj/structure/largecrate/random/secure,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"aEI" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"aEQ" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
+"aFj" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/botany)
"aFp" = (
/obj/structure/machinery/defenses/tesla_coil/premade/smart{
faction_group = list("CLF")
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"aFH" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/obj/structure/closet/emcloset,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"aFK" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -850,10 +864,13 @@
},
/turf/open/floor/corsat/plate,
/area/fiorina/station/telecomm/lz1_cargo)
-"aFL" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/blue/northwest,
-/area/fiorina/station/power_ring)
+"aFX" = (
+/obj/structure/toilet{
+ dir = 4;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/east)
"aFZ" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/medbay)
@@ -885,6 +902,14 @@
/obj/item/tool/crowbar,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/lz/near_lzI)
+"aHm" = (
+/turf/open/floor/prison/blue/north,
+/area/fiorina/station/power_ring/reactor)
+"aHv" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"aHH" = (
/obj/item/tool/shovel/etool,
/turf/open/floor/prison,
@@ -914,30 +939,29 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
-"aIG" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
+"aID" = (
+/obj/structure/barricade/handrail/type_b{
+ dir = 1
+ },
+/obj/item/frame/rack,
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
+"aIH" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec/showers_laundry)
+"aIN" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
+ dir = 1;
+ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
},
-/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
-"aIT" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
+/area/fiorina/station/research_cells/east)
"aJk" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/atmos_alert,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
-"aJm" = (
-/obj/structure/platform_decoration/metal/almayer,
-/obj/structure/inflatable,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
"aJo" = (
/obj/structure/bed/chair{
dir = 4;
@@ -972,12 +996,23 @@
},
/turf/open/floor/prison/whitegreen/northwest,
/area/fiorina/station/medbay)
-"aKs" = (
+"aKd" = (
/obj/structure/platform/metal/almayer/west,
-/obj/item/prop/almayer/handheld1,
-/obj/structure/surface/rack,
+/obj/structure/machinery/door/airlock/prison_hatch/autoname{
+ dir = 1
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/tumor/ice_lab)
+"aKz" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/obj/item/stack/cable_coil,
/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
+/area/fiorina/station/power_ring)
+"aKK" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"aKN" = (
/obj/structure/machinery/computer/cameras{
network = list("omega")
@@ -994,33 +1029,17 @@
/obj/structure/blocker/invisible_wall,
/turf/open/floor/almayer_hull,
/area/fiorina/station/medbay)
-"aLz" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"aLC" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
+"aLG" = (
+/obj/item/stack/tile/plasteel{
+ pixel_x = 3;
+ pixel_y = 4
},
-/obj/effect/spawner/random/pills/lowchance,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/east)
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"aLT" = (
/obj/item/trash/uscm_mre,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"aLX" = (
-/obj/structure/bed/chair{
- dir = 1;
- layer = 2.7
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"aMg" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/tumor/ice_lab)
@@ -1062,10 +1081,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"aNY" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"aOc" = (
/turf/closed/shuttle/ert{
icon_state = "rightengine_3";
@@ -1075,10 +1090,6 @@
"aOm" = (
/turf/open/floor/prison/panelscorched,
/area/fiorina/tumor/servers)
-"aOp" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/darkbrown2,
-/area/fiorina/station/park)
"aOC" = (
/obj/structure/bed/chair/comfy{
dir = 4
@@ -1108,6 +1119,13 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
+"aPa" = (
+/obj/structure/largecrate/random/secure,
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"aPd" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 1
@@ -1117,10 +1135,20 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"aPf" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/lowsec/east)
"aPv" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/prison,
/area/fiorina/station/central_ring)
+"aPw" = (
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"aPD" = (
/obj/structure/prop/invuln{
desc = "An inflated membrane. This one is puncture proof. Wow!";
@@ -1141,10 +1169,19 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
-"aQA" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreen/west,
-/area/fiorina/tumor/ice_lab)
+"aQm" = (
+/obj/structure/machinery/power/terminal{
+ dir = 8
+ },
+/turf/open/floor/prison/bluecorner/east,
+/area/fiorina/station/power_ring/reactor)
+"aQp" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"aQH" = (
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
/obj/effect/landmark/nightmare{
@@ -1164,6 +1201,14 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
+"aQZ" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 8;
+ icon_state = "Straight"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"aRk" = (
/obj/structure/cargo_container/grant/left,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -1174,6 +1219,17 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
+"aRy" = (
+/obj/structure/grille,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
+"aRQ" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/effect/decal/medical_decals{
+ icon_state = "docdecal1"
+ },
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"aRT" = (
/obj/structure/barricade/handrail/type_b{
layer = 3.5
@@ -1189,9 +1245,6 @@
},
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/station/medbay)
-"aSz" = (
-/turf/closed/wall/r_wall/prison,
-/area/fiorina/station/research_cells/west)
"aSA" = (
/obj/structure/bed/sofa/vert/grey/top,
/turf/open/floor/prison,
@@ -1207,6 +1260,13 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/medbay)
+"aSU" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/east)
"aTe" = (
/obj/structure/machinery/landinglight/ds1/delaytwo,
/turf/open/floor/prison/darkyellowfull2/east,
@@ -1214,6 +1274,10 @@
"aTo" = (
/turf/closed/wall/mineral/bone_resin,
/area/fiorina/station/transit_hub)
+"aTt" = (
+/obj/structure/window/framed/prison/reinforced,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"aTx" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
@@ -1231,13 +1295,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
-"aTM" = (
-/obj/item/stack/tile/plasteel{
- pixel_x = 12;
- pixel_y = 13
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"aTO" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/toy/deck/uno,
@@ -1248,10 +1305,25 @@
/obj/item/storage/briefcase,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
+"aTZ" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/clothing/mask/cigarette/weed{
+ icon_state = "ucigoff"
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/lowsec/east)
"aUg" = (
/obj/item/tool/crowbar/red,
/turf/open/floor/prison,
/area/fiorina/station/security)
+"aUr" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzII)
"aUA" = (
/obj/item/stack/cable_coil/orange,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -1260,35 +1332,47 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
+"aVe" = (
+/obj/structure/machinery/power/apc/power/south,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
+"aVn" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
+"aVO" = (
+/obj/effect/decal/cleanable/blood/splatter{
+ icon_state = "gibmid3"
+ },
+/obj/effect/landmark/corpsespawner/doctor,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/medbay)
"aVU" = (
/turf/open/floor/corsat/squares,
/area/fiorina/station/civres_blue)
"aWk" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/telecomm/lz2_maint)
+"aWu" = (
+/obj/structure/window_frame/prison/reinforced,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"aWI" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
},
/turf/open/floor/prison/whitegreen/west,
/area/fiorina/station/medbay)
-"aWR" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"aWS" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft"
+ },
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"aWV" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/servers)
-"aWY" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space/basic,
-/area/fiorina/oob)
"aXk" = (
/obj/item/storage/fancy/candle_box,
/turf/open/floor/prison/chapel_carpet/doubleside,
@@ -1323,9 +1407,27 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"aXC" = (
-/turf/open/floor/prison/damaged2/southwest,
-/area/fiorina/station/lowsec/east)
+"aXF" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname{
+ dir = 1
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"aXG" = (
+/turf/open/floor/prison/yellowcorner,
+/area/fiorina/station/lowsec/showers_laundry)
+"aXI" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "End"
+ },
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "End"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"aXO" = (
/turf/open/floor/prison/damaged2,
/area/fiorina/station/central_ring)
@@ -1342,33 +1444,9 @@
/obj/item/tool/scythe,
/turf/open/floor/prison/blue_plate/west,
/area/fiorina/station/botany)
-"aYg" = (
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
- },
-/obj/structure/machinery/shower{
- dir = 4
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
-"aYR" = (
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/east)
-"aYX" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/chapel)
"aZi" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/tumor/servers)
-"aZA" = (
-/turf/open/floor/prison/blue,
-/area/fiorina/station/power_ring/reactor)
"aZL" = (
/turf/open/floor/prison/yellow/northeast,
/area/fiorina/station/disco)
@@ -1384,10 +1462,6 @@
/obj/item/stack/catwalk,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"baM" = (
-/obj/effect/spawner/random/gun/smg,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"bbn" = (
/obj/item/device/motiondetector,
/turf/open/floor/prison/floor_plate,
@@ -1404,13 +1478,9 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"bbI" = (
-/obj/item/stool{
- pixel_x = -4;
- pixel_y = 23
- },
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/east)
+"bbt" = (
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"bbU" = (
/obj/structure/sign/safety/fire_haz,
/turf/open/floor/prison/floor_plate,
@@ -1443,10 +1513,9 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"bcO" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/flight_deck)
+"bcG" = (
+/turf/open/floor/prison/floor_marked/west,
+/area/fiorina/station/research_cells/west)
"bcX" = (
/obj/item/tool/warning_cone,
/obj/structure/machinery/light/double/blue{
@@ -1462,6 +1531,13 @@
},
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
+"bdg" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/chapel)
"bdE" = (
/obj/item/stack/cable_coil,
/turf/open/floor/prison/floor_plate,
@@ -1503,6 +1579,10 @@
"beB" = (
/turf/open/floor/prison/blue/southwest,
/area/fiorina/station/power_ring)
+"beC" = (
+/obj/item/tool/screwdriver,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"beW" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -1525,13 +1605,15 @@
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"bgd" = (
-/obj/structure/machinery/door/airlock/almayer/security/glass{
- dir = 2;
- req_access = null
+"bgi" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
},
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"bgy" = (
/obj/item/trash/pistachios,
/turf/open/floor/plating/prison,
@@ -1547,9 +1629,6 @@
/obj/item/explosive/grenade/high_explosive/m15,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"bhC" = (
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/east)
"bhW" = (
/turf/open/floor/prison/greencorner/east,
/area/fiorina/tumor/civres)
@@ -1562,11 +1641,9 @@
"bix" = (
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/telecomm/lz1_cargo)
-"biz" = (
-/obj/structure/platform_decoration/metal/kutjevo/west,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"biN" = (
+/turf/open/floor/prison/bluecorner/west,
+/area/fiorina/station/power_ring/reactor)
"bjf" = (
/obj/item/tool/warning_cone,
/obj/structure/machinery/light/double/blue,
@@ -1584,19 +1661,10 @@
/obj/structure/girder,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/lowsec)
-"bjA" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space/basic,
-/area/fiorina/oob)
"bjR" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"bjZ" = (
-/obj/item/weapon/twohanded/spear,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"bkg" = (
/obj/structure/bed/chair,
/turf/open/floor/prison,
@@ -1605,12 +1673,11 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
-"bkQ" = (
-/obj/item/ammo_casing{
- icon_state = "casing_7_1"
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
+"bko" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space/basic,
+/area/fiorina/oob)
"bkU" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison,
@@ -1621,14 +1688,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"blf" = (
-/obj/structure/machinery/power/reactor/colony,
-/turf/open/floor/prison/bluecorner/north,
-/area/fiorina/station/power_ring/reactor)
-"blt" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/showers_laundry)
"blA" = (
/obj/item/shard{
icon_state = "medium";
@@ -1636,23 +1695,6 @@
},
/turf/open/floor/prison/whitegreen,
/area/fiorina/tumor/ice_lab)
-"blG" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- dir = 2;
- icon = 'icons/obj/structures/doors/2x1prepdoor.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"blI" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform_decoration/metal/kutjevo,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space/basic,
-/area/fiorina/oob)
"bma" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/newspaper,
@@ -1718,13 +1760,10 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"bnW" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft"
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
+"bnT" = (
+/obj/structure/machinery/portable_atmospherics/powered/scrubber,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"boe" = (
/obj/item/tool/wet_sign,
/turf/open/floor/plating/prison,
@@ -1753,20 +1792,13 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"bpH" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/machinery/door/airlock/prison_hatch/autoname{
- dir = 1
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/tumor/ice_lab)
-"bqu" = (
-/obj/structure/toilet{
- dir = 4;
- pixel_y = 8
- },
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
+"bpL" = (
+/obj/structure/machinery/power/smes/buildable,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
+"bqp" = (
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/showers_laundry)
"bqF" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -1791,6 +1823,10 @@
"brR" = (
/turf/open/floor/prison/cell_stripe,
/area/fiorina/station/flight_deck)
+"brS" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"brY" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison/greenfull/northwest,
@@ -1799,25 +1835,11 @@
/obj/structure/prop/almayer/computers/sensor_computer3,
/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/security)
-"bsm" = (
-/obj/item/shard{
- icon_state = "medium";
- name = "ice shard"
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"bso" = (
/turf/closed/shuttle/ert{
icon_state = "stan_l_w"
},
/area/fiorina/tumor/ship)
-"bsO" = (
-/obj/structure/largecrate/random/secure,
-/obj/structure/barricade/wooden{
- dir = 4
- },
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"bsR" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ashtray/plastic,
@@ -1825,8 +1847,12 @@
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
"btJ" = (
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
+/obj/structure/monorail{
+ name = "launch track"
+ },
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/telecomm/lz1_tram)
"buz" = (
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
@@ -1844,6 +1870,14 @@
},
/turf/open/floor/prison/blue/east,
/area/fiorina/station/power_ring)
+"buS" = (
+/obj/structure/platform/metal/almayer,
+/obj/item/clothing/gloves/botanic_leather,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
+"buY" = (
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"bvg" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/snacks/meat{
@@ -1860,6 +1894,10 @@
},
/turf/open/floor/prison/kitchen,
/area/fiorina/station/power_ring)
+"bvl" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"bvp" = (
/obj/structure/barricade/wooden{
dir = 4;
@@ -1882,6 +1920,11 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"bvO" = (
+/obj/item/clothing/glasses/material,
+/obj/structure/barricade/handrail,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"bvY" = (
/obj/item/stack/cable_coil,
/turf/open/floor/plating/prison,
@@ -1890,14 +1933,15 @@
/obj/structure/computerframe,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"bwk" = (
-/obj/item/tool/wrench,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"bww" = (
/obj/item/trash/candy,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"bwF" = (
+/obj/structure/bed/roller,
+/obj/item/bedsheet/green,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"bxc" = (
/obj/structure/window/reinforced,
/turf/open/floor/prison,
@@ -1923,10 +1967,6 @@
},
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/station/park)
-"bxv" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/prison/bluecorner/east,
-/area/fiorina/station/power_ring/reactor)
"bxy" = (
/turf/open/floor/prison/darkyellow2/northeast,
/area/fiorina/lz/near_lzI)
@@ -1974,19 +2014,14 @@
icon_state = "stan27"
},
/area/fiorina/tumor/ship)
+"byh" = (
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/showers_laundry)
"bym" = (
/turf/closed/shuttle/ert{
icon_state = "stan20"
},
/area/fiorina/lz/near_lzI)
-"byn" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/park)
"byB" = (
/obj/structure/surface/rack,
/turf/open/floor/prison/floor_plate,
@@ -2034,10 +2069,6 @@
/obj/item/storage/pill_bottle/bicaridine/skillless,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"bAM" = (
-/obj/item/paper/prison_station/inmate_handbook,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"bBr" = (
/obj/structure/barricade/metal/wired{
dir = 1
@@ -2076,18 +2107,18 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"bCv" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
-"bCM" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/tumor/ice_lab)
-"bDf" = (
-/obj/structure/platform_decoration/metal/almayer/east,
+"bCV" = (
+/obj/item/toy/deck,
/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/tumor/servers)
+/area/fiorina/station/research_cells/west)
+"bDl" = (
+/obj/structure/toilet{
+ dir = 4;
+ pixel_y = 8
+ },
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/east)
"bDx" = (
/obj/item/tool/extinguisher/mini,
/obj/structure/machinery/light/double/blue{
@@ -2103,6 +2134,11 @@
"bDM" = (
/turf/open/floor/prison/blue/west,
/area/fiorina/station/chapel)
+"bDR" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
"bDU" = (
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
@@ -2111,16 +2147,19 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/green,
/area/fiorina/station/chapel)
+"bEi" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/item/prop/almayer/comp_open{
+ pixel_y = 6
+ },
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"bEk" = (
/obj/structure/monorail{
name = "launch track"
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"bEm" = (
-/obj/effect/landmark/wo_supplies/storage/belts/knifebelt,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"bEA" = (
/obj/structure/barricade/wooden{
dir = 4;
@@ -2186,6 +2225,13 @@
/obj/structure/largecrate/supply/generator,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"bGE" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/item/storage/fancy/crayons,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"bGH" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor/prison/whitegreen,
@@ -2195,6 +2241,16 @@
dir = 9
},
/area/fiorina/station/civres_blue)
+"bHs" = (
+/obj/structure/platform/metal/almayer,
+/obj/item/fuel_cell,
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"bHt" = (
/obj/structure/prop/structure_lattice{
dir = 4
@@ -2220,24 +2276,18 @@
/obj/structure/largecrate/random,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
+"bIf" = (
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/east)
"bIz" = (
/obj/structure/machinery/landinglight/ds2{
dir = 8
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"bIP" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/east)
-"bIR" = (
-/obj/structure/closet/secure_closet/security,
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/disco/east_disco)
+"bIV" = (
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"bIZ" = (
/turf/closed/shuttle/elevator{
dir = 6
@@ -2251,10 +2301,6 @@
/obj/item/ammo_magazine/pistol/heavy,
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
-"bJn" = (
-/obj/item/stack/cable_coil/pink,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"bJp" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 9
@@ -2268,6 +2314,11 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"bJw" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/item/stool,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/civres_blue)
"bJG" = (
/obj/effect/decal/medical_decals{
icon_state = "cryotop"
@@ -2277,20 +2328,17 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"bKt" = (
+/obj/structure/machinery/door/airlock/almayer/marine{
+ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"bKF" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/pill_bottle/imidazoline,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
-"bKO" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
-"bKT" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/obj/item/stack/cable_coil,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
"bLA" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/flashlight,
@@ -2311,6 +2359,13 @@
/obj/item/stack/cable_coil/blue,
/turf/open/floor/prison/whitegreencorner,
/area/fiorina/tumor/ice_lab)
+"bMd" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"bMh" = (
/obj/item/frame/table/wood/fancy,
/obj/item/paper/prison_station/warden_note,
@@ -2323,6 +2378,15 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"bMw" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/obj/effect/spawner/random/gun/smg/lowchance,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"bMz" = (
/obj/item/tool/lighter/random,
/turf/open/floor/prison/kitchen/southwest,
@@ -2331,11 +2395,6 @@
/obj/item/trash/cigbutt/cigarbutt,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzI)
-"bMG" = (
-/obj/structure/surface/rack,
-/obj/item/restraint/handcuffs/zip,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/lowsec/east)
"bMI" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/folder/black_random,
@@ -2362,10 +2421,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"bNW" = (
+"bNZ" = (
/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"bOp" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/stack/barbed_wire,
@@ -2375,10 +2434,6 @@
/obj/item/stack/cable_coil/blue,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"bOx" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"bOK" = (
/obj/item/reagent_container/food/snacks/donkpocket,
/turf/open/floor/corsat/squares,
@@ -2392,6 +2447,12 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"bPj" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/chapel)
"bPl" = (
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
@@ -2431,6 +2492,10 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/whitegreen/northwest,
/area/fiorina/station/medbay)
+"bPZ" = (
+/obj/item/stack/sandbags/large_stack,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"bQh" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 8
@@ -2482,13 +2547,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"bRc" = (
-/obj/structure/machinery/cm_vending/sorted/marine_food{
- desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society.";
- name = "\improper Fiorina Purple Block Canteen Vendor"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"bRo" = (
/obj/structure/sink{
pixel_y = 23
@@ -2519,6 +2577,11 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"bRP" = (
+/obj/item/tool/kitchen/knife,
+/obj/structure/bed/roller,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"bRQ" = (
/obj/item/stock_parts/micro_laser/ultra,
/turf/open/floor/prison/darkpurple2,
@@ -2562,16 +2625,6 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"bTr" = (
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
-"bTC" = (
-/obj/structure/machinery/power/terminal{
- dir = 8
- },
-/turf/open/floor/prison/bluecorner/east,
-/area/fiorina/station/power_ring/reactor)
"bTI" = (
/obj/structure/machinery/door/poddoor/almayer/locked{
explo_proof = 1;
@@ -2591,26 +2644,30 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"bVm" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec)
+"bVb" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space,
+/area/fiorina/oob)
"bVE" = (
/obj/structure/closet/boxinggloves,
/turf/open/floor/prison,
/area/fiorina/station/central_ring)
-"bVO" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/east)
"bVZ" = (
/turf/closed/shuttle/ert{
icon_state = "leftengine_1";
opacity = 0
},
/area/fiorina/tumor/ship)
+"bWb" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/greenblue/southwest,
+/area/fiorina/station/botany)
"bWg" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/structure/machinery/faxmachine,
@@ -2621,6 +2678,9 @@
/obj/item/tool/mop,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"bWX" = (
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/east)
"bXc" = (
/obj/structure/inflatable/popped,
/turf/open/floor/prison/whitegreen/east,
@@ -2633,14 +2693,14 @@
"bXh" = (
/turf/open/floor/prison/bluecorner/north,
/area/fiorina/station/chapel)
-"bXz" = (
-/obj/item/stack/sheet/wood,
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
"bXA" = (
/obj/item/tool/screwdriver,
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
+"bYj" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/bluecorner/east,
+/area/fiorina/station/power_ring)
"bYY" = (
/obj/structure/bed/chair{
dir = 8
@@ -2654,29 +2714,20 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
+"bZr" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/turf/open/floor/almayer_hull,
+/area/fiorina/oob)
"bZD" = (
/turf/open/floor/prison/darkbrowncorners2/north,
/area/fiorina/tumor/aux_engi)
-"bZI" = (
-/obj/structure/surface/table/reinforced/prison{
- dir = 8;
- flipped = 1
- },
-/obj/item/device/flashlight/lamp,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"bZY" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/plating/prison,
/area/fiorina/station/security)
-"car" = (
-/obj/structure/machinery/portable_atmospherics/canister/nitrogen,
-/turf/open/floor/prison/yellow/west,
-/area/fiorina/station/lowsec/showers_laundry)
-"cas" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
+"caf" = (
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
"caA" = (
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison/floor_plate,
@@ -2684,9 +2735,10 @@
"caC" = (
/turf/open/floor/prison/green/east,
/area/fiorina/station/transit_hub)
-"caF" = (
-/turf/open/floor/wood,
-/area/fiorina/station/lowsec/east)
+"caK" = (
+/obj/structure/machinery/door/airlock/prison/horizontal,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"caX" = (
/obj/structure/inflatable/popped/door,
/obj/item/ammo_casing{
@@ -2702,6 +2754,9 @@
/obj/item/stack/rods,
/turf/open/floor/prison,
/area/fiorina/station/park)
+"cbC" = (
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/research_cells/east)
"cbE" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22";
@@ -2714,13 +2769,30 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
+"cbG" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomright"
+ },
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"cbN" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station)
-"cbY" = (
-/obj/item/newspaper,
-/turf/open/floor/prison/whitepurplecorner,
-/area/fiorina/station/research_cells/west)
+"ccl" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 8;
+ icon_state = "End"
+ },
+/obj/structure/ice/thin/indestructible{
+ dir = 8;
+ icon_state = "End"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"ccH" = (
/obj/structure/machinery/newscaster,
/turf/closed/wall/prison,
@@ -2742,6 +2814,15 @@
},
/turf/open/floor/prison,
/area/fiorina/station/disco)
+"cdc" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/item/clothing/gloves/botanic_leather,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
+"cdj" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/tumor/ice_lab)
"cdp" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -2767,13 +2848,9 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"cee" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco)
+"cef" = (
+/turf/closed/wall/r_wall/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"ceq" = (
/obj/item/bodybag,
/obj/item/bodybag{
@@ -2797,35 +2874,33 @@
"ceJ" = (
/turf/open/floor/prison/whitegreen/southwest,
/area/fiorina/tumor/ice_lab)
-"cfa" = (
-/obj/item/frame/rack,
-/obj/structure/barricade/handrail/type_b{
- dir = 1
- },
-/turf/open/floor/prison/floor_plate/southwest,
+"ceX" = (
+/turf/open/floor/prison/yellow/northeast,
/area/fiorina/station/lowsec/east)
+"cfc" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space/basic,
+/area/fiorina/oob)
"cfG" = (
/obj/structure/machinery/landinglight/ds1/delayone{
dir = 1
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"cfU" = (
-/obj/item/prop/helmetgarb/gunoil,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"cfX" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
-"cgo" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
+"cgf" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/east)
"cgx" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"cgF" = (
+/obj/effect/spawner/random/toolbox,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"chg" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/bluefull,
@@ -2865,17 +2940,27 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"cia" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
+"cil" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
+ dir = 2;
+ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
},
/turf/open/floor/plating/prison,
-/area/fiorina/tumor/ice_lab)
+/area/fiorina/station/research_cells/west)
"ciA" = (
/obj/structure/machinery/vending/snack/packaged,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"ciH" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space,
+/area/fiorina/oob)
"ciM" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/glass/bottle/spaceacillin{
@@ -2897,6 +2982,10 @@
/obj/structure/prop/almayer/computers/sensor_computer3,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"cjq" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/bluecorner/west,
+/area/fiorina/station/power_ring)
"cjG" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
@@ -2908,14 +2997,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"ckl" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
"ckm" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
@@ -2927,10 +3008,20 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/medbay)
-"ckS" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
+"ckC" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/security)
+"ckD" = (
+/obj/item/device/multitool,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
+"ckX" = (
+/obj/structure/prop/structure_lattice{
+ dir = 4
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"clb" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "A ticket to Souto Man's raffle!";
@@ -2950,10 +3041,10 @@
/obj/structure/inflatable/popped/door,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"clA" = (
-/obj/item/weapon/baton/cattleprod,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/east)
+"clF" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/gm/river/red_pool,
+/area/fiorina/station/park)
"clN" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
@@ -2963,6 +3054,10 @@
"clP" = (
/turf/open/floor/prison/chapel_carpet/doubleside,
/area/fiorina/station/chapel)
+"cmq" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"cmy" = (
/obj/structure/sign/prop3{
desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
@@ -2992,14 +3087,17 @@
/obj/item/stock_parts/manipulator/pico,
/turf/open/floor/prison/darkpurple2/southeast,
/area/fiorina/tumor/servers)
-"cnU" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring)
-"coj" = (
-/obj/item/stool,
+"cnR" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
+/area/fiorina/station/disco/east_disco)
+"coL" = (
+/obj/structure/machinery/fuelcell_recycler/full,
+/turf/open/floor/prison/blue/southwest,
+/area/fiorina/station/power_ring/reactor)
"cpP" = (
/turf/closed/shuttle/elevator/gears,
/area/fiorina/station/telecomm/lz1_cargo)
@@ -3008,6 +3106,10 @@
icon_state = "stan_leftengine"
},
/area/fiorina/oob)
+"cqI" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/darkbrown2/southeast,
+/area/fiorina/station/park)
"cqP" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -3024,21 +3126,10 @@
/obj/item/stool,
/turf/open/floor/prison/blue/west,
/area/fiorina/station/power_ring)
-"cqW" = (
-/obj/item/stool,
-/turf/open/floor/prison/damaged2,
-/area/fiorina/station/lowsec/east)
"cqX" = (
/obj/item/stool,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"cqZ" = (
-/obj/structure/platform/metal/stair_cut/platform_right,
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
"cri" = (
/obj/structure/machinery/computer/prisoner,
/obj/structure/window/reinforced{
@@ -3056,33 +3147,38 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"crI" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"crM" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/tumor/servers)
+"csg" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
+"csF" = (
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/west)
"csL" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/telecomm/lz1_tram)
-"csW" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"ctc" = (
/obj/structure/prop/resin_prop{
icon_state = "sheater0"
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"ctj" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzII)
"cto" = (
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
@@ -3098,13 +3194,6 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"ctI" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/effect/spawner/random/goggles/lowchance,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
"ctW" = (
/obj/structure/bed{
icon_state = "abed"
@@ -3123,13 +3212,6 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/blue/southeast,
/area/fiorina/station/civres_blue)
-"cum" = (
-/obj/structure/barricade/handrail/type_b{
- dir = 1
- },
-/obj/item/frame/rack,
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
"cvc" = (
/obj/structure/barricade/metal/wired{
dir = 4
@@ -3147,10 +3229,14 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
-"cvf" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring)
+"cvg" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/obj/item/storage/fancy/cigarettes/blackpack,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
"cvi" = (
/obj/structure/surface/rack,
/obj/item/storage/firstaid/fire,
@@ -3175,6 +3261,20 @@
},
/turf/closed/wall/prison,
/area/fiorina/tumor/servers)
+"cvT" = (
+/obj/structure/prop/structure_lattice{
+ dir = 4
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
+"cvW" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/device/taperecorder{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/lowsec/east)
"cwB" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -3189,6 +3289,10 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"cwT" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/east)
"cxb" = (
/turf/open/floor/prison/darkbrown2/west,
/area/fiorina/maintenance)
@@ -3197,6 +3301,9 @@
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/station/chapel)
+"cxp" = (
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/disco/east_disco)
"cxy" = (
/obj/item/ammo_magazine/rifle/m16{
current_rounds = 0;
@@ -3243,10 +3350,14 @@
/obj/effect/spawner/random/pills/lowchance,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"czx" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
+"czv" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"czJ" = (
/obj/structure/reagent_dispensers/watertank{
layer = 2.6
@@ -3254,6 +3365,9 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
+"cAz" = (
+/turf/open/floor/wood,
+/area/fiorina/station/disco/east_disco)
"cAJ" = (
/obj/item/trash/snack_bowl,
/turf/open/floor/prison/yellow/north,
@@ -3266,6 +3380,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzII)
+"cAP" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"cAU" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/radio,
@@ -3280,6 +3398,12 @@
/obj/item/storage/toolbox/electrical,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
+"cBv" = (
+/turf/closed/wall/r_wall/prison_unmeltable{
+ desc = "A huge chunk of metal used to seperate rooms.";
+ name = "metal wall"
+ },
+/area/fiorina/station/research_cells/east)
"cBG" = (
/obj/effect/alien/weeds/node,
/turf/open/floor/prison/darkbrown2/west,
@@ -3294,6 +3418,11 @@
},
/turf/open/space,
/area/fiorina/oob)
+"cBU" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/item/device/flashlight,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"cBX" = (
/obj/structure/largecrate/random,
/obj/effect/decal/medical_decals{
@@ -3304,9 +3433,6 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"cCe" = (
-/turf/open/floor/prison/whitepurplecorner,
-/area/fiorina/station/research_cells/west)
"cCh" = (
/obj/item/ammo_casing{
dir = 6;
@@ -3353,6 +3479,11 @@
/obj/item/tool/crowbar,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
+"cDd" = (
+/obj/structure/platform_decoration/metal/kutjevo,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"cDl" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
@@ -3366,14 +3497,6 @@
/obj/item/reagent_container/food/snacks/meat,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"cDO" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/tumor/servers)
"cEb" = (
/obj/structure/stairs/perspective{
dir = 4;
@@ -3381,11 +3504,17 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"cEg" = (
+"cEr" = (
+/obj/structure/platform/metal/almayer,
/obj/structure/surface/table/reinforced/prison,
-/obj/item/ammo_magazine/shotgun/buckshot,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+/obj/item/storage/firstaid/regular,
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/whitegreen/southeast,
+/area/fiorina/station/medbay)
"cEw" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/transit_hub)
@@ -3430,6 +3559,10 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"cGO" = (
+/obj/structure/inflatable,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"cGR" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/wood,
@@ -3448,10 +3581,6 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"cHi" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/tumor/ice_lab)
"cHl" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
@@ -3462,10 +3591,14 @@
/obj/item/toy/plush/farwa,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"cHC" = (
-/obj/item/trash/popcorn,
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/east)
+"cHs" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/flight_deck)
"cHF" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/door/window/eastright,
@@ -3479,23 +3612,12 @@
/obj/structure/closet/secure_closet/engineering_welding,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"cIa" = (
-/turf/closed/wall/prison,
-/area/fiorina/station/research_cells/east)
-"cIt" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
-"cIJ" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/obj/structure/inflatable,
-/turf/open/floor/prison/whitepurple/north,
+"cIj" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
+"cIu" = (
+/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/research_cells/west)
"cIQ" = (
/obj/structure/bed/chair{
@@ -3511,6 +3633,15 @@
},
/turf/open/floor/prison/floor_marked/southwest,
/area/fiorina/station/park)
+"cJd" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/gm/river/desert/deep,
+/area/fiorina/lz/near_lzII)
+"cJh" = (
+/turf/open/floor/prison/whitepurplecorner,
+/area/fiorina/station/research_cells/west)
"cJv" = (
/obj/item/stack/rods,
/turf/open/floor/corsat/squares,
@@ -3535,6 +3666,11 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"cJN" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/stack/sheet/mineral/plastic,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"cJS" = (
/obj/item/trash/uscm_mre,
/obj/effect/landmark/corpsespawner/ua_riot,
@@ -3548,9 +3684,6 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/darkbrown2/northwest,
/area/fiorina/tumor/aux_engi)
-"cKa" = (
-/turf/closed/wall/prison,
-/area/fiorina/station/research_cells/west)
"cKb" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -3558,12 +3691,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"cKH" = (
-/obj/structure/closet/bodybag,
-/obj/effect/decal/cleanable/blood/gibs/up,
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"cKJ" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -3575,6 +3702,9 @@
/obj/item/prop/helmetgarb/riot_shield,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"cLp" = (
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco/east_disco)
"cLu" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -3592,6 +3722,18 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
+"cLH" = (
+/turf/closed/wall/r_wall/prison_unmeltable{
+ desc = "A huge chunk of metal used to seperate rooms.";
+ name = "metal wall"
+ },
+/area/fiorina/station/research_cells/west)
+"cLI" = (
+/obj/structure/closet/bodybag,
+/obj/effect/decal/cleanable/blood/gibs/up,
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"cLS" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/floor_plate/southwest,
@@ -3611,24 +3753,26 @@
"cME" = (
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"cMP" = (
-/obj/structure/machinery/shower{
- dir = 8
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
"cNe" = (
/obj/structure/bed/chair{
dir = 8
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"cNU" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/gm/river/desert/deep,
-/area/fiorina/lz/near_lzII)
+"cNg" = (
+/obj/structure/platform/metal/stair_cut/platform_right,
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
+"cNJ" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/east)
"cOj" = (
/turf/open/floor/prison/blue,
/area/fiorina/station/civres_blue)
@@ -3640,9 +3784,6 @@
/obj/item/tool/wet_sign,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
-"cOF" = (
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"cOL" = (
/turf/open/floor/prison/darkyellow2/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
@@ -3694,19 +3835,10 @@
layer = 3
},
/area/fiorina/oob)
-"cQB" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
"cRg" = (
/obj/structure/machinery/vending/coffee/simple,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
-"cRk" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/darkbrown2,
-/area/fiorina/station/park)
"cRl" = (
/obj/structure/closet/secure_closet/security_empty,
/obj/item/book/manual/security_space_law,
@@ -3717,42 +3849,56 @@
/obj/structure/machinery/sensortower,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"cRB" = (
-/obj/structure/machinery/door/airlock/prison/horizontal{
- density = 0;
- dir = 4;
- icon_state = "door_open";
- opacity = 0
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"cRI" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/obj/item/stool,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"cRK" = (
/obj/structure/window,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"cRM" = (
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
+"cRO" = (
+/obj/structure/closet/bodybag,
+/obj/effect/decal/cleanable/blood/gibs/up,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"cRZ" = (
/obj/structure/machinery/landinglight/ds2/delaythree{
dir = 4
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
+"cSg" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/darkbrown2,
+/area/fiorina/station/park)
"cSh" = (
/obj/structure/closet/secure_closet/hydroponics,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/botany)
+"cSr" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/item/prop/almayer/flight_recorder,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
+"cTc" = (
+/obj/structure/bed/roller,
+/obj/item/bedsheet/green,
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
+"cTg" = (
+/obj/item/shard{
+ icon_state = "large";
+ name = "ice shard"
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
+"cTm" = (
+/turf/open/floor/prison/darkyellowfull2/east,
+/area/fiorina/station/disco/east_disco)
+"cTo" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/prison/bluecorner/east,
+/area/fiorina/station/power_ring/reactor)
"cTr" = (
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/plating/prison,
@@ -3786,15 +3932,41 @@
"cUd" = (
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/lz/near_lzI)
+"cUw" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/disco)
"cUA" = (
/obj/structure/largecrate/random,
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/station/park)
+"cUT" = (
+/obj/item/stack/tile/plasteel{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"cVu" = (
/obj/item/stack/sandbags_empty/half,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/lz/near_lzI)
+"cVx" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/beer_pack{
+ pixel_y = 7
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
+"cVI" = (
+/obj/item/inflatable,
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"cVQ" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -3802,10 +3974,22 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"cVV" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/r_wall/prison,
-/area/fiorina/station/disco/east_disco)
+"cWh" = (
+/obj/item/stool,
+/turf/open/floor/prison/damaged2/southwest,
+/area/fiorina/station/lowsec/east)
+"cWn" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/obj/structure/inflatable,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
+"cWB" = (
+/obj/structure/prop/almayer/computers/mapping_computer,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"cXp" = (
/obj/item/stack/sheet/metal/medium_stack,
/turf/open/floor/prison/floor_plate,
@@ -3826,21 +4010,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/transit_hub)
-"cYi" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/card/id/gold{
- pixel_x = 2;
- pixel_y = 4
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"cYj" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/lowsec/east)
"cYI" = (
/turf/open/floor/prison/green/northeast,
/area/fiorina/tumor/aux_engi)
@@ -3851,22 +4020,6 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"cYT" = (
-/obj/vehicle/powerloader{
- dir = 8
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
-"cYY" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"cZe" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/phone,
@@ -3893,10 +4046,6 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"cZv" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
"cZy" = (
/obj/structure/machinery/door/window/northleft{
dir = 4
@@ -3916,14 +4065,13 @@
/obj/structure/machinery/vending/walkman,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"dar" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
+"dan" = (
+/obj/structure/bed{
+ icon_state = "abed"
},
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/central_ring)
+/obj/item/card/id/visa,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"daA" = (
/obj/item/clothing/accessory/armband/cargo{
desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured.";
@@ -3944,10 +4092,6 @@
/obj/item/trash/kepler,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"dbh" = (
-/obj/structure/machinery/vending/sovietsoda,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"dbi" = (
/obj/item/storage/toolbox/electrical,
/turf/open/floor/prison,
@@ -3961,10 +4105,14 @@
},
/turf/open/floor/prison/chapel_carpet/doubleside,
/area/fiorina/station/chapel)
-"dbI" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/prison/floor_marked/west,
-/area/fiorina/station/lowsec/showers_laundry)
+"dby" = (
+/obj/structure/barricade/sandbags{
+ dir = 8;
+ icon_state = "sandbag_0";
+ pixel_y = 2
+ },
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"dbW" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/box/donkpockets{
@@ -3974,16 +4122,20 @@
/obj/item/storage/box/donkpockets,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"dcv" = (
-/obj/structure/largecrate/random,
-/turf/open/floor/prison,
-/area/fiorina/station/research_cells/east)
"dcy" = (
/obj/structure/bed/chair{
dir = 8
},
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"dcD" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
+ },
+/obj/item/clothing/gloves/combat,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"dcO" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/floor_plate,
@@ -3995,13 +4147,6 @@
},
/turf/open/floor/prison/darkredfull2,
/area/fiorina/oob)
-"ddt" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/beer_pack{
- pixel_y = 7
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"ddv" = (
/obj/structure/closet/secure_closet/engineering_welding,
/obj/structure/machinery/light/double/blue{
@@ -4055,9 +4200,6 @@
},
/turf/closed/wall/prison,
/area/fiorina/tumor/servers)
-"deg" = (
-/turf/open/floor/prison/whitepurplecorner/west,
-/area/fiorina/station/research_cells/east)
"deB" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 8
@@ -4068,14 +4210,16 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"deC" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/turf/open/floor/almayer_hull,
-/area/fiorina/oob)
"deR" = (
/obj/item/toy/crayon/red,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"deY" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"dfc" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/oob)
@@ -4087,11 +4231,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
-"dfw" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space,
-/area/fiorina/oob)
"dfA" = (
/obj/structure/barricade/sandbags{
icon_state = "sandbag_0";
@@ -4107,18 +4246,43 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"dgg" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/obj/structure/inflatable/popped,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
-"dhc" = (
+"dgw" = (
/obj/structure/largecrate/random/secure,
/obj/structure/machinery/light/double/blue{
pixel_y = -1
},
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/disco/east_disco)
+"dgF" = (
+/obj/item/device/flashlight,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
+"dgJ" = (
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
+ },
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
+"dgM" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
+"dgX" = (
+/obj/structure/platform_decoration/metal/kutjevo/west,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"dhL" = (
/obj/structure/barricade/wooden{
dir = 4
@@ -4133,14 +4297,15 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"diF" = (
-/obj/item/stack/sheet/cardboard,
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/east)
-"diJ" = (
-/obj/item/stool,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
+"diR" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/whitegreen/southwest,
+/area/fiorina/station/medbay)
"dje" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating/prison,
@@ -4149,20 +4314,24 @@
/obj/effect/spawner/random/gun/smg/midchance,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"djB" = (
-/obj/vehicle/powerloader{
- dir = 4
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
-"djF" = (
-/obj/structure/machinery/portable_atmospherics/powered/scrubber,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
+"djq" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/item/tool/extinguisher/mini,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
"dkb" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"dki" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"dkl" = (
/obj/structure/bed/chair{
dir = 1
@@ -4192,21 +4361,6 @@
},
/turf/open/floor/prison/darkyellow2,
/area/fiorina/station/telecomm/lz1_cargo)
-"dlg" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
-"dlj" = (
-/obj/structure/machinery/portable_atmospherics/powered/pump,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"dlr" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/radio{
@@ -4223,6 +4377,13 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"dmi" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"dmQ" = (
/obj/item/stack/sheet/metal{
amount = 5
@@ -4249,14 +4410,20 @@
"dnX" = (
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/lz/near_lzI)
-"doc" = (
-/obj/item/stool,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"doe" = (
/obj/item/tool/kitchen/utensil/pspoon,
/turf/open/space/basic,
/area/fiorina/oob)
+"dof" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space,
+/area/fiorina/oob)
"doq" = (
/obj/structure/bed/chair{
dir = 4;
@@ -4275,12 +4442,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
-"doQ" = (
-/obj/structure/disposalpipe/broken{
- dir = 1
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
"doY" = (
/obj/item/paper/crumpled/bloody,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
@@ -4326,18 +4487,10 @@
},
/turf/open/floor/prison/darkyellow2/northeast,
/area/fiorina/station/flight_deck)
-"drk" = (
-/obj/effect/landmark/objective_landmark/far,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"drt" = (
/obj/structure/machinery/vending/hydroseeds,
/turf/open/floor/prison/blue_plate/north,
/area/fiorina/station/botany)
-"drZ" = (
-/obj/item/clothing/mask/cigarette,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
"dsS" = (
/obj/structure/barricade/handrail/type_b{
dir = 4;
@@ -4353,11 +4506,17 @@
},
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
-"dtg" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/ammo_magazine/shotgun/buckshot,
+"dsY" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/darkbrowncorners2,
+/area/fiorina/station/park)
+"dth" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
+/area/fiorina/station/botany)
"dtk" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/drinks/golden_cup,
@@ -4378,15 +4537,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzII)
-"dul" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/prison/whitegreen/southwest,
-/area/fiorina/station/medbay)
+"duu" = (
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"duw" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/machinery/light/double/blue{
@@ -4395,22 +4549,20 @@
},
/turf/open/floor/corsat/plate,
/area/fiorina/tumor/aux_engi)
-"duF" = (
-/obj/structure/window/framed/prison/reinforced,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"duL" = (
-/turf/open/floor/prison/yellow/southeast,
+"duE" = (
+/obj/item/ammo_casing{
+ icon_state = "casing_6_1"
+ },
+/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec/east)
+"duK" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/darkbrowncorners2/west,
+/area/fiorina/station/park)
"duM" = (
/obj/structure/machinery/photocopier,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
-"duV" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/clipboard,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"duW" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison,
@@ -4423,12 +4575,20 @@
/obj/structure/machinery/newscaster,
/turf/closed/wall/prison,
/area/fiorina/station/medbay)
+"dvF" = (
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"dwf" = (
/obj/structure/bed/chair{
dir = 8
},
/turf/open/floor/prison/darkbrown2/southeast,
/area/fiorina/maintenance)
+"dwg" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"dwJ" = (
/obj/structure/machinery/processor{
desc = "It CAN blend it.";
@@ -4460,6 +4620,19 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"dxa" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/prop/souto_land/pole,
+/obj/structure/prop/souto_land/pole{
+ dir = 4;
+ pixel_y = 24
+ },
+/turf/open/floor/prison/darkbrown2/west,
+/area/fiorina/station/park)
"dxb" = (
/obj/item/storage/briefcase/stowaway,
/turf/open/space,
@@ -4470,6 +4643,10 @@
},
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/lz/near_lzI)
+"dxe" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/prison/floor_marked/west,
+/area/fiorina/station/lowsec/showers_laundry)
"dxl" = (
/obj/structure/barricade/metal/wired,
/turf/open/floor/prison/yellowfull,
@@ -4516,36 +4693,20 @@
},
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"dzh" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
"dzl" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/flight_deck)
-"dzq" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
-"dzs" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/item/stool,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/civres_blue)
-"dzB" = (
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
-"dzE" = (
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
+"dzM" = (
+/turf/open/floor/prison/damaged2/southwest,
+/area/fiorina/station/lowsec/east)
"dAg" = (
/turf/open/floor/prison/whitegreen/northeast,
/area/fiorina/station/medbay)
+"dAI" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec)
"dBl" = (
/obj/item/ammo_magazine/rifle/mar40/extended,
/turf/open/floor/prison/floor_plate,
@@ -4587,6 +4748,10 @@
"dBZ" = (
/turf/open/floor/prison/darkyellowcorners2/east,
/area/fiorina/station/flight_deck)
+"dCi" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"dCn" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
density = 0;
@@ -4629,10 +4794,18 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/security)
+"dDk" = (
+/obj/item/tool/wrench,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"dDn" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
+"dDr" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"dDI" = (
/obj/structure/machinery/landinglight/ds1{
dir = 8
@@ -4688,12 +4861,6 @@
/obj/item/clothing/accessory/armband/cargo,
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
-"dFI" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"dFK" = (
/obj/structure/surface/rack,
/obj/item/ammo_box/magazine/nailgun,
@@ -4706,6 +4873,19 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
+"dGs" = (
+/obj/structure/window/framed/prison,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
+"dGv" = (
+/obj/structure/barricade/sandbags{
+ dir = 8;
+ icon_state = "sandbag_0";
+ pixel_y = 2
+ },
+/obj/item/storage/toolbox/syndicate,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"dGx" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
@@ -4723,10 +4903,14 @@
},
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/park)
-"dGF" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
+"dGD" = (
+/obj/structure/surface/table/reinforced/prison{
+ dir = 8;
+ flipped = 1
+ },
+/obj/item/device/flashlight/lamp,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"dHb" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -4740,13 +4924,32 @@
/obj/structure/sign/safety/bulkhead_door,
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/civres)
+"dHf" = (
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/east)
"dHD" = (
/turf/open/floor/prison/yellow/north,
/area/fiorina/station/lowsec)
-"dHE" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/cell_stripe/west,
-/area/fiorina/station/botany)
+"dHF" = (
+/obj/structure/barricade/sandbags{
+ dir = 4;
+ icon_state = "sandbag_0";
+ pixel_y = 2
+ },
+/obj/item/storage/pouch/tools/full,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
+"dHG" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
+"dHO" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/east)
"dHU" = (
/turf/open/floor/prison/platingdmg1,
/area/fiorina/station/security)
@@ -4757,34 +4960,48 @@
"dIo" = (
/turf/closed/wall/prison,
/area/fiorina/tumor/civres)
-"dIp" = (
-/turf/open/floor/prison/blue/east,
-/area/fiorina/station/power_ring/reactor)
-"dIu" = (
-/obj/structure/platform/metal/almayer/east,
+"dIv" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/clipboard,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
+/area/fiorina/station/power_ring/reactor)
+"dIx" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/darkbrown2,
+/area/fiorina/station/park)
"dJc" = (
-/obj/structure/platform_decoration/metal/almayer/east,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/effect/spawner/random/gun/rifle,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
+/area/fiorina/station/lowsec/east)
"dJd" = (
/obj/effect/decal/cleanable/blood/gibs,
/obj/item/ammo_magazine/rifle/mar40,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
-"dJh" = (
-/obj/structure/bookcase/manuals/research_and_development{
- pixel_y = 10
- },
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
-"dJt" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
+"dJS" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
},
-/turf/open/floor/prison/yellow,
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
/area/fiorina/station/disco/east_disco)
+"dJY" = (
+/obj/item/storage/backpack{
+ pixel_x = -11;
+ pixel_y = 15
+ },
+/obj/item/trash/syndi_cakes,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
+"dKh" = (
+/obj/structure/closet/basketball,
+/obj/item/storage/pill_bottle/bicaridine/skillless,
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"dKo" = (
/obj/effect/spawner/random/gun/shotgun,
/turf/open/floor/carpet,
@@ -4795,20 +5012,23 @@
},
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_tram)
-"dKO" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/tumor/ice_lab)
"dKX" = (
/obj/effect/landmark/survivor_spawner,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/maintenance)
+"dKY" = (
+/turf/open/floor/prison/whitepurplecorner/west,
+/area/fiorina/station/research_cells/west)
"dLq" = (
/obj/structure/bed/chair/comfy{
dir = 1
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"dLy" = (
+/obj/item/reagent_container/food/drinks/sillycup,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"dLL" = (
/turf/open/floor/prison/darkpurple2/southwest,
/area/fiorina/tumor/servers)
@@ -4819,18 +5039,27 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"dLO" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/park)
+"dMb" = (
+/obj/structure/machinery/power/reactor/colony,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"dMt" = (
/turf/open/floor/prison/darkbrowncorners2/west,
/area/fiorina/tumor/aux_engi)
-"dMT" = (
-/obj/structure/blocker/invisible_wall,
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "Corner"
+"dNd" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
},
-/turf/open/ice/noweed,
-/area/fiorina/tumor/ice_lab)
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/disco/east_disco)
"dNh" = (
/turf/open/auto_turf/sand/layer1,
/area/fiorina/lz/near_lzI)
@@ -4851,16 +5080,6 @@
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/prison/darkredfull2,
/area/fiorina/lz/near_lzI)
-"dOc" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
-"dOf" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/tumor/ice_lab)
"dOk" = (
/turf/open/floor/prison/panelscorched,
/area/fiorina/tumor/civres)
@@ -4874,13 +5093,16 @@
/obj/item/storage/bible/hefa,
/turf/open/floor/wood,
/area/fiorina/station/chapel)
-"dOI" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
"dOO" = (
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/station/medbay)
+"dOQ" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 4;
+ icon_state = "gib6"
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"dOX" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/lz/near_lzI)
@@ -4895,6 +5117,12 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"dPB" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/closet/firecloset/full,
+/obj/item/paper/prison_station/inmate_handbook,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"dPZ" = (
/obj/structure/monorail{
dir = 6;
@@ -4902,10 +5130,12 @@
},
/turf/open/space,
/area/fiorina/oob)
-"dQe" = (
-/obj/item/tool/surgery/scalpel,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"dQB" = (
+/obj/structure/closet/basketball,
+/obj/item/storage/pill_bottle/tramadol/skillless,
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"dQW" = (
/obj/item/ammo_casing{
dir = 8;
@@ -4932,10 +5162,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"dRF" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring)
"dRO" = (
/obj/effect/acid_hole{
dir = 4
@@ -4945,6 +5171,13 @@
name = "metal wall"
},
/area/fiorina/oob)
+"dRU" = (
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/showers_laundry)
+"dRW" = (
+/obj/item/paper,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"dSM" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/darkpurplefull2,
@@ -4961,11 +5194,9 @@
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"dTQ" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/closet/radiation,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
+"dTR" = (
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/power_ring/reactor)
"dTX" = (
/obj/structure/surface/rack,
/obj/item/storage/bible/hefa{
@@ -4986,18 +5217,6 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"dUm" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/barricade/handrail/type_b{
- dir = 4;
- layer = 3.5
- },
-/obj/structure/morgue{
- dir = 8;
- layer = 2.6
- },
-/turf/open/floor/corsat/squares,
-/area/fiorina/station/medbay)
"dUn" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/flora/pottedplant{
@@ -5011,19 +5230,19 @@
/obj/structure/machinery/recharge_station,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"dUx" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
-"dVu" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
+"dUI" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/box/cups,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
+"dVm" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
},
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/botany)
"dVx" = (
/obj/structure/stairs/perspective{
dir = 4;
@@ -5031,15 +5250,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"dVA" = (
-/obj/item/stool,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"dVC" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/clipboard,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"dVD" = (
/obj/structure/inflatable/popped/door,
/turf/open/floor/prison/whitegreen,
@@ -5065,6 +5275,14 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
+"dWI" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/park)
"dXi" = (
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison/darkpurple2/east,
@@ -5095,10 +5313,6 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"dXS" = (
-/obj/structure/bed/chair/office/light,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"dYi" = (
/turf/open/floor/prison/yellow/west,
/area/fiorina/station/central_ring)
@@ -5119,14 +5333,6 @@
/obj/structure/machinery/faxmachine,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"dYB" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
"dYC" = (
/turf/open/floor/prison/yellow/east,
/area/fiorina/station/central_ring)
@@ -5156,10 +5362,6 @@
"dZK" = (
/turf/open/floor/prison/bluecorner/east,
/area/fiorina/station/chapel)
-"dZM" = (
-/obj/structure/window/framed/prison/cell,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"dZQ" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkyellow2/east,
@@ -5170,46 +5372,24 @@
},
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
-"eao" = (
-/obj/structure/machinery/shower{
- dir = 8
+"ebh" = (
+/obj/structure/machinery/iv_drip{
+ pixel_y = 19
},
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
-"eaH" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/greenfull/northwest,
-/area/fiorina/station/transit_hub)
-"ebx" = (
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
+"ebw" = (
/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/park)
-"ecd" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"ecj" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{
- layer = 3.5
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/telecomm/lz1_tram)
"ecu" = (
/obj/item/stack/sheet/metal/medium_stack,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"ecz" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/darkbrowncorners2/west,
-/area/fiorina/station/park)
"ecD" = (
/obj/structure/bed/chair{
dir = 1
@@ -5219,6 +5399,14 @@
},
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
+"ecE" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "Straight"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"ecL" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/tool,
@@ -5235,6 +5423,14 @@
"ecU" = (
/turf/open/floor/prison/darkyellow2/northwest,
/area/fiorina/station/flight_deck)
+"ecX" = (
+/obj/item/inflatable,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"eds" = (
/obj/structure/surface/rack,
/obj/item/device/flashlight,
@@ -5243,6 +5439,14 @@
/obj/item/device/multitool,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/telecomm/lz1_cargo)
+"edG" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"edY" = (
/obj/item/trash/used_stasis_bag{
desc = "Wow, instant sand. They really have everything in space.";
@@ -5250,6 +5454,10 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
+"eed" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname,
+/turf/open/floor/prison/redfull,
+/area/fiorina/station/lowsec/east)
"eeH" = (
/obj/structure/monorail{
dir = 9;
@@ -5332,6 +5540,23 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"ehl" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
+"ehn" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
+"ehq" = (
+/turf/open/floor/prison/yellowcorner/east,
+/area/fiorina/station/lowsec/showers_laundry)
"ehr" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/floor_plate/southwest,
@@ -5340,21 +5565,20 @@
/obj/structure/machinery/landinglight/ds1/delaythree,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"eio" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
-"eja" = (
-/obj/item/ammo_casing{
- icon_state = "casing_6_1"
+"ehW" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/telecomm/lz1_tram)
+"eiW" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"ejf" = (
-/obj/structure/closet/bodybag,
-/obj/effect/decal/cleanable/blood/gibs/down,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space,
+/area/fiorina/oob)
"ejq" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -5381,14 +5605,13 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"ejM" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/box/wy_mre{
- pixel_x = 5;
- pixel_y = 2
+"ejZ" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
},
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"ekb" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_tram)
@@ -5420,26 +5643,10 @@
},
/turf/open/floor/prison/blue/southeast,
/area/fiorina/station/power_ring)
-"elc" = (
-/obj/structure/bed/roller,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"ele" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/central_ring)
-"elm" = (
-/obj/structure/window/framed/prison/cell,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"elr" = (
-/obj/effect/decal/cleanable/blood/splatter{
- icon_state = "gibmid3"
- },
-/obj/effect/landmark/corpsespawner/doctor,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/medbay)
"elO" = (
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/lowsec)
@@ -5453,12 +5660,6 @@
/obj/structure/closet/crate/trashcart,
/turf/open/floor/corsat/plate,
/area/fiorina/tumor/aux_engi)
-"emo" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/prison/whitegreen/southeast,
-/area/fiorina/tumor/ice_lab)
"emC" = (
/obj/structure/lattice,
/obj/item/shard{
@@ -5466,21 +5667,30 @@
},
/turf/open/space,
/area/fiorina/oob)
-"emE" = (
-/turf/open/floor/prison/bluecorner/west,
-/area/fiorina/station/power_ring/reactor)
+"emT" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"end" = (
/obj/structure/window/framed/prison/cell,
/turf/open/floor/plating/prison,
/area/fiorina/station/lowsec)
-"eni" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
-"enn" = (
-/obj/structure/platform_decoration/metal/almayer/east,
+"enm" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/spacecash/c10,
+/obj/item/spacecash/c10{
+ pixel_x = 5;
+ pixel_y = 10
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
+/area/fiorina/station/lowsec/east)
"enu" = (
/obj/item/trash/uscm_mre,
/turf/open/floor/prison/darkyellowfull2/east,
@@ -5493,37 +5703,22 @@
/obj/effect/alien/weeds/node,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"enU" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
"enY" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"eor" = (
-/obj/item/tool/pickaxe,
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/whitegreen/east,
-/area/fiorina/tumor/ice_lab)
"eot" = (
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/telecomm/lz1_tram)
-"eov" = (
-/turf/closed/wall/r_wall/prison_unmeltable{
- desc = "A huge chunk of metal used to seperate rooms.";
- name = "metal wall"
- },
-/area/fiorina/station/research_cells/west)
-"eow" = (
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
"eoW" = (
/obj/structure/largecrate/random/case,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"epz" = (
+/obj/structure/lattice,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space,
+/area/fiorina/oob)
"epB" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/blue,
@@ -5599,22 +5794,19 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"erU" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/machinery/shower{
- dir = 8
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
+"esh" = (
+/obj/item/book/manual/atmospipes,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"esw" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/station/medbay)
"esy" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/turf/open/floor/prison/blue/southeast,
+/area/fiorina/station/power_ring/reactor)
"esR" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -5623,16 +5815,18 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"esY" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/blue/west,
-/area/fiorina/station/power_ring)
"esZ" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"eta" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"etj" = (
/turf/open/floor/prison/green/northeast,
/area/fiorina/station/chapel)
@@ -5649,12 +5843,12 @@
},
/turf/open/floor/prison/yellow/southeast,
/area/fiorina/station/lowsec)
-"eux" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/east)
+"eup" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"euz" = (
/obj/structure/bed/chair{
dir = 4
@@ -5705,6 +5899,19 @@
},
/turf/open/floor/prison,
/area/fiorina/station/botany)
+"ewi" = (
+/obj/vehicle/powerloader{
+ dir = 4
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
+"ewj" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/civres_blue)
"ewx" = (
/obj/structure/bed/chair/comfy{
dir = 1
@@ -5747,6 +5954,10 @@
},
/turf/open/floor/prison/darkbrown2/southwest,
/area/fiorina/maintenance)
+"exF" = (
+/obj/structure/window/framed/prison/cell,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"exI" = (
/turf/open/floor/prison/darkbrowncorners2/west,
/area/fiorina/station/park)
@@ -5759,6 +5970,11 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"exT" = (
+/obj/item/device/flashlight/lamp/tripod,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"exW" = (
/obj/structure/monorail{
name = "launch track"
@@ -5819,24 +6035,14 @@
/obj/structure/machinery/portable_atmospherics/canister/phoron,
/turf/open/floor/corsat/plate,
/area/fiorina/station/telecomm/lz1_cargo)
-"eyB" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space,
-/area/fiorina/oob)
"eyO" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
-"eyT" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/item/clothing/gloves/botanic_leather,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
-"ezd" = (
-/obj/structure/largecrate/random/case/double,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
+"ezj" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/east)
"ezn" = (
/obj/structure/sign/prop3{
desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
@@ -5858,6 +6064,16 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"eAh" = (
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/disco/east_disco)
+"eAk" = (
+/obj/item/shard{
+ icon_state = "medium";
+ name = "ice shard"
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"eAM" = (
/obj/structure/machinery/landinglight/ds2/delaytwo{
dir = 1
@@ -5878,14 +6094,14 @@
/obj/structure/bed/chair,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"eBH" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
+"eBI" = (
+/obj/structure/reagent_dispensers/water_cooler{
+ density = 0;
+ pixel_x = -8;
+ pixel_y = 16
},
-/turf/open/floor/prison,
-/area/fiorina/station/flight_deck)
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"eBO" = (
/obj/structure/machinery/door/airlock/almayer/marine,
/turf/open/floor/prison/yellowfull,
@@ -5893,6 +6109,11 @@
"eBS" = (
/turf/open/floor/prison/cell_stripe/north,
/area/fiorina/station/power_ring)
+"eBV" = (
+/obj/item/explosive/grenade/incendiary/molotov,
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"eCy" = (
/obj/effect/spawner/random/gun/pistol,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -5907,37 +6128,26 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"eDA" = (
-/obj/structure/prop/structure_lattice{
- dir = 4;
- health = 300
- },
-/obj/structure/prop/structure_lattice{
- dir = 4;
- layer = 3.1;
- pixel_y = 10
+"eDq" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
},
-/turf/open/floor/prison/floor_plate,
+/turf/open/floor/plating/prison,
/area/fiorina/station/research_cells/west)
-"eDU" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/item/stool,
-/obj/item/clothing/shoes/slippers_worn,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/civres_blue)
"eEx" = (
/obj/item/circuitboard/machine/rdserver,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"eEC" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/stack/sheet/plasteel/medium_stack,
-/obj/item/reagent_container/food/drinks/flask/vacuumflask{
- pixel_x = 7;
- pixel_y = 22
+"eEB" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/bed/chair{
+ dir = 1;
+ layer = 2.7
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
"eED" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/paper_bin{
@@ -5958,6 +6168,10 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
+"eEK" = (
+/obj/effect/landmark/corpsespawner/ua_riot,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"eEQ" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/darkyellow2/west,
@@ -6005,26 +6219,11 @@
/obj/item/storage/firstaid/regular,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/ice_lab)
-"eGF" = (
-/obj/structure/barricade/wooden{
- dir = 4
- },
-/obj/item/tool/crowbar/red,
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/prison/cell_stripe/east,
-/area/fiorina/station/medbay)
"eGO" = (
/obj/item/storage/toolbox/electrical,
/obj/structure/surface/rack,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"eGT" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/darkbrown2,
-/area/fiorina/station/park)
"eHk" = (
/obj/structure/machinery/door/morgue{
dir = 2;
@@ -6050,6 +6249,16 @@
},
/turf/open/floor/prison,
/area/fiorina/station/central_ring)
+"eHx" = (
+/obj/item/ammo_casing{
+ icon_state = "casing_1"
+ },
+/obj/structure/bed/chair/office/light{
+ dir = 8
+ },
+/obj/effect/spawner/random/gun/rifle/midchance,
+/turf/open/floor/wood,
+/area/fiorina/station/disco/east_disco)
"eHC" = (
/turf/closed/shuttle/ert{
icon_state = "wy25"
@@ -6067,6 +6276,18 @@
/obj/item/trash/popcorn,
/turf/open/floor/prison/blue/west,
/area/fiorina/station/power_ring)
+"eHX" = (
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/lowsec/east)
+"eId" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space,
+/area/fiorina/oob)
+"eIl" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/darkbrown2,
+/area/fiorina/station/park)
"eIx" = (
/obj/structure/window/reinforced{
dir = 8
@@ -6103,18 +6324,10 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"eJy" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/lowsec/showers_laundry)
"eJK" = (
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
-"eKa" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/cell_stripe/east,
-/area/fiorina/station/security)
"eLu" = (
/turf/closed/wall/prison,
/area/fiorina/maintenance)
@@ -6124,12 +6337,6 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"eLy" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
"eLB" = (
/obj/structure/machinery/landinglight/ds1/delaytwo{
dir = 1
@@ -6140,16 +6347,6 @@
/obj/item/weapon/gun/energy/taser,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"eLU" = (
-/obj/item/tool/mop{
- pixel_y = 23
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"eME" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper,
@@ -6168,14 +6365,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/central_ring)
-"eMN" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"eMU" = (
/turf/closed/shuttle/ert{
icon_state = "rightengine_1";
@@ -6193,11 +6382,6 @@
},
/turf/open/floor/prison/darkbrown2/west,
/area/fiorina/station/park)
-"eNr" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/surgical_tray/empty,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"eNv" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/darkyellowfull2/east,
@@ -6218,13 +6402,6 @@
/obj/item/reagent_container/food/snacks/eat_bar,
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/station/medbay)
-"eOQ" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/reagent_dispensers/fueltank/oxygentank{
- layer = 2.6
- },
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"ePq" = (
/obj/item/trash/cigbutt/ucigbutt,
/obj/item/trash/cigbutt/ucigbutt{
@@ -6253,10 +6430,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"eQb" = (
-/obj/item/clothing/gloves/boxing/green,
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
"eQk" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -6265,12 +6438,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
-"eQs" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname{
- dir = 1
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
+"eQy" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/floor/almayer_hull,
+/area/fiorina/oob)
"eQz" = (
/obj/structure/machinery/gibber,
/obj/effect/decal/cleanable/blood{
@@ -6296,6 +6467,18 @@
/obj/item/toy/bikehorn,
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/station/park)
+"eRy" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/barricade/handrail/type_b{
+ dir = 4;
+ layer = 3.5
+ },
+/obj/structure/morgue{
+ dir = 8;
+ layer = 2.6
+ },
+/turf/open/floor/corsat/squares,
+/area/fiorina/station/medbay)
"eRz" = (
/obj/structure/machinery/vending/snack/packaged,
/turf/open/floor/plating/prison,
@@ -6312,6 +6495,16 @@
/obj/item/stack/rods,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"eSb" = (
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/structure/surface/rack,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"eSn" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/prison/greenblue/southeast,
@@ -6328,19 +6521,15 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
-"eSI" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"eSO" = (
/obj/structure/largecrate/random/case/double,
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"eTa" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/east)
+"eSX" = (
+/obj/structure/machinery/portable_atmospherics/canister/nitrogen,
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/showers_laundry)
"eTb" = (
/turf/closed/shuttle/ert{
icon_state = "rightengine_1";
@@ -6358,10 +6547,28 @@
/obj/item/frame/rack,
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
+"eUd" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/reagent_dispensers/water_cooler{
+ pixel_y = 11
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
+"eUe" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/item/stool,
+/obj/item/clothing/shoes/slippers_worn,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/civres_blue)
"eUi" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/prison,
/area/fiorina/station/telecomm/lz1_cargo)
+"eUl" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/floor/almayer_hull,
+/area/fiorina/station/medbay)
"eUo" = (
/obj/structure/largecrate/random,
/turf/open/floor/prison,
@@ -6400,9 +6607,6 @@
/obj/structure/machinery/computer/arcade,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"eVD" = (
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/lowsec/east)
"eVK" = (
/obj/structure/prop/structure_lattice{
dir = 4;
@@ -6425,6 +6629,10 @@
"eVO" = (
/turf/closed/shuttle/ert,
/area/fiorina/tumor/ship)
+"eVT" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"eWf" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/central_ring)
@@ -6472,6 +6680,11 @@
/obj/item/tool/wet_sign,
/turf/open/floor/prison,
/area/fiorina/station/disco)
+"eXO" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"eXP" = (
/obj/structure/machinery/door/poddoor/almayer{
density = 0;
@@ -6479,6 +6692,12 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/botany)
+"eYa" = (
+/obj/structure/barricade/deployable{
+ dir = 1
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"eYr" = (
/obj/structure/inflatable,
/obj/structure/barricade/handrail/type_b,
@@ -6518,10 +6737,6 @@
},
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/security/wardens)
-"eYW" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
"eZi" = (
/obj/structure/machinery/power/apc/power/west,
/turf/open/floor/prison,
@@ -6531,10 +6746,6 @@
/obj/structure/machinery/landinglight/ds2/delayone,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"eZK" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
"eZQ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/box/handcuffs{
@@ -6555,17 +6766,6 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"eZW" = (
-/obj/item/stack/rods/plasteel,
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
-"faw" = (
-/obj/structure/barricade/metal{
- health = 250;
- icon_state = "metal_1"
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"faD" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_ew_full_cap"
@@ -6576,9 +6776,6 @@
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"fbn" = (
-/turf/closed/wall/prison,
-/area/fiorina/station/power_ring/reactor)
"fbo" = (
/obj/structure/barricade/plasteel,
/obj/structure/barricade/metal{
@@ -6609,20 +6806,30 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
+"fck" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"fcA" = (
/obj/effect/landmark/yautja_teleport,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"fcB" = (
-/obj/structure/barricade/deployable{
+"fcJ" = (
+/obj/item/ammo_casing{
+ icon_state = "casing_6"
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
+"fcR" = (
+/obj/structure/bed/chair{
dir = 1
},
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
-"fcH" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/chapel_carpet/doubleside,
-/area/fiorina/station/chapel)
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"fdf" = (
/obj/structure/closet,
/obj/item/stack/cable_coil,
@@ -6630,12 +6837,33 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"fdg" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
+"fdl" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/disco/east_disco)
+"fdn" = (
+/obj/structure/machinery/constructable_frame,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"fdu" = (
/obj/structure/machinery/light/double/blue{
pixel_y = -1
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/lz/near_lzI)
+"fdB" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/stool{
+ pixel_y = 12
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"fdC" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
@@ -6645,10 +6873,12 @@
},
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
-"ffx" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/east)
+"fdK" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"ffA" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/greenfull/northwest,
@@ -6657,18 +6887,10 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/prison,
/area/fiorina/station/power_ring)
-"fgq" = (
-/obj/effect/landmark/corpsespawner/engineer,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"fgN" = (
/obj/item/device/flashlight/flare,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzI)
-"fgT" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/tumor/ice_lab)
"fgU" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating/prison,
@@ -6681,21 +6903,26 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"fhq" = (
+/obj/structure/monorail{
+ name = "launch track"
+ },
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/telecomm/lz1_tram)
"fhB" = (
/obj/structure/surface/rack,
/obj/item/storage/toolbox/emergency,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"fhS" = (
-/obj/structure/platform/metal/almayer,
-/obj/item/fuel_cell,
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
+"fhJ" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/fancy/cigarettes/arcturian_ace{
+ pixel_x = -4;
+ pixel_y = 9
},
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"fic" = (
/obj/structure/bed/sofa/south/grey/right,
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/souto{
@@ -6709,14 +6936,6 @@
"fiq" = (
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"fis" = (
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "Straight"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"fiw" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/prison/bluefull,
@@ -6733,12 +6952,6 @@
"fjd" = (
/turf/closed/wall/prison,
/area/fiorina/lz/near_lzI)
-"fjg" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"fjo" = (
/obj/item/ammo_casing{
icon_state = "casing_5_1"
@@ -6770,6 +6983,13 @@
dir = 9
},
/area/fiorina/tumor/aux_engi)
+"fko" = (
+/obj/structure/machinery/washing_machine,
+/obj/structure/machinery/washing_machine{
+ pixel_y = 15
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"fkG" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/cameras{
@@ -6777,9 +6997,16 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"flG" = (
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
+"fli" = (
+/obj/vehicle/powerloader{
+ dir = 8
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
+"flo" = (
+/obj/item/paper/prison_station/inmate_handbook,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"fmb" = (
/obj/item/storage/firstaid/toxin,
/turf/open/floor/prison/floor_plate,
@@ -6790,6 +7017,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"fml" = (
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"fmE" = (
/obj/effect/landmark/objective_landmark/medium,
/obj/structure/closet/secure_closet/engineering_personal,
@@ -6799,13 +7030,6 @@
/obj/item/device/cassette_tape/ocean,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"fna" = (
-/obj/structure/toilet{
- dir = 4;
- pixel_y = 8
- },
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/east)
"fnn" = (
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/plating/prison,
@@ -6815,6 +7039,18 @@
dir = 4
},
/area/fiorina/station/telecomm/lz1_cargo)
+"fnH" = (
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/showers_laundry)
+"fnM" = (
+/obj/item/stool,
+/obj/item/reagent_container/food/drinks/bottle/bluecuracao{
+ pixel_x = 15;
+ pixel_y = 25
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
"fnY" = (
/obj/structure/machinery/vending/cola,
/turf/open/floor/prison/floor_plate,
@@ -6830,12 +7066,11 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"foR" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
+"foE" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space,
+/area/fiorina/oob)
"fpn" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/tumor/aux_engi)
@@ -6864,6 +7099,11 @@
},
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
+"fpX" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/window/reinforced/tinted,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"fqg" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/station/central_ring)
@@ -6883,10 +7123,6 @@
/obj/effect/landmark/ert_spawns/groundside_xeno,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"fqI" = (
-/obj/structure/machinery/space_heater,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"frc" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/blue/west,
@@ -6895,22 +7131,33 @@
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
+"fry" = (
+/obj/structure/machinery/recharge_station,
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/east)
"frM" = (
/obj/effect/spawner/random/toolbox,
/obj/structure/surface/rack,
/obj/item/device/flashlight,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/transit_hub)
+"frQ" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"frR" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecalbottom"
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"fse" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/bluecorner/west,
-/area/fiorina/station/power_ring)
+"fsj" = (
+/turf/closed/wall/prison,
+/area/fiorina/station/research_cells/west)
"fsk" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/plating/prison,
@@ -6923,6 +7170,14 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
+"fty" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/central_ring)
"ftS" = (
/obj/item/stack/rods,
/turf/open/floor/prison/whitegreen,
@@ -6964,16 +7219,18 @@
/obj/item/clipboard,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"fvn" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
+"fuY" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
},
-/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer/west,
/turf/open/floor/prison,
-/area/fiorina/station/medbay)
-"fvx" = (
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/east)
+/area/fiorina/station/disco)
+"fvb" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/prison/bluecorner,
+/area/fiorina/station/power_ring/reactor)
"fvH" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/oob)
@@ -7006,6 +7263,14 @@
/obj/item/poster,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"fwS" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/park)
"fwY" = (
/obj/structure/barricade/metal/wired{
health = 250;
@@ -7028,18 +7293,17 @@
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/almayer/plate,
/area/fiorina/tumor/ship)
+"fxF" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/obj/structure/closet/emcloset,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"fxL" = (
/obj/structure/filingcabinet,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"fxS" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/clothing/mask/surgical,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"fyi" = (
-/turf/open/floor/wood,
-/area/fiorina/station/research_cells/west)
"fyt" = (
/obj/structure/flora/bush/ausbushes/grassybush{
icon_state = "ywflowers_3"
@@ -7056,10 +7320,30 @@
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
/area/fiorina/station/park)
+"fyX" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"fzp" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/greenblue,
/area/fiorina/station/botany)
+"fzv" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space/basic,
+/area/fiorina/oob)
"fzC" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/gun/shotgun/highchance,
@@ -7115,6 +7399,13 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"fAW" = (
+/obj/structure/powerloader_wreckage,
+/obj/effect/decal/cleanable/blood/gibs/robot/limb,
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"fAZ" = (
/obj/structure/surface/rack,
/obj/item/reagent_container/food/drinks/bottle/holywater{
@@ -7127,16 +7418,10 @@
/obj/structure/closet/secure_closet/engineering_materials,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"fBA" = (
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/showers_laundry)
"fBD" = (
/obj/structure/largecrate/random/case/small,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"fBK" = (
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"fCf" = (
/obj/structure/bed/roller,
/obj/structure/machinery/iv_drip{
@@ -7201,6 +7486,14 @@
/obj/structure/machinery/computer/arcade,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
+"fDv" = (
+/obj/effect/decal/cleanable/blood/oil,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecaldir"
+ },
+/obj/effect/landmark/corpsespawner/doctor,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"fDE" = (
/turf/open/floor/prison/damaged1/southwest,
/area/fiorina/station/central_ring)
@@ -7215,46 +7508,30 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"fDW" = (
-/obj/structure/machinery/power/reactor/colony,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
+"fEa" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"fEn" = (
/turf/open/floor/prison,
/area/fiorina/tumor/ice_lab)
-"fEt" = (
-/obj/structure/platform_decoration/metal/almayer,
-/obj/item/reagent_container/food/drinks/sillycup,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/flight_deck)
-"fEv" = (
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/structure/surface/rack,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"fEH" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/station_alert,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"fEY" = (
-/obj/structure/machinery/power/apc/power/south,
-/turf/open/floor/delivery,
-/area/fiorina/station/power_ring/reactor)
-"fFv" = (
-/obj/structure/barricade/sandbags{
- icon_state = "sandbag_0";
- layer = 2.97;
- pixel_y = -14
- },
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/disco/east_disco)
+"fFe" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"fFw" = (
/obj/structure/largecrate/random,
/turf/open/floor/prison/floor_marked/southwest,
@@ -7263,6 +7540,14 @@
/obj/item/tool/screwdriver,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"fFI" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"fGA" = (
/obj/item/explosive/grenade/high_explosive/frag,
/turf/open/floor/prison,
@@ -7283,14 +7568,14 @@
"fHo" = (
/turf/open/floor/prison/yellow,
/area/fiorina/station/lowsec)
-"fHK" = (
-/obj/structure/ice/thin/indestructible{
- dir = 8;
- icon_state = "Corner"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
+"fHv" = (
+/obj/structure/window/framed/prison,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
+"fHN" = (
+/obj/structure/platform_decoration/metal/kutjevo/north,
+/turf/open/space/basic,
+/area/fiorina/oob)
"fIn" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/redfull,
@@ -7304,12 +7589,10 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"fII" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/gm/river/desert/deep,
-/area/fiorina/lz/near_lzII)
+"fIy" = (
+/obj/effect/landmark/monkey_spawn,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"fIL" = (
/obj/item/clothing/accessory/armband/cargo{
desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured.";
@@ -7333,6 +7616,12 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
+"fJC" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"fJV" = (
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/prison/yellow,
@@ -7351,49 +7640,27 @@
/obj/item/device/flashlight/flare,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/telecomm/lz1_cargo)
-"fKE" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
-"fKO" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/effect/landmark/corpsespawner/prisoner,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/lowsec)
"fKP" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_21"
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"fKX" = (
-/obj/item/storage/backpack{
- pixel_x = -11;
- pixel_y = 15
+"fLj" = (
+/obj/item/stool{
+ pixel_x = -4;
+ pixel_y = 10
+ },
+/obj/structure/sign/poster{
+ icon_state = "poster1";
+ pixel_y = 32
},
-/obj/item/trash/syndi_cakes,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"fLb" = (
-/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/east)
+/area/fiorina/station/lowsec/showers_laundry)
"fLu" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"fLH" = (
-/obj/structure/barricade/wooden{
- dir = 4
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"fLS" = (
/obj/structure/bed/chair,
/turf/open/floor/wood,
@@ -7414,6 +7681,10 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"fMT" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/flight_deck)
"fNA" = (
/obj/structure/stairs/perspective{
dir = 1;
@@ -7421,21 +7692,27 @@
},
/turf/open/floor/prison,
/area/fiorina/station/central_ring)
+"fNM" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/effect/landmark/corpsespawner/prisoner,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec)
"fNN" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"fOe" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/device/flashlight/lamp,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/disco/east_disco)
"fOg" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 8
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"fOh" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/flight_deck)
"fOi" = (
/obj/structure/bed/chair{
dir = 8;
@@ -7447,6 +7724,9 @@
},
/turf/open/floor/prison,
/area/fiorina/station/central_ring)
+"fOl" = (
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"fOC" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/darkyellow2/west,
@@ -7462,9 +7742,26 @@
/obj/structure/machinery/power/apc/power/north,
/turf/open/floor/prison/yellow/north,
/area/fiorina/station/lowsec)
+"fPo" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/effect/decal/cleanable/blood/oil,
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"fPB" = (
/turf/open/space,
/area/fiorina/station/medbay)
+"fPW" = (
+/obj/item/clothing/under/stowaway,
+/obj/structure/machinery/shower{
+ pixel_y = 13
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"fQa" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/cell_stripe/west,
@@ -7488,14 +7785,6 @@
/obj/structure/machinery/portable_atmospherics/powered/pump,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"fRc" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 8
- },
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/east)
"fRo" = (
/obj/structure/bed/chair,
/turf/open/floor/plating/prison,
@@ -7503,10 +7792,25 @@
"fRq" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/station/security)
+"fRt" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 8
+ },
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/east)
+"fRT" = (
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec/showers_laundry)
"fSa" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"fSi" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"fSp" = (
/obj/effect/decal/cleanable/blood{
dir = 4;
@@ -7517,13 +7821,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzI)
-"fSq" = (
-/obj/structure/machinery/door/airlock/almayer/marine{
- dir = 1;
- icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"fSz" = (
/turf/closed/shuttle/ert{
icon_state = "stan25"
@@ -7546,6 +7843,9 @@
},
/turf/open/floor/almayer,
/area/fiorina/tumor/ship)
+"fTc" = (
+/turf/open/floor/prison/yellowcorner,
+/area/fiorina/station/lowsec/east)
"fTd" = (
/turf/open/floor/prison/green/southwest,
/area/fiorina/tumor/aux_engi)
@@ -7560,6 +7860,14 @@
/obj/item/clothing/suit/suspenders,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"fTE" = (
+/obj/item/clothing/under/color/orange,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
+"fUb" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"fUd" = (
/obj/structure/barricade/plasteel{
dir = 4
@@ -7636,15 +7944,18 @@
},
/turf/open/space,
/area/fiorina/oob)
-"fWV" = (
-/turf/open/floor/prison/damaged1/southwest,
-/area/fiorina/station/disco/east_disco)
-"fXo" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
+"fWZ" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
},
-/turf/open/floor/prison/floor_plate/southwest,
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
/area/fiorina/station/disco/east_disco)
+"fXj" = (
+/obj/structure/barricade/handrail,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/east)
"fXB" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/security)
@@ -7666,17 +7977,6 @@
},
/turf/closed/wall/mineral/bone_resin,
/area/fiorina/tumor/servers)
-"fXV" = (
-/obj/structure/powerloader_wreckage,
-/obj/effect/decal/cleanable/blood/gibs/robot/limb,
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
-"fXW" = (
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor/prison/bluecorner/west,
-/area/fiorina/station/power_ring/reactor)
"fYa" = (
/obj/structure/inflatable,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -7685,6 +7985,19 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
+"fYg" = (
+/obj/structure/barricade/sandbags{
+ dir = 8;
+ icon_state = "sandbag_0";
+ pixel_y = 2
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"fYo" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -7693,24 +8006,15 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
+"fYI" = (
+/obj/structure/bed/roller,
+/obj/effect/decal/cleanable/blood/gibs/core,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"fYW" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/carpet,
/area/fiorina/station/security/wardens)
-"fYY" = (
-/obj/item/ammo_casing{
- icon_state = "casing_6"
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"fZc" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/fancy/cigarettes/arcturian_ace{
- pixel_x = -4;
- pixel_y = 9
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"fZd" = (
/obj/structure/machinery/landinglight/ds2/delayone{
dir = 1
@@ -7761,20 +8065,21 @@
"gbf" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"gbg" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/open/space,
-/area/fiorina/oob)
"gbh" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"gbk" = (
-/obj/item/trash/burger,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+"gbm" = (
+/obj/structure/sign/prop3{
+ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
+ },
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/research_cells/west)
+"gbs" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/open/space,
+/area/fiorina/oob)
"gbv" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -7795,6 +8100,11 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/disco)
+"gbS" = (
+/obj/structure/surface/rack,
+/obj/item/restraint/handcuffs/zip,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/lowsec/east)
"gbT" = (
/obj/structure/machinery/vending/cola,
/turf/open/floor/prison,
@@ -7814,18 +8124,18 @@
/obj/structure/kitchenspike,
/turf/open/floor/prison/kitchen,
/area/fiorina/station/power_ring)
+"gdH" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring)
+"gdN" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreen/west,
+/area/fiorina/tumor/ice_lab)
"gdQ" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/blue/north,
/area/fiorina/station/chapel)
-"gdS" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"gec" = (
/obj/structure/prop/structure_lattice{
dir = 8;
@@ -7835,12 +8145,6 @@
},
/turf/open/floor/corsat/squares,
/area/fiorina/station/civres_blue)
-"ger" = (
-/obj/item/ammo_magazine/rifle/m16{
- current_rounds = 0
- },
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/showers_laundry)
"geF" = (
/obj/structure/lattice,
/turf/open/floor/almayer_hull,
@@ -7876,6 +8180,9 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"gfP" = (
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"ggd" = (
/turf/closed/shuttle/ert{
icon_state = "leftengine_1"
@@ -7899,14 +8206,14 @@
/obj/item/clothing/glasses/sunglasses/sechud,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"ghe" = (
+"ghr" = (
/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
},
-/obj/structure/platform/metal/stair_cut/platform_left,
+/obj/structure/platform_decoration/metal/almayer/west,
/turf/open/floor/plating/prison,
-/area/fiorina/station/flight_deck)
+/area/fiorina/tumor/ice_lab)
"ghw" = (
/obj/structure/bed/chair/dropship/pilot,
/obj/effect/landmark/objective_landmark/close,
@@ -7933,14 +8240,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"gjm" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/open/space,
-/area/fiorina/oob)
-"gjr" = (
-/obj/effect/landmark/static_comms/net_one,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
+"gjc" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
"gjs" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -7956,6 +8259,10 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/bluecorner,
/area/fiorina/station/chapel)
+"gkr" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/park)
"gkC" = (
/obj/structure/machinery/vending/cola,
/obj/structure/prop/souto_land/streamer{
@@ -7968,20 +8275,14 @@
/obj/item/explosive/grenade/high_explosive/frag,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"glj" = (
-/obj/structure/window/framed/prison,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
-"glD" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"glG" = (
/obj/structure/window/framed/prison/reinforced,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"glZ" = (
+/obj/structure/grille,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"gmg" = (
/obj/structure/bed/chair/comfy,
/turf/open/floor/prison/darkyellow2,
@@ -8005,10 +8306,6 @@
/obj/structure/bed/sofa/vert/grey/top,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"gmG" = (
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"gmN" = (
/obj/structure/closet/secure_closet/engineering_materials,
/obj/effect/spawner/random/gun/smg,
@@ -8019,6 +8316,15 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
+"gnm" = (
+/obj/item/tool/warning_cone,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
+"gno" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"gnG" = (
/obj/effect/decal/medical_decals{
icon_state = "docstripingdir"
@@ -8037,19 +8343,9 @@
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"gnY" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/storage/bible/hefa,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
"goo" = (
/turf/open/floor/prison/yellow/west,
/area/fiorina/lz/near_lzII)
-"gos" = (
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/east)
"goG" = (
/obj/structure/window/framed/prison/reinforced,
/turf/open/floor/plating/prison,
@@ -8058,6 +8354,10 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_cargo)
+"gpx" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"gpA" = (
/obj/item/trash/pistachios,
/turf/open/floor/prison/whitegreen,
@@ -8066,6 +8366,13 @@
/obj/structure/window_frame/prison,
/turf/open/floor/plating/prison,
/area/fiorina/station/security)
+"gpW" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"gpY" = (
/obj/item/explosive/grenade/high_explosive/m15{
pixel_x = -9;
@@ -8077,34 +8384,23 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/tumor/servers)
-"gqo" = (
-/obj/structure/machinery/power/apc/power/north,
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
-"gqC" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/item/prop/almayer/flight_recorder,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"gqU" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper/janitor,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
+"gqV" = (
+/obj/structure/toilet{
+ dir = 4;
+ pixel_y = 8
+ },
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/east)
"grg" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"grn" = (
-/obj/structure/platform_decoration/metal/kutjevo/west,
-/turf/open/space,
-/area/fiorina/oob)
-"grz" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"grA" = (
/obj/structure/machinery/landinglight/ds2/delaythree{
dir = 4
@@ -8117,14 +8413,15 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"gsx" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
+"gsv" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
},
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/botany)
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"gsN" = (
/obj/structure/closet,
/obj/effect/spawner/random/gun/shotgun/midchance,
@@ -8155,14 +8452,6 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"gtr" = (
-/obj/structure/bedsheetbin,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
-"gtD" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/tumor/ice_lab)
"gtH" = (
/obj/structure/safe,
/obj/item/storage/beer_pack,
@@ -8196,17 +8485,9 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/lz/near_lzI)
-"gux" = (
-/obj/effect/landmark/corpsespawner/ua_riot,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"guz" = (
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/transit_hub)
-"guH" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
"guU" = (
/obj/structure/prop/structure_lattice{
dir = 4
@@ -8218,6 +8499,12 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/civres)
+"gvb" = (
+/obj/structure/holohoop{
+ pixel_y = 25
+ },
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/east)
"gve" = (
/obj/structure/filingcabinet,
/obj/effect/landmark/objective_landmark/medium,
@@ -8228,14 +8515,6 @@
/obj/item/storage/pill_bottle/inaprovaline/skillless,
/turf/open/floor/prison/blue_plate/north,
/area/fiorina/station/botany)
-"gvs" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
-"gvy" = (
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco/east_disco)
"gvZ" = (
/obj/item/stack/sheet/wood{
pixel_x = 1;
@@ -8252,14 +8531,6 @@
"gws" = (
/turf/open/floor/plating,
/area/fiorina/oob)
-"gwt" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecaldir"
- },
-/obj/effect/landmark/corpsespawner/doctor,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"gwH" = (
/turf/closed/wall/strata_ice/jungle{
desc = "It is made of Fiberbush(tm). It contains asbestos.";
@@ -8295,6 +8566,10 @@
/obj/item/stack/tile/plasteel,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/tumor/civres)
+"gxS" = (
+/obj/structure/window/framed/prison/reinforced/hull,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
"gyh" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecaldir"
@@ -8306,6 +8581,11 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"gyr" = (
+/obj/structure/closet/bodybag,
+/obj/effect/decal/cleanable/blood/gibs/down,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"gyt" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/darkbrown2/north,
@@ -8320,6 +8600,12 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
+"gyF" = (
+/obj/structure/barricade/handrail{
+ dir = 4
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"gyJ" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -8348,15 +8634,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"gzu" = (
-/obj/item/clothing/mask/cigarette/bcigarette,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
-"gzN" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/toy/handcard/aceofspades,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"gAh" = (
/obj/structure/prop/structure_lattice{
dir = 4
@@ -8372,14 +8649,6 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison,
/area/fiorina/station/park)
-"gAs" = (
-/obj/structure/platform/metal/almayer,
-/obj/item/ammo_casing{
- dir = 2;
- icon_state = "casing_5"
- },
-/turf/open/gm/river/red_pool,
-/area/fiorina/station/park)
"gAA" = (
/obj/item/stack/sheet/metal/medium_stack,
/turf/open/floor/plating/prison,
@@ -8388,9 +8657,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"gAD" = (
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/east)
"gAQ" = (
/obj/structure/machinery/landinglight/ds2/delaytwo{
dir = 8
@@ -8401,10 +8667,6 @@
/obj/structure/machinery/landinglight/ds2/delaythree,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
-"gBw" = (
-/obj/item/trash/chunk,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"gBx" = (
/obj/structure/prop/structure_lattice{
dir = 4
@@ -8458,10 +8720,6 @@
/obj/item/paper,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"gCK" = (
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"gDx" = (
/obj/structure/surface/table/woodentable,
/obj/item/newspaper{
@@ -8477,6 +8735,17 @@
/obj/structure/bed/chair/office/dark,
/turf/open/floor/prison,
/area/fiorina/tumor/ice_lab)
+"gDY" = (
+/obj/item/stack/cable_coil/pink,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
+"gEg" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/item/storage/fancy/cigar/tarbacks,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"gEq" = (
/turf/open/floor/prison/platingdmg1,
/area/fiorina/oob)
@@ -8492,10 +8761,10 @@
/obj/structure/inflatable/door,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"gFN" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/east)
+"gFF" = (
+/obj/effect/decal/cleanable/blood/gibs/robot/up,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"gFW" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/green/southeast,
@@ -8506,23 +8775,19 @@
},
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/station/telecomm/lz1_cargo)
-"gGn" = (
-/turf/closed/wall/r_wall/prison_unmeltable{
- desc = "A huge chunk of metal used to seperate rooms.";
- name = "metal wall"
- },
-/area/fiorina/station/research_cells/east)
"gGx" = (
/obj/effect/landmark/queen_spawn,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"gHh" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+"gGN" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
+"gHc" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"gHn" = (
/obj/structure/filingcabinet{
pixel_x = 8;
@@ -8557,14 +8822,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
-"gIa" = (
-/obj/item/stool,
-/obj/item/reagent_container/food/drinks/bottle/bluecuracao{
- pixel_x = 15;
- pixel_y = 25
- },
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/east)
"gIo" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/box/cups{
@@ -8589,16 +8846,16 @@
/obj/effect/alien/weeds/node,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"gJv" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
-"gJM" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/east)
+"gJy" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec/east)
+"gJP" = (
+/obj/structure/barricade/handrail,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"gKg" = (
/obj/effect/landmark/survivor_spawner,
/turf/open/floor/prison/floor_plate,
@@ -8607,6 +8864,13 @@
/obj/structure/window/framed/prison,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
+"gKk" = (
+/obj/structure/barricade/metal{
+ health = 250;
+ icon_state = "metal_1"
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"gKl" = (
/obj/structure/janitorialcart,
/obj/structure/machinery/light/double/blue{
@@ -8626,9 +8890,6 @@
/obj/item/stool,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"gLq" = (
-/turf/closed/wall/prison,
-/area/fiorina/station/disco/east_disco)
"gLu" = (
/turf/closed/shuttle/ert{
icon_state = "stan_leftengine"
@@ -8641,10 +8902,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"gLC" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/gm/river/pool,
-/area/fiorina/station/park)
"gLK" = (
/obj/structure/tunnel/maint_tunnel,
/turf/open/floor/prison/greenblue/southwest,
@@ -8653,10 +8910,34 @@
/obj/item/clothing/head/welding,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/civres)
-"gMl" = (
-/obj/structure/platform/metal/almayer/north,
+"gMa" = (
+/obj/structure/lattice,
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/open/space,
+/area/fiorina/oob)
+"gMD" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
+"gMH" = (
+/turf/closed/wall/prison,
+/area/fiorina/station/research_cells/east)
+"gNu" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/card/id/gold{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
+"gND" = (
+/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+/area/fiorina/station/power_ring/reactor)
"gNJ" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -8683,6 +8964,13 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"gOC" = (
+/obj/structure/stairs/perspective{
+ dir = 5;
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/research_cells/west)
"gOJ" = (
/obj/structure/closet/secure_closet/medical2{
req_access_txt = "100"
@@ -8691,10 +8979,18 @@
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/corsat/squares,
/area/fiorina/station/medbay)
-"gOU" = (
-/obj/item/bodybag,
-/turf/open/floor/prison/yellow/west,
-/area/fiorina/station/lowsec/showers_laundry)
+"gOM" = (
+/obj/item/shard{
+ icon_state = "large";
+ name = "ice shard"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreen/west,
+/area/fiorina/tumor/ice_lab)
+"gOQ" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/blue/west,
+/area/fiorina/station/power_ring)
"gPk" = (
/obj/structure/barricade/metal/wired{
dir = 4
@@ -8714,6 +9010,12 @@
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
+"gPD" = (
+/obj/structure/barricade/wooden{
+ dir = 8
+ },
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"gPS" = (
/obj/item/stack/rods,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
@@ -8724,10 +9026,6 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"gQc" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"gQz" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -8756,9 +9054,28 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/flight_deck)
-"gRA" = (
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
+"gRl" = (
+/obj/structure/holohoop{
+ dir = 4;
+ id = "basketball";
+ side = "left"
+ },
+/obj/structure/barricade/handrail{
+ dir = 8
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
+"gRs" = (
+/obj/structure/bed/chair{
+ dir = 1;
+ layer = 2.7
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
+"gRR" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
"gRT" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/structure/sign/poster{
@@ -8777,6 +9094,10 @@
/obj/structure/bed/chair/comfy,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"gRY" = (
+/obj/structure/inflatable/door,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"gSf" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/explosive/grenade/incendiary/molotov,
@@ -8803,23 +9124,41 @@
},
/turf/open/floor/prison/chapel_carpet,
/area/fiorina/station/chapel)
-"gTc" = (
-/obj/item/storage/belt/shotgun/full/quackers,
-/obj/effect/spawner/gibspawner/human,
-/turf/open/gm/river/darkred_pool,
-/area/fiorina/station/park)
+"gST" = (
+/obj/structure/machinery/washing_machine,
+/obj/structure/machinery/washing_machine{
+ pixel_y = 15
+ },
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
+"gTe" = (
+/obj/structure/closet/wardrobe/orange,
+/obj/item/clothing/under/color/orange,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"gTi" = (
/turf/open/floor/prison/blue,
/area/fiorina/station/chapel)
+"gTs" = (
+/obj/item/trash/popcorn,
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
"gTy" = (
/obj/item/stack/sheet/metal/medium_stack,
/obj/structure/surface/rack,
/turf/open/floor/prison/darkyellow2/northeast,
/area/fiorina/lz/near_lzI)
-"gTI" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
+"gTB" = (
+/obj/structure/platform_decoration/metal/kutjevo/west,
+/turf/open/space/basic,
+/area/fiorina/oob)
+"gTG" = (
+/obj/structure/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"gTN" = (
/turf/open/floor/prison/darkpurple2/northeast,
/area/fiorina/tumor/ice_lab)
@@ -8828,23 +9167,21 @@
icon_state = "stan3"
},
/area/fiorina/tumor/ship)
+"gUl" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/showers_laundry)
"gUu" = (
/obj/structure/largecrate/random/barrel,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"gVc" = (
-/obj/structure/barricade/sandbags{
- dir = 8;
- icon_state = "sandbag_0";
- pixel_y = 2
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
+"gUT" = (
+/obj/item/ammo_magazine/smg/mp5,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 29
},
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"gVs" = (
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/plating/prison,
@@ -8860,29 +9197,32 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
+"gVK" = (
+/turf/open/floor/prison,
+/area/fiorina/station/research_cells/east)
"gVT" = (
/obj/effect/decal/cleanable/blood/xeno{
icon_state = "xgib3"
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
-"gWq" = (
-/obj/item/ammo_casing{
- icon_state = "casing_1"
- },
-/obj/structure/bed/chair/office/light{
- dir = 8
- },
-/obj/effect/spawner/random/gun/rifle/midchance,
-/turf/open/floor/wood,
-/area/fiorina/station/disco/east_disco)
-"gWA" = (
-/turf/open/floor/prison/bluecorner/east,
-/area/fiorina/station/power_ring/reactor)
-"gXa" = (
-/obj/structure/platform/metal/almayer,
+"gVV" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
+"gWv" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
+"gWD" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/effect/decal/medical_decals{
+ icon_state = "cryomid"
+ },
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"gXd" = (
/obj/structure/prop/almayer/computers/mission_planning_system{
density = 0;
@@ -8900,14 +9240,6 @@
"gXF" = (
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/tumor/servers)
-"gXI" = (
-/obj/item/book/manual/atmospipes,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
-"gYD" = (
-/obj/item/tool/wrench,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"gYH" = (
/obj/structure/closet/secure_closet/security_empty,
/obj/structure/window/reinforced{
@@ -8958,6 +9290,10 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/darkbrowncorners2,
/area/fiorina/station/park)
+"gZU" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"hae" = (
/turf/open/floor/prison/whitegreen/west,
/area/fiorina/tumor/ice_lab)
@@ -8969,6 +9305,10 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"hax" = (
+/obj/item/explosive/grenade/incendiary/molotov,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"hay" = (
/turf/closed/shuttle/ert{
icon_state = "wy_leftengine"
@@ -8978,10 +9318,11 @@
/obj/item/disk,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"haQ" = (
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
+"hbh" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/clipboard,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"hbn" = (
/obj/structure/bed/chair{
dir = 8
@@ -9022,10 +9363,23 @@
/obj/item/tool/screwdriver,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"hbx" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"hbH" = (
/obj/item/stack/sandbags_empty/half,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
+"hbO" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"hcs" = (
/obj/item/stack/sheet/metal{
amount = 5
@@ -9050,6 +9404,14 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
+"hcC" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"hds" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2-8"
@@ -9063,9 +9425,20 @@
},
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
+"hdC" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"hdR" = (
/turf/open/floor/prison/yellow/northwest,
/area/fiorina/station/disco)
+"hee" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"hej" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/darkbrown2,
@@ -9103,15 +9476,6 @@
/obj/item/storage/briefcase/inflatable,
/turf/open/floor/plating/prison,
/area/fiorina/station/security/wardens)
-"hfJ" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space,
-/area/fiorina/oob)
"hfT" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/flight_deck)
@@ -9123,20 +9487,35 @@
/obj/item/trash/burger,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/tumor/civres)
+"hgi" = (
+/obj/item/stack/sheet/cardboard,
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
+"hgy" = (
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
+"hgz" = (
+/obj/item/ammo_magazine/rifle/m16{
+ current_rounds = 0
+ },
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
"hgA" = (
/obj/item/ammo_magazine/smg/nailgun,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/maintenance)
+"hgC" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/obj/effect/spawner/random/pills/lowchance,
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/east)
"hgD" = (
/obj/effect/alien/weeds/node,
/turf/open/floor/prison/darkbrowncorners2/east,
/area/fiorina/tumor/aux_engi)
-"hgF" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/gm/river/desert/deep,
-/area/fiorina/lz/near_lzII)
"hgP" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkbrowncorners2/north,
@@ -9171,10 +9550,11 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"hhX" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/prison,
-/area/fiorina/station/lowsec/east)
+"hhZ" = (
+/obj/item/stack/sheet/metal,
+/obj/item/stack/sheet/metal,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"hil" = (
/obj/structure/surface/rack,
/obj/item/tool/plantspray/pests,
@@ -9194,21 +9574,14 @@
/obj/item/stack/rods,
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/station/medbay)
-"hjg" = (
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/lowsec/showers_laundry)
"hjp" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"hjA" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/greenfull/northwest,
-/area/fiorina/station/botany)
-"hjB" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
+"hjD" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"hjE" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/window/reinforced,
@@ -9217,13 +9590,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/security)
-"hjI" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/east)
"hjM" = (
/obj/structure/filingcabinet,
/obj/effect/landmark/objective_landmark/close,
@@ -9233,6 +9599,10 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
+"hjU" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"hjV" = (
/obj/structure/stairs/perspective,
/turf/open/floor/plating/prison,
@@ -9240,6 +9610,10 @@
"hjW" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/lz/near_lzI)
+"hkb" = (
+/obj/structure/barricade/handrail,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/east)
"hkh" = (
/obj/structure/bedsheetbin{
icon_state = "linenbin-empty";
@@ -9254,6 +9628,18 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"hkr" = (
+/obj/structure/bedsheetbin,
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/showers_laundry)
+"hkw" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/central_ring)
"hkA" = (
/turf/open/floor/prison/darkyellow2,
/area/fiorina/station/flight_deck)
@@ -9261,10 +9647,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkyellowcorners2/west,
/area/fiorina/station/telecomm/lz1_cargo)
-"hkH" = (
-/obj/item/stack/sheet/wood,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/east)
"hkM" = (
/obj/effect/decal/cleanable/blood/gibs/xeno/body,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -9278,14 +9660,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"hlx" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/darkpurple2,
-/area/fiorina/tumor/servers)
-"hlB" = (
-/obj/item/tool/kitchen/knife,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"hlT" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -9294,10 +9668,19 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"hmp" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"hmq" = (
/obj/item/device/flashlight,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
+"hmz" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/clothing/mask/surgical,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"hmE" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/whitegreen/east,
@@ -9308,20 +9691,25 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/park)
+"hmX" = (
+/obj/item/tool/soap,
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
+ },
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"hnh" = (
/obj/item/reagent_container/food/drinks/sillycup,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"hnq" = (
-/obj/item/fuel_cell,
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"hnl" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"hnK" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/floor_plate,
@@ -9332,34 +9720,28 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"hoa" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalleft"
- },
-/turf/open/floor/prison/whitegreen/north,
-/area/fiorina/station/medbay)
"hob" = (
/obj/item/phone{
pixel_y = 7
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
+"hoc" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"hoo" = (
/turf/open/floor/prison/bluecorner/east,
/area/fiorina/station/civres_blue)
+"hot" = (
+/turf/open/floor/prison/bluecorner,
+/area/fiorina/station/power_ring/reactor)
"hox" = (
/obj/structure/barricade/handrail{
dir = 4
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/central_ring)
-"hoz" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
"hoC" = (
/obj/item/trash/popcorn,
/turf/open/floor/prison/floor_plate,
@@ -9389,22 +9771,16 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkbrown2,
/area/fiorina/tumor/aux_engi)
-"hpz" = (
-/obj/structure/ice/thin/indestructible{
- dir = 1;
- icon_state = "Corner"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
+"hpr" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/gm/river/desert/deep,
+/area/fiorina/lz/near_lzII)
"hpW" = (
/obj/item/stack/cable_coil/orange,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"hpX" = (
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"hqb" = (
/obj/structure/stairs/perspective{
dir = 8;
@@ -9416,25 +9792,15 @@
/obj/structure/bed/chair/wood/normal,
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"hqD" = (
-/obj/structure/prop/structure_lattice{
- dir = 4
- },
-/turf/open/floor/plating/prison,
+"hqI" = (
+/obj/item/paper,
+/turf/open/floor/prison/whitepurple/west,
/area/fiorina/station/research_cells/west)
"hqO" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/lz/near_lzII)
-"hqX" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/prison/yellowfull,
+"hri" = (
+/turf/open/floor/prison/yellow/north,
/area/fiorina/station/lowsec/east)
"hrl" = (
/obj/structure/bed/sofa/vert/grey,
@@ -9472,16 +9838,6 @@
/obj/item/tool/weldingtool,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"hrL" = (
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
- },
-/obj/structure/machinery/shower{
- dir = 8
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
"hsc" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
@@ -9498,13 +9854,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/darkpurple2,
/area/fiorina/tumor/servers)
-"hsz" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
"hsC" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/door/window/southleft,
@@ -9550,10 +9899,6 @@
/obj/effect/spawner/random/gun/smg,
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
-"htT" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/prison/bluecorner/east,
-/area/fiorina/station/power_ring/reactor)
"htX" = (
/turf/open/floor/prison/green/southwest,
/area/fiorina/station/chapel)
@@ -9563,10 +9908,13 @@
},
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/station/park)
-"hul" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+"huq" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/obj/structure/closet/emcloset,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"huB" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/recharger{
@@ -9578,26 +9926,14 @@
/obj/item/tool/crowbar,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"huG" = (
-/obj/item/tool/wirecutters,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/showers_laundry)
-"huJ" = (
-/obj/structure/prop/almayer/computers/sensor_computer1{
- name = "computer"
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/lowsec/east)
-"huZ" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/obj/structure/barricade/handrail/type_b{
- dir = 1
+"huR" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
},
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
"hva" = (
/obj/structure/bed/chair/office/light{
dir = 4
@@ -9618,6 +9954,9 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/tumor/ice_lab)
+"hvA" = (
+/turf/open/floor/prison/whitepurplecorner/north,
+/area/fiorina/station/research_cells/west)
"hvF" = (
/obj/structure/grille,
/turf/open/floor/plating/prison,
@@ -9634,10 +9973,10 @@
},
/turf/open/floor/prison/blue/west,
/area/fiorina/station/chapel)
-"hwN" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/showers_laundry)
+"hwJ" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"hwS" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -9645,15 +9984,12 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security/wardens)
-"hxp" = (
+"hwV" = (
/obj/structure/platform/metal/almayer/west,
/obj/structure/platform/metal/almayer,
/obj/structure/platform_decoration/metal/almayer/southwest,
-/obj/structure/reagent_dispensers/fueltank{
- layer = 2.6
- },
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/chapel)
"hxq" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
@@ -9666,14 +10002,6 @@
},
/turf/open/space/basic,
/area/fiorina/oob)
-"hxM" = (
-/obj/structure/ice/thin/indestructible{
- dir = 1;
- icon_state = "Straight"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"hyc" = (
/turf/open/floor/prison/darkbrowncorners2,
/area/fiorina/maintenance)
@@ -9695,23 +10023,22 @@
/obj/structure/grille,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
-"hyM" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
-"hyR" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"hyL" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/east)
"hyT" = (
/turf/closed/shuttle/ert{
icon_state = "stan_leftengine"
},
/area/fiorina/tumor/aux_engi)
+"hyU" = (
+/obj/item/stack/rods,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
+"hzf" = (
+/turf/open/floor/prison/yellowcorner/west,
+/area/fiorina/station/lowsec/east)
"hzi" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/processor{
@@ -9727,6 +10054,10 @@
},
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/station/civres_blue)
+"hzt" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/chapel_carpet/doubleside,
+/area/fiorina/station/chapel)
"hzv" = (
/obj/structure/window/framed/prison,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -9750,6 +10081,10 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/prison/darkbrowncorners2,
/area/fiorina/tumor/aux_engi)
+"hAp" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/open/floor/almayer_hull,
+/area/fiorina/oob)
"hAs" = (
/obj/structure/reagent_dispensers/water_cooler{
pixel_x = -9;
@@ -9765,45 +10100,35 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"hAu" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/lockbox/vials{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"hAI" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"hAP" = (
-/obj/item/clothing/under/stowaway,
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
"hAX" = (
/turf/open/floor/prison/darkpurple2/northwest,
/area/fiorina/tumor/ice_lab)
-"hBc" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"hBf" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/tumor/aux_engi)
-"hBF" = (
-/obj/structure/window_frame/prison/reinforced,
-/obj/item/stack/sheet/glass/reinforced{
- pixel_y = 5
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"hBK" = (
+"hBM" = (
/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
+ dir = 4;
+ icon_state = "p_stair_full"
},
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/botany)
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/bright_clean_marked/southwest,
+/area/fiorina/station/power_ring)
"hCc" = (
/obj/item/reagent_container/food/snacks/meat,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -9826,20 +10151,6 @@
/obj/structure/blocker/invisible_wall,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"hCG" = (
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/research_cells/east)
-"hCR" = (
-/obj/item/stack/sheet/wood,
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
-"hCX" = (
-/obj/structure/machinery/door/airlock/prison/horizontal{
- dir = 4
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"hDb" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/effect/landmark/objective_landmark/close,
@@ -9854,9 +10165,6 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"hDF" = (
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/lowsec/showers_laundry)
"hDV" = (
/obj/effect/decal/medical_decals{
icon_state = "docdecal1"
@@ -9872,25 +10180,6 @@
"hEk" = (
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/station/flight_deck)
-"hEs" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/prison,
-/area/fiorina/station/research_cells/west)
-"hEv" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
-"hEW" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
"hEZ" = (
/turf/open/floor/prison/platingdmg3,
/area/fiorina/station/security)
@@ -9906,14 +10195,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"hFW" = (
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
-"hFX" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/chapel_carpet,
-/area/fiorina/station/chapel)
"hGg" = (
/obj/structure/sign/poster{
desc = "You are becoming hysterical.";
@@ -9943,6 +10224,10 @@
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
+"hHb" = (
+/obj/item/poster,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"hHc" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/device/flashlight/lamp/candelabra{
@@ -9954,6 +10239,10 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/station/chapel)
+"hHk" = (
+/obj/item/stool,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"hHq" = (
/obj/structure/closet/cabinet,
/obj/effect/landmark/objective_landmark/close,
@@ -9981,14 +10270,14 @@
},
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_cargo)
-"hHX" = (
-/obj/structure/toilet{
+"hHP" = (
+/obj/structure/machinery/light/double/blue{
dir = 4;
- pixel_y = 8
+ pixel_x = 10;
+ pixel_y = -3
},
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/east)
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"hIO" = (
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/prison/floor_plate,
@@ -9997,37 +10286,28 @@
/obj/structure/machinery/power/apc/power/north,
/turf/open/floor/prison/green/north,
/area/fiorina/station/chapel)
-"hJd" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
-"hJo" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/obj/item/reagent_container/food/drinks/flask/barflask,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
-"hJu" = (
-/obj/structure/bed/chair,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
-"hJV" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/whitegreen/west,
-/area/fiorina/tumor/ice_lab)
+"hKI" = (
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"hKN" = (
/turf/open/floor/prison/sterile_white,
/area/fiorina/station/civres_blue)
+"hLn" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/telecomm/lz1_tram)
"hLz" = (
/turf/closed/wall/prison,
/area/fiorina/lz/near_lzII)
+"hLH" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/greenblue/east,
+/area/fiorina/station/botany)
"hLM" = (
/obj/structure/sign/safety/bulkhead_door,
/turf/closed/wall/r_wall/prison_unmeltable,
@@ -10039,12 +10319,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/chapel)
-"hMj" = (
-/obj/item/ammo_magazine/rifle/m16{
- current_rounds = 0
- },
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"hMA" = (
/obj/item/tool/crowbar,
/turf/open/floor/prison/whitegreen,
@@ -10059,6 +10333,14 @@
},
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/power_ring)
+"hNi" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/medbay)
"hNj" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/box/cups,
@@ -10072,15 +10354,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"hNt" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"hNU" = (
/obj/structure/janitorialcart,
/turf/open/floor/prison,
@@ -10089,6 +10362,15 @@
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
+"hOs" = (
+/obj/structure/blocker/invisible_wall,
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "Corner"
+ },
+/turf/open/ice/noweed,
+/area/fiorina/tumor/ice_lab)
"hOA" = (
/obj/structure/sink{
dir = 8;
@@ -10104,10 +10386,6 @@
/obj/structure/machinery/power/apc/power/south,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
-"hPu" = (
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison/bluecorner/north,
-/area/fiorina/station/power_ring/reactor)
"hPL" = (
/obj/item/tool/wrench,
/turf/open/floor/prison/darkpurple2/southeast,
@@ -10165,13 +10443,10 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"hQT" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/obj/item/stack/barbed_wire,
+"hQV" = (
+/obj/structure/platform/metal/almayer,
/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+/area/fiorina/station/botany)
"hRb" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -10179,6 +10454,16 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
+"hRm" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/reagent_dispensers/fueltank/oxygentank{
+ layer = 2.6
+ },
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
+"hRo" = (
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/west)
"hRs" = (
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/corsat/plate,
@@ -10186,10 +10471,23 @@
"hRX" = (
/turf/open/gm/river/red_pool,
/area/fiorina/station/park)
+"hSc" = (
+/obj/item/ammo_magazine/rifle/m16{
+ current_rounds = 0
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"hSk" = (
/obj/structure/toilet,
/turf/open/floor/prison/sterile_white,
/area/fiorina/station/civres_blue)
+"hSt" = (
+/obj/structure/closet/wardrobe/orange,
+/obj/item/explosive/mine/pmc,
+/obj/effect/spawner/random/gun/smg,
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"hSA" = (
/obj/item/reagent_container/food/drinks/bottle/tomatojuice,
/turf/open/floor/prison/floor_plate,
@@ -10252,6 +10550,14 @@
/obj/effect/spawner/random/technology_scanner,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"hUB" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"hUD" = (
/obj/item/stack/rods,
/turf/open/floor/prison/greencorner/east,
@@ -10276,10 +10582,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"hVA" = (
-/obj/structure/largecrate/random/case,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"hVG" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
@@ -10310,6 +10612,10 @@
/obj/effect/spawner/random/gun/rifle/lowchance,
/turf/open/floor/prison/darkyellow2/northwest,
/area/fiorina/lz/near_lzI)
+"hWt" = (
+/obj/item/tool/wrench,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"hWv" = (
/obj/structure/surface/rack,
/obj/item/tool/crowbar/red,
@@ -10322,17 +10628,9 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"hWG" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/device/radio{
- pixel_y = 8
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"hXF" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor/prison/floor_plate,
+"hXw" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/prison/bluecorner/east,
/area/fiorina/station/power_ring/reactor)
"hXG" = (
/obj/structure/barricade/metal/wired{
@@ -10340,13 +10638,6 @@
},
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
-"hXJ" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
"hXN" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ashtray/plastic,
@@ -10359,14 +10650,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"hXP" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
"hXX" = (
/obj/structure/stairs/perspective{
dir = 8;
@@ -10383,14 +10666,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"hYs" = (
-/obj/structure/barricade/sandbags{
- icon_state = "sandbag_0";
- layer = 2.97;
- pixel_y = -14
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"hYx" = (
/obj/item/tool/wet_sign,
/obj/item/tool/mop{
@@ -10399,6 +10674,11 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
+"hYT" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/effect/spawner/random/pills/lowchance,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"hYX" = (
/obj/structure/machinery/bot/medbot,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -10425,12 +10705,13 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/lowsec)
-"hZU" = (
-/obj/structure/machinery/door/airlock/prison/horizontal{
- dir = 4
+"hZY" = (
+/obj/structure/window_frame/prison/reinforced,
+/obj/item/stack/sheet/glass/reinforced{
+ pixel_y = 5
},
/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
+/area/fiorina/station/lowsec/showers_laundry)
"iaa" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/station/disco)
@@ -10466,6 +10747,22 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
+"ibE" = (
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/disco/east_disco)
+"ibZ" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/obj/item/prop/helmetgarb/spacejam_tickets{
+ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
+ name = "\improper arcade tickets";
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
"icg" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/prison/whitegreen/northwest,
@@ -10475,6 +10772,10 @@
/obj/item/pizzabox/mushroom,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"icy" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"icS" = (
/obj/structure/bed/chair{
dir = 1
@@ -10493,11 +10794,9 @@
/obj/item/trash/sosjerky,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"idj" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/briefcase/inflatable,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
+"idu" = (
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/research_cells/west)
"idS" = (
/obj/structure/largecrate/random,
/turf/open/floor/prison,
@@ -10505,6 +10804,13 @@
"iea" = (
/turf/open/floor/prison/whitegreencorner/north,
/area/fiorina/station/medbay)
+"ien" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecaldir"
+ },
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"ieA" = (
/obj/structure/barricade/handrail/type_b,
/turf/open/floor/prison,
@@ -10534,12 +10840,6 @@
/obj/structure/bed/chair/comfy,
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
-"ifB" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space/basic,
-/area/fiorina/oob)
"ifJ" = (
/obj/structure/bed/chair/dropship/pilot{
dir = 1
@@ -10616,6 +10916,10 @@
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"ihq" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"ihv" = (
/obj/item/stock_parts/matter_bin/super,
/turf/open/floor/prison/darkpurple2/east,
@@ -10624,10 +10928,6 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"ihA" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/turf/open/space,
-/area/fiorina/oob)
"ihB" = (
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
@@ -10646,6 +10946,17 @@
/obj/item/storage/firstaid/toxin,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"iip" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space/basic,
+/area/fiorina/oob)
"iiw" = (
/obj/structure/monorail{
dir = 6;
@@ -10657,10 +10968,17 @@
/obj/structure/machinery/gibber,
/turf/open/floor/prison/blue_plate/west,
/area/fiorina/station/botany)
+"iiK" = (
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"ijd" = (
/obj/item/trash/cigbutt,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"ijk" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
"ijs" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/toolbox,
@@ -10672,10 +10990,15 @@
"ijC" = (
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/lz/near_lzI)
-"ika" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
+"ijE" = (
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
+"ikc" = (
+/obj/item/trash/chips,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
+"ikg" = (
+/obj/item/weapon/twohanded/spear,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/station/research_cells/east)
"ikt" = (
@@ -10709,6 +11032,10 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"ilx" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
"ilM" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_sn_full_cap"
@@ -10719,31 +11046,47 @@
/obj/effect/landmark/survivor_spawner,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"imh" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco)
+"iml" = (
+/obj/item/stack/rods,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"imp" = (
/obj/structure/bed/chair/comfy{
dir = 8
},
/turf/open/floor/prison/blue/southwest,
/area/fiorina/station/civres_blue)
+"imr" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/open/space/basic,
+/area/fiorina/oob)
"imt" = (
/turf/open/floor/almayer,
/area/fiorina/tumor/ship)
+"imx" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"imz" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/corsat/squares,
/area/fiorina/station/civres_blue)
+"imC" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/item/fuel_cell,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"imG" = (
/obj/item/trash/chunk,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"imH" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/civres_blue)
"imN" = (
/obj/structure/filingcabinet/disk,
/turf/open/floor/prison,
@@ -10752,14 +11095,9 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"inv" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+"iny" = (
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/disco/east_disco)
"inA" = (
/obj/structure/surface/table/reinforced/prison{
flipped = 1
@@ -10778,13 +11116,16 @@
/obj/structure/machinery/vending/cola,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
+"ioK" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"ioM" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/medbay)
-"ioN" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/tumor/ice_lab)
"ioS" = (
/obj/item/storage/briefcase,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -10807,10 +11148,6 @@
/obj/structure/window/framed/prison,
/turf/open/floor/plating/prison,
/area/fiorina/station/botany)
-"ipy" = (
-/obj/structure/window/framed/prison/reinforced/hull,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"ipz" = (
/obj/item/device/flashlight,
/turf/open/floor/prison,
@@ -10829,6 +11166,11 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"ipR" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/closet/radiation,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"ipV" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/darkyellow2/east,
@@ -10865,14 +11207,13 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
-"isw" = (
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
-"isI" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/obj/item/tool/pickaxe,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/tumor/ice_lab)
+"isk" = (
+/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
+ dir = 1;
+ req_one_access = null
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"itd" = (
/obj/item/tool/lighter/random,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -10891,14 +11232,25 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
+"itY" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/floor/almayer_hull,
+/area/fiorina/oob)
+"iuf" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/disco/east_disco)
+"ius" = (
+/obj/structure/closet/crate/miningcar{
+ name = "\improper materials storage bin"
+ },
+/obj/item/reagent_container/food/snacks/meat,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"iuz" = (
/obj/vehicle/train/cargo/trolley,
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
-"iuC" = (
-/obj/structure/surface/table/reinforced/prison,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"iuN" = (
/obj/structure/barricade/handrail/type_b{
layer = 3.5
@@ -10932,15 +11284,6 @@
/obj/effect/landmark/corpsespawner/prison_security,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"ivA" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
"ivD" = (
/obj/item/tool/weldingtool{
pixel_x = 6;
@@ -10966,6 +11309,10 @@
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"iwl" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/east)
"iwu" = (
/obj/item/newspaper,
/turf/open/floor/prison,
@@ -10974,18 +11321,10 @@
/obj/structure/bed/sofa/south/grey/right,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"iwT" = (
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "End"
- },
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "End"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
+"iwG" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring)
"iwZ" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 2;
@@ -11006,14 +11345,16 @@
/obj/item/reagent_container/food/snacks/meat,
/turf/open/floor/prison/greenblue,
/area/fiorina/station/botany)
+"ixR" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/tumor/ice_lab)
"ixU" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/park)
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/floor/prison/whitegreen/southeast,
+/area/fiorina/tumor/ice_lab)
"iyc" = (
/obj/item/stack/rods/plasteel,
/turf/open/auto_turf/sand/layer1,
@@ -11068,9 +11409,21 @@
"iBr" = (
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
-"iBI" = (
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
+"iBB" = (
+/obj/structure/ice/thin/indestructible,
+/obj/structure/prop/invuln{
+ desc = "Its eyes follow you around through the ice.";
+ dir = 4;
+ icon = 'icons/mob/xenos/castes/tier_4/queen.dmi';
+ icon_state = "Normal Queen Knocked Down";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = -15;
+ pixel_y = -16
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/tumor/ice_lab)
"iBM" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/greenblue/northeast,
@@ -11080,16 +11433,10 @@
icon_state = "stan25"
},
/area/fiorina/oob)
-"iCf" = (
-/obj/structure/closet/wardrobe/orange,
-/obj/item/clothing/gloves/boxing/blue,
-/obj/item/clothing/gloves/boxing/blue,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
-"iCC" = (
-/obj/item/tool/warning_cone,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+"iBW" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/central_ring)
"iCE" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -11100,14 +11447,10 @@
},
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"iCN" = (
-/obj/item/tool/wrench,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/showers_laundry)
-"iCU" = (
-/obj/structure/sign/nosmoking_1,
-/turf/closed/wall/prison,
-/area/fiorina/station/disco/east_disco)
+"iDc" = (
+/obj/structure/largecrate/random,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"iDg" = (
/obj/structure/barricade/sandbags{
dir = 8;
@@ -11157,11 +11500,6 @@
/obj/effect/spawner/random/gun/rifle,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/station/chapel)
-"iDR" = (
-/obj/structure/largecrate/supply,
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/medbay)
"iEA" = (
/obj/structure/closet/crate/miningcar{
name = "\improper materials storage bin"
@@ -11184,11 +11522,6 @@
},
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/lowsec)
-"iES" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/item/device/flashlight,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
"iFg" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -11201,24 +11534,11 @@
/obj/structure/closet/firecloset/full,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/ice_lab)
-"iFB" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 8
- },
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/west)
"iFC" = (
/obj/structure/surface/rack,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"iFP" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"iFZ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/snacks/hugemushroomslice,
@@ -11227,25 +11547,6 @@
},
/turf/open/floor/prison/kitchen,
/area/fiorina/station/power_ring)
-"iGe" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/prop/almayer/computers/mission_planning_system{
- density = 0;
- desc = "Its a telephone, and a computer. Woah.";
- name = "\improper funny telephone booth";
- pixel_x = 2;
- pixel_y = 21
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"iGh" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/wood,
-/area/fiorina/station/park)
"iGw" = (
/obj/item/stack/tile/plasteel,
/turf/open/floor/prison/greenfull/northwest,
@@ -11254,20 +11555,14 @@
/obj/structure/closet/crate/trashcart,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"iGI" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/civres_blue)
"iGX" = (
/obj/effect/landmark/queen_spawn,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
-"iHi" = (
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/showers_laundry)
+"iHd" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/r_wall/prison,
+/area/fiorina/station/lowsec/east)
"iHu" = (
/obj/item/newspaper,
/turf/open/floor/prison,
@@ -11290,10 +11585,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/greenblue/east,
/area/fiorina/station/botany)
-"iIw" = (
-/obj/structure/platform_decoration/metal/kutjevo,
-/turf/open/space/basic,
-/area/fiorina/oob)
"iIx" = (
/obj/effect/decal/cleanable/blood{
desc = "Watch your step.";
@@ -11311,23 +11602,18 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"iIG" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/reagent_container/food/drinks/cans/waterbottle{
- pixel_x = 8;
- pixel_y = 5
- },
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
+"iIF" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/park)
"iIS" = (
/obj/structure/machinery/constructable_frame,
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
+"iIY" = (
+/obj/structure/machinery/space_heater,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"iIZ" = (
/obj/item/stack/cable_coil,
/obj/structure/machinery/light/double/blue{
@@ -11344,6 +11630,13 @@
},
/turf/open/floor/corsat/squares,
/area/fiorina/station/medbay)
+"iJG" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"iKg" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core,
/turf/open/floor/plating/prison,
@@ -11351,14 +11644,6 @@
"iKs" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/chapel)
-"iKy" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/obj/effect/spawner/random/gun/pistol,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/east)
"iKF" = (
/obj/structure/inflatable,
/turf/open/floor/prison/floor_plate,
@@ -11373,18 +11658,14 @@
},
/turf/open/floor/prison/whitegreen/northeast,
/area/fiorina/station/medbay)
-"iLl" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
+"iLo" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
},
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
-"iLE" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/chapel_carpet,
-/area/fiorina/station/chapel)
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
"iLJ" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/plating/prison,
@@ -11409,18 +11690,19 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"iMU" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
+"iNh" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"iNk" = (
/obj/structure/largecrate/random,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"iNs" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
"iNt" = (
/obj/item/device/whistle,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -11440,6 +11722,11 @@
"iOY" = (
/turf/open/floor/prison/whitegreen/southeast,
/area/fiorina/tumor/ice_lab)
+"iPi" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space/basic,
+/area/fiorina/oob)
"iPv" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/cameras{
@@ -11456,6 +11743,16 @@
/obj/item/storage/donut_box/empty,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"iPA" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
+ },
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"iQj" = (
/obj/structure/machinery/photocopier,
/obj/structure/machinery/light/double/blue{
@@ -11471,6 +11768,12 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/botany)
+"iQC" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/filingcabinet,
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"iQH" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/blue_plate,
@@ -11500,14 +11803,6 @@
},
/turf/open/floor/prison/darkbrown2/west,
/area/fiorina/tumor/aux_engi)
-"iRA" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/disco)
"iRG" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/trash/chunk,
@@ -11521,6 +11816,10 @@
"iRI" = (
/turf/open/floor/prison/whitegreencorner/east,
/area/fiorina/tumor/ice_lab)
+"iRO" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/civres_blue)
"iSg" = (
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/flight_deck)
@@ -11552,12 +11851,6 @@
"iTm" = (
/turf/open/auto_turf/sand/layer1,
/area/fiorina/station/civres_blue)
-"iTr" = (
-/obj/structure/closet/basketball,
-/obj/item/storage/pill_bottle/tramadol/skillless,
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"iTt" = (
/obj/structure/machinery/landinglight/ds2,
/turf/open/floor/prison/floor_plate,
@@ -11572,6 +11865,12 @@
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/prison,
/area/fiorina/station/security)
+"iTR" = (
+/obj/structure/machinery/door/airlock/almayer/marine{
+ dir = 1
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"iUa" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -11595,13 +11894,6 @@
},
/turf/open/floor/prison/whitegreen,
/area/fiorina/tumor/ice_lab)
-"iUz" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
"iUB" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -11610,19 +11902,10 @@
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/central_ring)
-"iUR" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/prop/souto_land/pole,
-/obj/structure/prop/souto_land/pole{
- dir = 4;
- pixel_y = 24
- },
-/turf/open/floor/prison/darkbrown2/west,
-/area/fiorina/station/park)
+"iUL" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
"iUS" = (
/obj/structure/barricade/handrail/type_b,
/obj/structure/barricade/handrail/type_b{
@@ -11671,27 +11954,10 @@
},
/turf/open/floor/prison/whitegreen/west,
/area/fiorina/station/central_ring)
-"iWX" = (
-/obj/structure/barricade/wooden{
- dir = 8
- },
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/east)
-"iXn" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/civres_blue)
-"iXq" = (
-/obj/item/stool,
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/showers_laundry)
"iXB" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 8
- },
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/east)
+/obj/structure/bed/chair,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"iXJ" = (
/obj/structure/bed/chair/comfy{
dir = 4
@@ -11705,10 +11971,6 @@
"iYa" = (
/turf/open/floor/prison/bluecorner/west,
/area/fiorina/station/chapel)
-"iYe" = (
-/obj/item/tool/wirecutters,
-/turf/open/floor/prison/bluecorner/north,
-/area/fiorina/station/power_ring/reactor)
"iYw" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/central_ring)
@@ -11721,6 +11983,9 @@
/obj/structure/surface/rack,
/turf/open/floor/prison,
/area/fiorina/maintenance)
+"iZl" = (
+/turf/closed/wall/prison,
+/area/fiorina/station/lowsec/east)
"iZm" = (
/obj/item/trash/chips,
/obj/structure/machinery/light/double/blue{
@@ -11730,16 +11995,10 @@
},
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/servers)
-"jbg" = (
-/obj/structure/holohoop{
- dir = 1
- },
-/turf/open/floor/prison/yellow/north,
+"jaR" = (
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/plating/prison,
/area/fiorina/station/lowsec/east)
-"jbm" = (
-/obj/item/clothing/under/color/orange,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/showers_laundry)
"jbq" = (
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/station/medbay)
@@ -11767,13 +12026,6 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"jce" = (
-/obj/structure/window_frame/prison/reinforced,
-/obj/item/shard{
- icon_state = "large"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"jci" = (
/obj/structure/machinery/cm_vending/sorted/medical/blood,
/obj/structure/window/reinforced{
@@ -11782,6 +12034,13 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"jcr" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/secure_data{
+ dir = 4
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"jcv" = (
/obj/structure/bed/chair/comfy{
dir = 4
@@ -11803,29 +12062,36 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
+"jcI" = (
+/obj/item/pamphlet/engineer,
+/obj/structure/closet,
+/obj/item/restraint/handcuffs,
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/lowsec/east)
+"jdj" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/chapel_carpet/doubleside,
+/area/fiorina/station/chapel)
"jdn" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"jdE" = (
+/obj/structure/machinery/door/airlock/almayer/security/glass{
+ dir = 2;
+ req_access = null
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
"jew" = (
/obj/structure/largecrate/supply/ammo,
/obj/item/storage/fancy/crayons,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"jfc" = (
-/obj/item/stack/rods,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"jfd" = (
/turf/open/gm/river/pool,
/area/fiorina/station/park)
-"jfp" = (
-/obj/structure/barricade/handrail,
-/obj/structure/barricade/handrail{
- dir = 8
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"jft" = (
/obj/structure/barricade/sandbags{
icon_state = "sandbag_0";
@@ -11836,6 +12102,13 @@
"jfO" = (
/turf/open/floor/prison/yellow/southeast,
/area/fiorina/station/central_ring)
+"jgo" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"jgu" = (
/turf/closed/wall/prison,
/area/fiorina/station/park)
@@ -11847,6 +12120,11 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/flight_deck)
+"jgA" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/whitegreen/east,
+/area/fiorina/tumor/ice_lab)
"jgL" = (
/obj/structure/bed/chair{
dir = 8
@@ -11875,23 +12153,34 @@
/obj/item/clothing/suit/armor/bulletproof/badge,
/turf/open/floor/prison/yellow/southeast,
/area/fiorina/station/lowsec)
-"jii" = (
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
+"jhR" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
+"jhW" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/disco)
"jiq" = (
/obj/structure/lz_sign/prison_sign,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"jiz" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"jiA" = (
/obj/item/storage/firstaid/regular,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"jiP" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/weapon/gun/smg/mp5,
+/obj/structure/machinery/door/window/eastright{
+ dir = 2
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"jiV" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/condiment/saltshaker,
@@ -11905,6 +12194,12 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"jiW" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"jjg" = (
/obj/structure/window/framed/prison,
/turf/open/floor/plating/prison,
@@ -11913,22 +12208,12 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"jjp" = (
-/obj/structure/largecrate/random/case,
-/obj/item/storage/toolbox/emergency{
- pixel_y = 4
- },
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
"jjs" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
},
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"jjx" = (
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/disco/east_disco)
"jjH" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison,
@@ -11948,11 +12233,27 @@
/obj/structure/largecrate/random/case/small,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
+"jkl" = (
+/obj/item/trash/burger,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"jkw" = (
/obj/structure/machinery/computer/atmos_alert,
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/fiberbush)
+"jkE" = (
+/obj/item/stool,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
+"jkM" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/east)
"jkW" = (
/obj/structure/dropship_equipment/fulton_system,
/turf/open/floor/prison,
@@ -11986,6 +12287,9 @@
/obj/item/stack/nanopaste,
/turf/open/floor/prison/blue/north,
/area/fiorina/station/civres_blue)
+"jlE" = (
+/turf/closed/wall/r_wall/prison,
+/area/fiorina/station/research_cells/west)
"jlI" = (
/obj/structure/bed/sofa/south/grey,
/turf/open/floor/prison,
@@ -12002,18 +12306,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/aux_engi)
-"jmv" = (
-/obj/structure/machinery/shower{
- dir = 4
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
-"jmG" = (
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/research_cells/west)
-"jna" = (
-/turf/open/floor/prison/whitepurplecorner/west,
-/area/fiorina/station/research_cells/west)
"jnd" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -12026,6 +12318,10 @@
/obj/structure/machinery/vending/sovietsoda,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
+"jnp" = (
+/obj/structure/machinery/vending/cigarette/colony,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"jnQ" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -12037,9 +12333,9 @@
"jnU" = (
/turf/open/floor/prison/darkpurple2/north,
/area/fiorina/tumor/servers)
-"jnX" = (
-/obj/item/storage/pill_bottle/spaceacillin/skillless,
-/turf/open/floor/prison/whitepurple/northeast,
+"jnV" = (
+/obj/item/weapon/twohanded/spear,
+/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/research_cells/west)
"jor" = (
/obj/effect/spawner/random/attachment,
@@ -12062,19 +12358,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"joB" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/tumor/ice_lab)
-"joJ" = (
-/obj/structure/bed/roller,
-/obj/effect/decal/cleanable/blood/gibs/core,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"joU" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor/prison,
@@ -12104,12 +12387,12 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
-"jpN" = (
-/obj/structure/sign/prop3{
- desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
+"jpB" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
},
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/research_cells/west)
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"jpQ" = (
/obj/structure/bed/chair{
dir = 4
@@ -12155,10 +12438,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
-"jqN" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"jri" = (
/obj/structure/closet/secure_closet/freezer/fridge/groceries,
/obj/structure/machinery/light/double/blue{
@@ -12181,22 +12460,14 @@
/obj/structure/closet/crate/trashcart,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
+"jso" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
"jsp" = (
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"jsu" = (
-/obj/structure/surface/table/reinforced/prison{
- dir = 8;
- flipped = 1
- },
-/obj/item/storage/box/ids,
-/obj/item/reagent_container/food/drinks/cans/souto/grape{
- pixel_x = 14;
- pixel_y = 7
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"jsU" = (
/obj/item/stack/tile/plasteel{
pixel_x = 3;
@@ -12210,6 +12481,17 @@
},
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
+"jth" = (
+/obj/structure/barricade/handrail/type_b{
+ dir = 1
+ },
+/obj/item/frame/rack,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
+"jtI" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"jtK" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_29";
@@ -12221,31 +12503,6 @@
/obj/effect/alien/weeds/node,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"jtW" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
-"juL" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/prop/souto_land/pole{
- dir = 1
- },
-/obj/structure/prop/souto_land/pole{
- dir = 8;
- pixel_y = 24
- },
-/turf/open/floor/prison/darkbrown2/east,
-/area/fiorina/station/park)
-"juV" = (
-/obj/structure/prop/structure_lattice{
- dir = 4
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"juX" = (
/obj/structure/machinery/door/poddoor/almayer{
density = 0;
@@ -12253,10 +12510,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
-"jvi" = (
-/obj/structure/closet/wardrobe/orange,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"jvm" = (
/obj/item/storage/surgical_tray,
/obj/structure/surface/table/reinforced/prison,
@@ -12266,6 +12519,10 @@
},
/turf/open/floor/corsat/squares,
/area/fiorina/station/medbay)
+"jvp" = (
+/obj/item/tool/wrench,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"jvy" = (
/mob/living/simple_animal/hostile/carp{
desc = "He is late for work.";
@@ -12291,15 +12548,6 @@
/obj/item/trash/hotdog,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"jxS" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/bed/chair{
- dir = 1;
- layer = 2.7
- },
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
"jyo" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/cell_stripe/west,
@@ -12334,6 +12582,10 @@
/obj/item/explosive/grenade/high_explosive/frag,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/tumor/servers)
+"jzC" = (
+/obj/structure/machinery/constructable_frame,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"jzN" = (
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/prison/floor_plate,
@@ -12341,16 +12593,18 @@
"jzP" = (
/turf/open/floor/prison/bluecorner,
/area/fiorina/station/power_ring)
-"jAw" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
+"jAp" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
},
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space,
-/area/fiorina/oob)
+/obj/effect/spawner/random/gun/pistol,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/east)
+"jAx" = (
+/obj/item/clothing/mask/cigarette,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"jAF" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/medical_decals{
@@ -12358,18 +12612,12 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"jAP" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
-"jAW" = (
-/obj/structure/largecrate/supply/ammo,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+"jBb" = (
+/obj/structure/closet,
+/obj/item/reagent_container/spray/cleaner,
+/obj/item/stack/sheet/plasteel/small_stack,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"jBn" = (
/obj/structure/closet/secure_closet/medical3,
/obj/structure/machinery/light/double/blue{
@@ -12385,10 +12633,18 @@
},
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_tram)
+"jBC" = (
+/obj/structure/largecrate/random/case,
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"jBQ" = (
/obj/structure/bed/chair/comfy,
/turf/open/floor/wood,
/area/fiorina/station/park)
+"jBX" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
"jCe" = (
/turf/open/floor/prison/darkpurple2/northeast,
/area/fiorina/tumor/servers)
@@ -12401,6 +12657,11 @@
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/almayer/plate,
/area/fiorina/tumor/ship)
+"jCx" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/tool/pen/blue/clicky,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"jCy" = (
/obj/structure/prop/dam/crane{
icon_state = "tractor_damaged"
@@ -12417,13 +12678,10 @@
},
/turf/open/floor/prison/yellow/northeast,
/area/fiorina/station/disco)
-"jDl" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecaldir"
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
+"jDr" = (
+/obj/structure/disposalpipe/broken,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
"jDR" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -12431,17 +12689,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"jEa" = (
-/obj/effect/landmark/corpsespawner/engineer,
-/turf/open/floor/prison/bluecorner/north,
-/area/fiorina/station/power_ring/reactor)
-"jEq" = (
-/obj/structure/monorail{
- name = "launch track"
- },
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/telecomm/lz1_tram)
"jEr" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/prison,
@@ -12454,34 +12701,23 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"jEK" = (
-/obj/structure/bed/chair/office/light{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/fiorina/station/research_cells/west)
"jEQ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/shuttle/dropship/flight/lz2,
/turf/open/floor/prison,
/area/fiorina/lz/console_II)
-"jET" = (
-/obj/structure/barricade/metal/wired{
- dir = 4
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"jEY" = (
-/obj/effect/decal/cleanable/blood{
- dir = 4;
- icon_state = "gib6"
- },
-/turf/open/floor/prison/floor_marked/west,
-/area/fiorina/station/research_cells/west)
+"jFb" = (
+/obj/item/stack/tile/plasteel,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
"jFl" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"jFw" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/r_wall/prison,
+/area/fiorina/station/disco/east_disco)
"jFz" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/turf/open/floor/prison/darkbrown2/north,
@@ -12514,19 +12750,10 @@
/obj/structure/blocker/invisible_wall,
/turf/open/floor/prison/whitepurple/northeast,
/area/fiorina/oob)
-"jGz" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/obj/effect/spawner/random/tool,
-/obj/item/clothing/gloves/combat,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"jGK" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"jGv" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/prison,
+/area/fiorina/station/lowsec/east)
"jHj" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
@@ -12547,11 +12774,18 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"jHV" = (
-/obj/item/paper,
-/obj/structure/inflatable/door,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+"jIa" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/tumor/servers)
+"jIp" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"jIw" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/cameras{
@@ -12611,19 +12845,13 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"jKJ" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/item/trash/used_stasis_bag,
-/turf/open/floor/prison/whitegreen/northwest,
-/area/fiorina/station/medbay)
"jKR" = (
/obj/structure/machinery/shower{
dir = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/tumor/ice_lab)
-"jLe" = (
-/obj/structure/machinery/constructable_frame,
+"jLz" = (
/turf/open/floor/prison,
/area/fiorina/station/disco/east_disco)
"jLC" = (
@@ -12633,13 +12861,6 @@
},
/turf/open/floor/prison/darkyellowcorners2/west,
/area/fiorina/station/telecomm/lz1_cargo)
-"jMf" = (
-/obj/item/stack/tile/plasteel{
- pixel_x = 5;
- pixel_y = 5
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"jMh" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/medbay)
@@ -12664,13 +12885,6 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"jNl" = (
-/obj/structure/ice/thin/indestructible{
- icon_state = "Straight"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"jNw" = (
/turf/open/floor/prison/blue/northwest,
/area/fiorina/tumor/servers)
@@ -12683,6 +12897,10 @@
},
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/flight_deck)
+"jOF" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/park)
"jOY" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/window/reinforced{
@@ -12691,17 +12909,23 @@
/obj/item/stack/cable_coil,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
+"jPD" = (
+/obj/structure/disposalpipe/broken{
+ dir = 1
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
"jPK" = (
/turf/closed/shuttle/elevator{
dir = 6
},
/area/fiorina/station/telecomm/lz1_cargo)
-"jPM" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
+"jPX" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
+ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
},
/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
+/area/fiorina/station/research_cells/west)
"jPY" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "Residential Apartment"
@@ -12716,17 +12940,26 @@
"jQs" = (
/turf/open/floor/prison/whitegreen/west,
/area/fiorina/station/medbay)
+"jQt" = (
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"jQy" = (
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"jQF" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
+"jQE" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
},
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/flight_deck)
+/obj/structure/largecrate/random/case/double,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
+"jQQ" = (
+/obj/structure/closet/basketball,
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"jQS" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -12755,6 +12988,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
+"jRE" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/blue/northeast,
+/area/fiorina/station/power_ring)
"jRF" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
@@ -12763,17 +13000,13 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/disco)
-"jSc" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/reagent_container/food/drinks/flask/marine,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"jSx" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
+/obj/structure/machinery/cm_vending/sorted/marine_food{
+ desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society.";
+ name = "\improper Fiorina Green Block Canteen Vendor"
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"jSD" = (
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plating/prison,
@@ -12791,12 +13024,26 @@
/obj/structure/machinery/recharger,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"jSY" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"jSZ" = (
/obj/structure/barricade/wooden{
dir = 1
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"jTa" = (
+/obj/item/prop/helmetgarb/gunoil,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"jTo" = (
/obj/item/prop/helmetgarb/gunoil,
/turf/open/floor/prison/whitegreen/east,
@@ -12805,9 +13052,6 @@
/obj/structure/reagent_dispensers/water_cooler/stacks,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"jTJ" = (
-/turf/closed/wall/r_wall/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"jTN" = (
/obj/structure/filingcabinet{
pixel_x = 8;
@@ -12875,13 +13119,6 @@
},
/turf/open/floor/prison/blue/west,
/area/fiorina/station/power_ring)
-"jWy" = (
-/obj/structure/barricade/handrail,
-/obj/structure/barricade/handrail{
- dir = 4
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"jWE" = (
/obj/item/trash/used_stasis_bag{
desc = "Wow, instant sand. They really have everything in space.";
@@ -12889,16 +13126,6 @@
},
/turf/open/floor/prison/blue/west,
/area/fiorina/station/civres_blue)
-"jWI" = (
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
-"jWY" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/storage/fancy/cigar/tarbacks,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/east)
"jXj" = (
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
@@ -12907,16 +13134,9 @@
/obj/structure/girder/reinforced,
/turf/open/floor/almayer,
/area/fiorina/tumor/ship)
-"jXr" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/cell_stripe/west,
-/area/fiorina/station/park)
"jXz" = (
/turf/closed/wall/prison,
/area/fiorina/tumor/servers)
-"jXU" = (
-/turf/open/floor/prison/yellowcorner/east,
-/area/fiorina/station/lowsec/showers_laundry)
"jXV" = (
/obj/effect/decal/cleanable/blood/gibs/xeno,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -12924,16 +13144,6 @@
"jXZ" = (
/turf/closed/shuttle/elevator,
/area/fiorina/tumor/aux_engi)
-"jYm" = (
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"jYs" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname{
- dir = 1
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"jYt" = (
/obj/structure/barricade/metal/wired{
dir = 8
@@ -12941,13 +13151,14 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/lz/near_lzI)
+"jYu" = (
+/obj/structure/platform/metal/almayer,
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
"jYK" = (
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/station/civres_blue)
-"jYM" = (
-/obj/item/trash/chips,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"jYU" = (
/obj/structure/stairs/perspective{
dir = 1;
@@ -12968,28 +13179,13 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/telecomm/lz1_tram)
-"jZF" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space/basic,
-/area/fiorina/oob)
-"kab" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
"kag" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/power_ring)
+"kaq" = (
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"kat" = (
/turf/open/floor/prison/green/north,
/area/fiorina/station/botany)
@@ -13013,10 +13209,6 @@
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited,
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/aux_engi)
-"kbh" = (
-/obj/item/explosive/grenade/incendiary/molotov,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"kbi" = (
/obj/item/ammo_casing{
dir = 6;
@@ -13033,6 +13225,12 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/greenblue/west,
/area/fiorina/station/botany)
+"kbp" = (
+/obj/item/ammo_casing{
+ icon_state = "casing_7_1"
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"kbt" = (
/obj/structure/janitorialcart,
/obj/item/tool/mop{
@@ -13047,9 +13245,25 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"kby" = (
+/obj/effect/landmark/corpsespawner/engineer,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
+"kbO" = (
+/obj/structure/machinery/recharge_station,
+/turf/open/floor/prison/blue/northwest,
+/area/fiorina/station/power_ring/reactor)
"kbT" = (
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
+"kcQ" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 1;
+ icon_state = "Straight"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"kdq" = (
/obj/structure/machinery/vending/hydronutrients,
/turf/open/floor/prison/greenfull/northwest,
@@ -13066,13 +13280,17 @@
/obj/structure/largecrate/random/case/small,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/lz/near_lzI)
-"keb" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/turf/open/floor/prison/whitepurple/southeast,
+"kei" = (
+/obj/item/stack/sheet/wood,
+/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/station/research_cells/east)
+"keo" = (
+/turf/open/floor/wood,
+/area/fiorina/station/lowsec/east)
+"kfn" = (
+/obj/item/clothing/gloves/boxing/green,
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"kfL" = (
/obj/structure/machinery/photocopier,
/turf/open/floor/prison,
@@ -13096,25 +13314,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
-"kgp" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/showers_laundry)
-"kgu" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/disco/east_disco)
"kgG" = (
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/station/telecomm/lz1_cargo)
@@ -13122,10 +13321,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/lowsec)
-"kgQ" = (
-/obj/item/stool,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"kgT" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper/carbon,
@@ -13152,10 +13347,6 @@
},
/turf/open/floor/corsat/squares,
/area/fiorina/station/civres_blue)
-"khw" = (
-/obj/effect/spawner/random/gun/rifle/midchance,
-/turf/open/floor/prison/blue/west,
-/area/fiorina/station/power_ring/reactor)
"khY" = (
/obj/structure/closet/secure_closet/medical3,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -13182,17 +13373,19 @@
/obj/item/tool/weldpack,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"kiT" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
-"kjs" = (
-/obj/structure/platform/metal/almayer/east,
+"kiU" = (
+/obj/structure/bed/chair/office/dark,
/turf/open/floor/prison,
/area/fiorina/station/disco/east_disco)
-"kjt" = (
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
+"kje" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
+"kjL" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/open/space,
+/area/fiorina/oob)
"kjP" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/door/window/northleft,
@@ -13201,6 +13394,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/security/wardens)
+"kjQ" = (
+/obj/item/toy/handcard/uno_reverse_blue,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"kjT" = (
/obj/structure/flora/grass/tallgrass/jungle/corner,
/turf/open/organic/grass/astroturf,
@@ -13231,14 +13428,6 @@
/obj/structure/machinery/vending/security,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"kll" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/medbay)
"klp" = (
/turf/closed/shuttle/ert{
icon_state = "rightengine_1";
@@ -13259,6 +13448,15 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"klD" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/reagent_container/glass/bottle/spaceacillin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"klN" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/donut_box{
@@ -13279,13 +13477,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security/wardens)
-"kmL" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
- dir = 1;
- icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"kmN" = (
/obj/structure/machinery/computer/cameras{
dir = 1;
@@ -13294,14 +13485,15 @@
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
-"knb" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"knh" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"kns" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/surgical_tray/empty,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"kny" = (
/obj/item/stack/tile/plasteel{
pixel_x = 5;
@@ -13309,6 +13501,21 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"knH" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/medbay)
+"knQ" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/item/ammo_magazine/smg/mp5,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"knW" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/station_alert{
@@ -13364,6 +13571,10 @@
/obj/structure/closet/bombcloset,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
+"koX" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"kpe" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/whitegreen/west,
@@ -13378,19 +13589,16 @@
"kpq" = (
/turf/open/floor/prison/whitegreen,
/area/fiorina/tumor/ice_lab)
-"kpu" = (
-/obj/structure/closet/wardrobe/orange,
-/obj/item/explosive/mine/pmc,
-/obj/effect/spawner/random/gun/smg,
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"kpv" = (
/obj/structure/pipes/standard/simple/visible{
dir = 4
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"kpA" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"kpH" = (
/obj/effect/decal/medical_decals{
icon_state = "cryomid"
@@ -13437,14 +13645,18 @@
},
/turf/open/floor/prison/darkyellow2/southwest,
/area/fiorina/station/flight_deck)
+"ksg" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"ksu" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/disco)
-"ksE" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/showers_laundry)
"ksV" = (
/obj/structure/barricade/handrail/type_b{
dir = 4;
@@ -13475,14 +13687,13 @@
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"kuQ" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
+"kuK" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 4;
+ icon_state = "gib6"
},
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
+/turf/open/floor/prison/floor_marked/west,
+/area/fiorina/station/research_cells/west)
"kvg" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -13513,6 +13724,10 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/medbay)
+"kvN" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/park)
"kvT" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "A ticket to Souto Man's raffle!";
@@ -13522,6 +13737,20 @@
},
/turf/open/floor/prison/blue,
/area/fiorina/station/chapel)
+"kwf" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space/basic,
+/area/fiorina/oob)
+"kwQ" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"kwT" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating/prison,
@@ -13553,6 +13782,10 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"kxr" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/park)
"kxQ" = (
/obj/structure/prop/resin_prop{
icon_state = "rack"
@@ -13566,18 +13799,24 @@
/obj/structure/machinery/vending/cola,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security/wardens)
+"kye" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
+"kyl" = (
+/obj/item/device/flashlight/lamp/tripod,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"kyF" = (
/turf/open/floor/prison/blue/west,
/area/fiorina/station/civres_blue)
-"kyU" = (
-/obj/item/prop/helmetgarb/spacejam_tickets{
- desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
- name = "\improper arcade tickets";
- pixel_x = 1;
- pixel_y = -1
- },
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
"kyW" = (
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/plating/prison,
@@ -13592,12 +13831,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"kzh" = (
-/obj/structure/machinery/door/airlock/prison/horizontal{
- dir = 4
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"kzs" = (
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/prison/green/east,
@@ -13618,6 +13851,10 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/green/northeast,
/area/fiorina/station/chapel)
+"kzC" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/gm/river/pool,
+/area/fiorina/station/park)
"kzL" = (
/obj/structure/bed/sofa/south/grey/right,
/obj/structure/machinery/light/double/blue{
@@ -13626,13 +13863,6 @@
},
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/transit_hub)
-"kzR" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/cameras{
- dir = 4
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"kAc" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/processor{
@@ -13644,6 +13874,14 @@
},
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/station/civres_blue)
+"kAB" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"kAO" = (
/obj/item/folder/yellow,
/turf/open/floor/plating/prison,
@@ -13660,19 +13898,6 @@
/obj/item/toy/bikehorn/rubberducky,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"kBW" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = -3
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/flight_deck)
"kCj" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -13699,14 +13924,22 @@
/obj/structure/surface/rack,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"kCT" = (
-/obj/effect/spawner/random/gun/smg,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/lowsec/east)
+"kCV" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/east)
"kCY" = (
/obj/item/tool/weldingtool,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
+"kDh" = (
+/obj/structure/largecrate/supply,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"kDw" = (
/turf/open/floor/prison/darkyellowcorners2,
/area/fiorina/station/telecomm/lz1_cargo)
@@ -13739,6 +13972,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
+"kET" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/east)
"kEZ" = (
/obj/item/stack/tile/plasteel{
pixel_x = 12;
@@ -13750,18 +13987,18 @@
/obj/structure/machinery/vending/hydronutrients,
/turf/open/floor/prison/blue_plate/north,
/area/fiorina/station/botany)
+"kFn" = (
+/obj/item/frame/toolbox_tiles,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
+"kFN" = (
+/obj/item/reagent_container/food/drinks/cans/aspen,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"kGc" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/station/telecomm/lz1_cargo)
-"kGd" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/east)
-"kGo" = (
-/obj/structure/machinery/power/apc/power/south,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"kGD" = (
/obj/structure/largecrate/random/mini/med,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -13773,13 +14010,10 @@
"kHv" = (
/turf/open/floor/prison/bluecorner/north,
/area/fiorina/station/power_ring)
-"kHx" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/item/fuel_cell,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"kHC" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"kHF" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
@@ -13787,10 +14021,6 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzII)
-"kHH" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"kHI" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/darkpurplefull2,
@@ -13803,14 +14033,14 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"kHT" = (
+/obj/structure/inflatable/door,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"kHZ" = (
/obj/item/stack/folding_barricade,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"kIb" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/yellow/west,
-/area/fiorina/station/lowsec/showers_laundry)
"kIg" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
@@ -13836,10 +14066,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"kIO" = (
-/obj/structure/machinery/vending/snack/packaged,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"kJd" = (
/obj/item/tool/warning_cone,
/turf/open/floor/prison/darkbrown2/east,
@@ -13848,10 +14074,6 @@
/obj/item/tool/wrench,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"kJg" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/bluecorner/east,
-/area/fiorina/station/power_ring)
"kJz" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/machinery/fuelcell_recycler,
@@ -13884,12 +14106,10 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
-"kKh" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/floor/prison/whitegreen/southwest,
-/area/fiorina/tumor/ice_lab)
+"kKp" = (
+/obj/item/tool/warning_cone,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"kKs" = (
/obj/structure/bed/chair/comfy{
dir = 4
@@ -13901,14 +14121,14 @@
/obj/item/weapon/baton,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/tumor/civres)
-"kKy" = (
-/obj/structure/stairs/perspective{
+"kKI" = (
+/obj/structure/machinery/light/double/blue{
dir = 8;
- icon_state = "p_stair_sn_full_cap"
+ pixel_x = -10;
+ pixel_y = -3
},
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/telecomm/lz1_tram)
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"kLs" = (
/obj/vehicle/powerloader{
dir = 8
@@ -13931,10 +14151,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
-"kMf" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/tumor/ice_lab)
"kMm" = (
/obj/structure/barricade/handrail,
/turf/open/floor/prison/floor_plate,
@@ -13942,14 +14158,13 @@
"kMq" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/civres_blue)
-"kMA" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
+"kMB" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/surface/rack,
+/obj/item/stack/flag/yellow,
+/obj/item/stack/flag/yellow,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"kMC" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/objective,
@@ -13973,6 +14188,18 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
+"kNj" = (
+/obj/structure/machinery/door/airlock/prison/horizontal{
+ density = 0;
+ dir = 4;
+ icon_state = "door_open";
+ opacity = 0
+ },
+/obj/structure/barricade/metal/wired{
+ dir = 4
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"kNk" = (
/obj/item/stack/sheet/metal/medium_stack,
/obj/structure/surface/rack,
@@ -14018,13 +14245,6 @@
"kOB" = (
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
-"kOM" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/chapel)
"kOV" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/folder/black_random,
@@ -14038,19 +14258,21 @@
/obj/structure/machinery/computer3/server/rack,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"kPl" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/reagent_dispensers/water_cooler/stacks{
+ pixel_y = 11
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"kPz" = (
/obj/structure/lattice,
/turf/open/space,
/area/fiorina/oob)
-"kPG" = (
-/obj/structure/blocker/invisible_wall,
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/ice/thin/indestructible{
- dir = 1;
- icon_state = "Corner"
- },
-/turf/open/ice/noweed,
-/area/fiorina/tumor/ice_lab)
+"kPM" = (
+/obj/structure/machinery/vending/snack/packaged,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"kPY" = (
/turf/closed/wall/prison,
/area/fiorina/tumor/fiberbush)
@@ -14084,11 +14306,15 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"kRl" = (
+"kRp" = (
/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/obj/structure/barricade/handrail/type_b{
+ layer = 3.4
},
-/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
"kRO" = (
@@ -14114,9 +14340,6 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"kSe" = (
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/disco/east_disco)
"kSh" = (
/turf/closed/shuttle/elevator{
dir = 9
@@ -14126,6 +14349,16 @@
/obj/structure/closet/firecloset,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/maintenance)
+"kTk" = (
+/obj/item/tool/mop{
+ pixel_y = 23
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"kTs" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/maintenance)
@@ -14157,6 +14390,12 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"kUB" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"kVg" = (
/obj/item/stack/cable_coil/blue,
/turf/open/floor/plating/prison,
@@ -14165,6 +14404,10 @@
/obj/structure/largecrate/random,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"kVK" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"kVN" = (
/obj/structure/window/framed/prison/reinforced,
/turf/open/floor/prison/redfull,
@@ -14178,13 +14421,6 @@
/obj/item/restraint/handcuffs,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"kWx" = (
-/obj/item/stack/tile/plasteel{
- pixel_x = 3;
- pixel_y = 4
- },
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"kWL" = (
/turf/open/floor/prison/floor_marked/southwest,
/area/fiorina/lz/near_lzII)
@@ -14192,13 +14428,6 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
-"kWT" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
-"kXk" = (
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/west)
"kXm" = (
/obj/structure/surface/rack,
/obj/item/weapon/gun/pistol/heavy,
@@ -14228,9 +14457,10 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"kXT" = (
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/showers_laundry)
+"kXX" = (
+/obj/structure/machinery/photocopier,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"kYd" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -14243,6 +14473,10 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"kYj" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/central_ring)
"kYz" = (
/obj/structure/closet/crate/medical,
/obj/effect/landmark/objective_landmark/science,
@@ -14293,6 +14527,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
+"lai" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"laz" = (
/obj/structure/machinery/landinglight/ds1/delayone{
dir = 8
@@ -14303,22 +14541,12 @@
/obj/structure/airlock_assembly,
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"laK" = (
-/obj/item/stool,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
"laX" = (
/obj/structure/toilet{
dir = 8
},
/turf/open/floor/prison/sterile_white,
/area/fiorina/station/civres_blue)
-"lbg" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer/east,
-/obj/vehicle/powerloader/ft,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
"lbt" = (
/obj/structure/disposalpipe/segment{
color = "#c4c4c4";
@@ -14336,11 +14564,13 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"lbL" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/trash/cigbutt,
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
+"lbU" = (
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/east)
+"lcb" = (
+/obj/structure/window/framed/prison/reinforced/hull,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"lcm" = (
/obj/structure/machinery/landinglight/ds2/delayone{
dir = 4
@@ -14354,18 +14584,18 @@
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
-"lcE" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/west)
+"lcI" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/telecomm/lz1_tram)
"lcJ" = (
/obj/effect/landmark/queen_spawn,
/turf/open/floor/prison/whitegreencorner/east,
/area/fiorina/tumor/ice_lab)
-"lcO" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/darkbrown2/east,
-/area/fiorina/station/park)
"ldd" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/stack/rods,
@@ -14392,10 +14622,6 @@
/obj/effect/spawner/random/sentry/midchance,
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/lowsec)
-"ldF" = (
-/obj/structure/machinery/fuelcell_recycler/full,
-/turf/open/floor/prison/blue/southwest,
-/area/fiorina/station/power_ring/reactor)
"ldW" = (
/obj/item/stack/sandbags,
/turf/open/floor/prison/kitchen,
@@ -14416,12 +14642,6 @@
/obj/item/trash/cigbutt/ucigbutt,
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
-"leN" = (
-/obj/structure/barricade/metal/wired{
- dir = 8
- },
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/disco/east_disco)
"leZ" = (
/obj/item/trash/cigbutt,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -14430,14 +14650,6 @@
/obj/structure/pipes/standard/manifold/visible,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"lfx" = (
-/obj/item/stack/sheet/cardboard,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
-"lfX" = (
-/obj/structure/inflatable/door,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"lge" = (
/turf/open/floor/prison/blue/northeast,
/area/fiorina/station/civres_blue)
@@ -14456,6 +14668,14 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/park)
+"lhl" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"lhJ" = (
/obj/item/weapon/gun/flamer,
/obj/structure/closet/secure_closet/guncabinet,
@@ -14499,23 +14719,36 @@
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/lz/near_lzII)
-"ljc" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"ljd" = (
/obj/item/stack/cable_coil,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"ljM" = (
+/obj/structure/closet/wardrobe/orange,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing/blue,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
+"ljO" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/stock_parts/subspace/amplifier{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/subspace/analyzer{
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"ljV" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison,
/area/fiorina/station/security)
"lkb" = (
-/obj/item/tool/kitchen/knife,
-/obj/structure/bed/roller,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/greenfull/northwest,
+/area/fiorina/station/botany)
"lkr" = (
/turf/open/floor/prison/whitegreen/northwest,
/area/fiorina/tumor/ice_lab)
@@ -14532,6 +14765,11 @@
/obj/structure/inflatable/popped/door,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/tumor/servers)
+"lkN" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/obj/structure/inflatable/popped,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
"lkP" = (
/obj/item/shard{
icon_state = "medium"
@@ -14545,16 +14783,20 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
+"lkR" = (
+/obj/item/tool/wrench,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/showers_laundry)
+"lkU" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/botany)
"lld" = (
/turf/open/floor/prison/red/west,
/area/fiorina/station/security)
-"llf" = (
-/obj/structure/monorail{
- name = "launch track"
- },
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/telecomm/lz1_tram)
"lls" = (
/obj/structure/barricade/handrail/type_b{
layer = 3.5
@@ -14587,20 +14829,18 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
-"lmC" = (
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"lmJ" = (
+/obj/structure/platform/metal/almayer/north,
/obj/structure/machinery/light/double/blue{
- pixel_y = -1
+ dir = 1;
+ pixel_y = 21
},
-/obj/structure/platform_decoration/metal/almayer,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"lny" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+/area/fiorina/station/power_ring)
+"lnk" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"lnK" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/telecomm/lz1_tram)
@@ -14615,10 +14855,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
-"low" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/greenblue/southwest,
-/area/fiorina/station/botany)
"loE" = (
/obj/structure/window/reinforced{
dir = 8
@@ -14637,6 +14873,12 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/medbay)
+"loX" = (
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"lpd" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/blue,
@@ -14667,20 +14909,28 @@
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"lpX" = (
-/obj/structure/machinery/door/airlock/prison/horizontal,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
-"lpZ" = (
-/obj/item/trash/boonie,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"lqa" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/central_ring)
+"lqg" = (
+/obj/item/stool{
+ pixel_x = -4;
+ pixel_y = 23
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
+"lqp" = (
+/obj/item/prop/helmetgarb/spacejam_tickets{
+ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
+ name = "\improper arcade tickets";
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"lqq" = (
/turf/open/floor/wood,
/area/fiorina/station/chapel)
@@ -14711,6 +14961,10 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
+"lrB" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"lrE" = (
/obj/structure/bed,
/obj/item/bedsheet/rd,
@@ -14725,6 +14979,10 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/fiberbush)
+"lrK" = (
+/obj/effect/spawner/random/gun/rifle/midchance,
+/turf/open/floor/prison/blue/west,
+/area/fiorina/station/power_ring/reactor)
"lrV" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/faxmachine,
@@ -14739,26 +14997,6 @@
/obj/item/stack/sheet/mineral/plastic/small_stack,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"lsR" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/machinery/shower{
- dir = 4
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
-"lsZ" = (
-/obj/item/tool/soap,
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
- },
-/obj/structure/machinery/shower{
- dir = 8
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
"ltd" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/sterile_white/southwest,
@@ -14779,13 +15017,18 @@
"ltA" = (
/turf/open/floor/prison/floorscorched1,
/area/fiorina/tumor/aux_engi)
+"ltC" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
+ },
+/obj/structure/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"ltQ" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/security)
-"lud" = (
-/obj/structure/platform_decoration/metal/kutjevo/west,
-/turf/open/space/basic,
-/area/fiorina/oob)
"luf" = (
/obj/effect/decal/medical_decals{
icon_state = "docdecal1"
@@ -14796,22 +15039,32 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"lur" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
-"lux" = (
-/obj/structure/inflatable/door,
+"lus" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{
+ layer = 3.5
+ },
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
+/area/fiorina/station/power_ring)
"luy" = (
/obj/item/trash/candle,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/maintenance)
-"luR" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
+"luF" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
+"luH" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/cell_stripe,
+/area/fiorina/station/lowsec)
"luZ" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -14902,6 +15155,10 @@
},
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/station/park)
+"lyc" = (
+/obj/item/roller,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"lyf" = (
/obj/structure/flora/bush/ausbushes/ausbush{
desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now.";
@@ -14910,6 +15167,9 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"lyq" = (
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/east)
"lyJ" = (
/obj/item/tool/crowbar,
/turf/open/floor/plating/prison,
@@ -14925,11 +15185,6 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"lzm" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/window/reinforced/tinted,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"lzn" = (
/obj/structure/machinery/portable_atmospherics/canister/phoron,
/turf/open/floor/corsat/squares,
@@ -14942,13 +15197,10 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"lzz" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/storage/fancy/crayons,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/east)
+"lzx" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/west)
"lzB" = (
/obj/structure/closet/crate/miningcar{
name = "\improper materials storage bin"
@@ -14981,14 +15233,6 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/station/telecomm/lz1_cargo)
-"lAM" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/communications{
- dir = 4;
- pixel_y = 5
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"lAN" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -15031,6 +15275,11 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
+"lBK" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"lBR" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/whitegreen/west,
@@ -15042,6 +15291,12 @@
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"lCe" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"lCl" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/tool/stamp/captain,
@@ -15057,10 +15312,6 @@
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/almayer/plate,
/area/fiorina/tumor/ship)
-"lCG" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"lDo" = (
/obj/item/storage/fancy/cigar,
/turf/open/floor/prison,
@@ -15077,10 +15328,6 @@
/obj/item/stack/cable_coil,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"lEd" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
"lEg" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
@@ -15128,10 +15375,6 @@
/obj/effect/landmark/corpsespawner/security/liaison,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"lFg" = (
-/obj/item/paper,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"lFm" = (
/obj/structure/bed/roller,
/obj/item/trash/used_stasis_bag,
@@ -15148,20 +15391,10 @@
/obj/item/stack/cable_coil,
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"lFB" = (
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"lFD" = (
/obj/item/tool/crowbar/red,
/turf/open/floor/prison/darkbrown2/east,
/area/fiorina/tumor/aux_engi)
-"lFK" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/disco/east_disco)
"lFM" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/landmark/objective_landmark/close,
@@ -15199,21 +15432,13 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"lHH" = (
-/obj/structure/window/framed/prison/reinforced,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"lHJ" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform_decoration/metal/kutjevo/north,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
+"lHT" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/communications{
+ dir = 1
},
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"lIj" = (
/obj/structure/prop/ice_colony/surveying_device,
/turf/open/floor/prison/blue/east,
@@ -15261,30 +15486,14 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"lIG" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/research_cells/west)
"lIH" = (
/obj/structure/machinery/processor,
/turf/open/floor/prison/blue_plate/west,
/area/fiorina/station/botany)
-"lIJ" = (
-/obj/item/stack/rods,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"lIN" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/tumor/servers)
-"lJb" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/floor/almayer_hull,
-/area/fiorina/oob)
+"lJc" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/chapel_carpet/doubleside/north,
+/area/fiorina/station/chapel)
"lJf" = (
/obj/structure/reagent_dispensers/fueltank/gas/hydrogen{
layer = 2.6
@@ -15321,26 +15530,27 @@
},
/turf/open/floor/prison/blue/east,
/area/fiorina/station/chapel)
+"lKV" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"lLe" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
-"lLk" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/park)
+"lLi" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space,
+/area/fiorina/oob)
"lLE" = (
/obj/item/bedsheet/blue,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"lLN" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/tumor/ice_lab)
"lLQ" = (
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
@@ -15350,14 +15560,17 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
+"lMf" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"lMh" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
-"lMi" = (
-/obj/structure/largecrate/random,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"lMq" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/microwave{
@@ -15366,40 +15579,14 @@
},
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/station/civres_blue)
-"lMJ" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/darkbrown2,
-/area/fiorina/station/park)
-"lMV" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/communications{
- dir = 1
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"lNc" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"lNf" = (
-/obj/item/inflatable,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
"lNv" = (
/obj/item/restraint/adjustable/cable/pink,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/station/chapel)
-"lNC" = (
-/turf/open/floor/prison/yellowcorner,
-/area/fiorina/station/lowsec/east)
"lNP" = (
/obj/structure/bed/roller,
/turf/open/floor/prison,
@@ -15412,6 +15599,10 @@
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/telecomm/lz1_tram)
+"lOg" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"lOk" = (
/obj/structure/curtain,
/turf/open/floor/prison/cell_stripe/west,
@@ -15434,11 +15625,11 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
-"lOX" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"lPz" = (
+/obj/item/paper,
+/obj/structure/inflatable/door,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"lPA" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison,
@@ -15449,6 +15640,10 @@
/obj/item/reagent_container/food/condiment/enzyme,
/turf/open/floor/prison/kitchen,
/area/fiorina/station/power_ring)
+"lPZ" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"lQo" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -15460,6 +15655,10 @@
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/prison/darkbrown2/southwest,
/area/fiorina/maintenance)
+"lRe" = (
+/obj/item/bedsheet,
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"lRk" = (
/obj/item/stack/rods/plasteel,
/turf/open/floor/prison/damaged3,
@@ -15484,27 +15683,26 @@
/obj/structure/machinery/vending/snack,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"lSj" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
- dir = 2;
- icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
- },
+"lSf" = (
+/obj/item/clothing/shoes/marine/upp/knife,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"lSo" = (
+/obj/structure/window/framed/prison/cell,
/turf/open/floor/plating/prison,
/area/fiorina/station/research_cells/west)
-"lSq" = (
-/obj/item/ammo_magazine/shotgun/buckshot,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+"lTg" = (
+/obj/structure/barricade/deployable{
+ dir = 4
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"lTp" = (
/obj/structure/sink{
pixel_y = 15
},
/turf/open/floor/almayer/plate,
/area/fiorina/tumor/ship)
-"lTs" = (
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"lTW" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_29";
@@ -15512,23 +15710,18 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"lUc" = (
+/obj/structure/largecrate/random/case,
+/obj/item/storage/toolbox/emergency{
+ pixel_y = 4
+ },
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"lUi" = (
/turf/closed/shuttle/ert{
icon_state = "stan23"
},
/area/fiorina/tumor/ship)
-"lUs" = (
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "Straight"
- },
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "Straight"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"lUu" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -15544,15 +15737,24 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"lUZ" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
+"lUM" = (
+/obj/item/storage/briefcase/inflatable,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
+"lUR" = (
+/turf/open/floor/prison/damaged1/southwest,
+/area/fiorina/station/lowsec/east)
"lVA" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/lz/near_lzII)
+"lVB" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"lVQ" = (
/obj/structure/inflatable/door,
/turf/open/floor/prison/whitegreencorner,
@@ -15564,16 +15766,14 @@
/obj/item/tool/soap/weyland_yutani,
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"lWy" = (
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/item/fuel_cell,
-/obj/structure/surface/rack,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+"lWH" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/botany)
"lXs" = (
/obj/item/book/manual/marine_law,
/obj/item/book/manual/marine_law{
@@ -15585,6 +15785,14 @@
},
/turf/open/floor/prison/chapel_carpet,
/area/fiorina/maintenance)
+"lYd" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/device/flashlight/lamp,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/disco/east_disco)
+"lYf" = (
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
"lYj" = (
/obj/structure/sink{
pixel_y = 15
@@ -15594,6 +15802,10 @@
},
/turf/open/floor/prison/sterile_white,
/area/fiorina/station/civres_blue)
+"lYv" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"lZf" = (
/turf/closed/shuttle/elevator{
dir = 10
@@ -15611,9 +15823,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/fiberbush)
-"lZp" = (
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
"lZs" = (
/obj/structure/disposalpipe/segment{
color = "#c4c4c4";
@@ -15629,16 +15838,15 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
-"lZA" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
- icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"maA" = (
/obj/item/stack/tile/plasteel,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"maR" = (
+/obj/item/storage/belt/quackers,
+/obj/effect/spawner/gibspawner/human,
+/turf/open/gm/river/darkred_pool,
+/area/fiorina/station/park)
"maY" = (
/obj/structure/prop/almayer/computers/sensor_computer2,
/turf/open/floor/prison/darkpurplefull2,
@@ -15661,25 +15869,18 @@
/obj/item/clipboard,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"mbU" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
+"mbQ" = (
+/obj/item/frame/rack,
+/obj/structure/barricade/handrail/type_b{
+ dir = 1
},
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/bright_clean_marked/southwest,
-/area/fiorina/station/power_ring)
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/lowsec/east)
"mcr" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/stock_parts/matter_bin/super,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"mcy" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/chapel)
"mcH" = (
/turf/open/floor/prison/blue,
/area/fiorina/tumor/servers)
@@ -15688,6 +15889,14 @@
/obj/item/ammo_magazine/shotgun/buckshot,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
+"mcW" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"mdd" = (
/obj/item/storage/toolbox/electrical,
/turf/open/floor/plating/prison,
@@ -15731,6 +15940,10 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"mdN" = (
+/obj/structure/platform_decoration/metal/kutjevo/east,
+/turf/open/space/basic,
+/area/fiorina/oob)
"mdS" = (
/turf/open/floor/prison/greenbluecorner/west,
/area/fiorina/station/botany)
@@ -15756,13 +15969,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"met" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
-"meE" = (
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/east)
"mfe" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/weapon/twohanded/sledgehammer{
@@ -15784,19 +15990,31 @@
},
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
+"mfW" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"mgh" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/prison/whitegreen,
/area/fiorina/tumor/ice_lab)
-"mgz" = (
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
+"mgC" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/east)
"mgE" = (
/obj/structure/machinery/light/double/blue{
pixel_y = -1
},
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
+"mgJ" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring)
"mgO" = (
/obj/structure/window{
dir = 8
@@ -15804,6 +16022,13 @@
/obj/item/circuitboard/machine/rdserver,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"mgU" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/cell_stripe/west,
+/area/fiorina/station/park)
+"mhe" = (
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"mho" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -15811,6 +16036,9 @@
},
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
+"mhp" = (
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/east)
"mhM" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
@@ -15826,6 +16054,10 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/greenblue/north,
/area/fiorina/station/botany)
+"mil" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"miU" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
@@ -15836,6 +16068,10 @@
},
/turf/open/floor/prison/yellow/northeast,
/area/fiorina/station/central_ring)
+"mjt" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/research_cells/west)
"mju" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/floor_plate/southwest,
@@ -15843,29 +16079,18 @@
"mjx" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/tumor/servers)
-"mjW" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space,
-/area/fiorina/oob)
-"mke" = (
-/obj/item/tool/wirecutters,
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
+"mjG" = (
+/obj/structure/barricade/handrail,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
+"mkk" = (
+/obj/structure/machinery/space_heater,
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreen/west,
+/area/fiorina/tumor/ice_lab)
"mkn" = (
/turf/open/floor/prison/darkyellow2/southeast,
/area/fiorina/station/power_ring)
-"mkr" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space/basic,
-/area/fiorina/oob)
"mkI" = (
/obj/structure/machinery/microwave{
desc = "So uh yeah, about that cat...";
@@ -15893,13 +16118,17 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/disco)
-"mlE" = (
-/turf/open/floor/prison/yellowcorner,
-/area/fiorina/station/lowsec/showers_laundry)
-"mlG" = (
-/obj/structure/platform_decoration/metal/almayer/west,
+"mlQ" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{
+ layer = 3.5
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
+/area/fiorina/station/power_ring)
"mlU" = (
/obj/structure/machinery/shower{
pixel_y = 13
@@ -15937,10 +16166,6 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/fiberbush)
-"mns" = (
-/obj/item/stool,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"mny" = (
/turf/closed/wall/prison,
/area/fiorina/station/flight_deck)
@@ -15952,6 +16177,13 @@
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
+"mof" = (
+/obj/structure/machinery/cm_vending/sorted/marine_food{
+ desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society.";
+ name = "\improper Fiorina Purple Block Canteen Vendor"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"mok" = (
/obj/structure/closet/crate/bravo,
/obj/item/stack/sheet/metal/medium_stack,
@@ -15961,23 +16193,10 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"mom" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/tool/surgery/surgicaldrill,
-/turf/open/floor/prison/yellowcorner,
-/area/fiorina/station/lowsec/showers_laundry)
"moK" = (
/obj/item/clothing/under/shorts/red,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/central_ring)
-"moQ" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/east)
"moW" = (
/obj/effect/landmark/corpsespawner/ua_riot/burst,
/turf/open/floor/plating/prison,
@@ -15992,6 +16211,10 @@
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/lz/near_lzII)
+"mpj" = (
+/obj/item/tool/soap,
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"mpE" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -16003,21 +16226,10 @@
/obj/item/stock_parts/manipulator/pico,
/turf/open/floor/prison/darkpurple2/east,
/area/fiorina/tumor/servers)
-"mpR" = (
-/obj/structure/machinery/vending/cigarette/colony,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"mqB" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/red,
/area/fiorina/station/security)
-"mqF" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/obj/structure/largecrate/random,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"mqJ" = (
/obj/structure/barricade/metal/wired{
dir = 8
@@ -16025,14 +16237,14 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
-"mqL" = (
-/obj/item/stack/sheet/metal/medium_stack,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"mqM" = (
/obj/item/stack/sandbags_empty/half,
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/station/flight_deck)
+"mqS" = (
+/obj/item/trash/barcardine,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"mrk" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -16040,11 +16252,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"mrG" = (
-/obj/structure/extinguisher_cabinet,
-/obj/structure/window/framed/prison,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
"mrI" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med,
/turf/closed/wall/prison,
@@ -16053,14 +16260,6 @@
/obj/structure/closet/secure_closet/medical2,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
-"mrP" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/chapel_carpet/doubleside,
-/area/fiorina/station/chapel)
-"mrW" = (
-/obj/item/stack/rods,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"mrX" = (
/obj/structure/bed/chair{
dir = 8
@@ -16084,11 +16283,30 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"msx" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/almayer_hull,
+/area/fiorina/station/medbay)
+"msB" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"msF" = (
/obj/structure/closet/secure_closet/engineering_materials,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
+"msG" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/effect/spawner/random/powercell,
+/obj/item/storage/syringe_case/burn{
+ pixel_x = -10;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"msH" = (
/obj/item/tool/surgery/cautery,
/turf/open/floor/prison/yellow/west,
@@ -16111,10 +16329,6 @@
"mtG" = (
/turf/open/floor/prison/darkbrowncorners2,
/area/fiorina/station/park)
-"mtM" = (
-/obj/structure/platform_decoration/metal/kutjevo/east,
-/turf/open/space,
-/area/fiorina/oob)
"mtP" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -16122,35 +16336,32 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"mue" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"muD" = (
/obj/structure/tunnel,
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
+"muU" = (
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/turf/open/space,
+/area/fiorina/oob)
"muX" = (
/obj/structure/bed/chair/office/dark{
dir = 1
},
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/tumor/ice_lab)
-"mvl" = (
-/obj/structure/window/framed/prison/reinforced,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+"mvh" = (
+/turf/open/floor/prison/floor_marked/west,
+/area/fiorina/station/lowsec/showers_laundry)
"mvp" = (
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"mvt" = (
-/obj/structure/platform_decoration/metal/kutjevo,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
"mvF" = (
/obj/structure/monorail{
name = "launch track"
@@ -16167,24 +16378,24 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"mwi" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/darkbrown2/west,
-/area/fiorina/station/park)
-"mwu" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/spacecash/c10,
-/obj/item/spacecash/c10{
- pixel_x = 5;
- pixel_y = 10
+"mwa" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
+"mwh" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
},
/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
+ dir = 1;
+ pixel_y = 21
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"mwK" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/window/reinforced{
@@ -16200,16 +16411,23 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"mwP" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/east)
+"mwX" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
+"mwY" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/chapel_carpet,
+/area/fiorina/station/chapel)
"mxc" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
+"mxi" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"mxk" = (
/obj/item/trash/tray,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -16219,16 +16437,11 @@
/obj/item/tool/plantspray/pests,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
-"mxs" = (
-/obj/item/storage/belt/marine/quackers,
-/obj/effect/spawner/gibspawner/human,
-/turf/open/gm/river/darkred_pool,
-/area/fiorina/station/park)
-"mxN" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"mxu" = (
+/obj/item/tool/pickaxe,
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/whitegreen/east,
+/area/fiorina/tumor/ice_lab)
"mxQ" = (
/turf/closed/wall/prison,
/area/fiorina/station/power_ring)
@@ -16257,6 +16470,14 @@
/obj/structure/barricade/handrail/type_b,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/flight_deck)
+"myC" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
"myH" = (
/obj/item/storage/briefcase,
/turf/open/floor/prison/greenfull/northwest,
@@ -16275,6 +16496,20 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/prison/whitegreen/southwest,
/area/fiorina/tumor/ice_lab)
+"myS" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
+"mzm" = (
+/obj/structure/barricade/wooden{
+ dir = 8
+ },
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/east)
"mzn" = (
/obj/item/frame/firstaid_arm_assembly,
/turf/open/floor/prison/bluefull,
@@ -16341,6 +16576,10 @@
/obj/structure/bed/chair/comfy,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
+"mBI" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/gm/river/red_pool,
+/area/fiorina/station/park)
"mBJ" = (
/obj/item/ammo_box/magazine/misc/flares/empty,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -16359,14 +16598,18 @@
/obj/structure/prop/resin_prop,
/turf/open/floor/plating/prison,
/area/fiorina/station/park)
-"mCF" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"mCH" = (
/obj/item/newspaper,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
+"mCQ" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"mDn" = (
/turf/open/floor/prison/green/northeast,
/area/fiorina/tumor/servers)
@@ -16383,18 +16626,6 @@
},
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"mDC" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/tumor/ice_lab)
-"mDG" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/blue/northeast,
-/area/fiorina/station/power_ring)
"mDS" = (
/obj/structure/bed/chair/comfy{
dir = 1
@@ -16428,6 +16659,14 @@
/obj/item/device/flashlight/on,
/turf/open/floor/prison/darkbrowncorners2/north,
/area/fiorina/tumor/aux_engi)
+"mFi" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"mFt" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
"mFS" = (
/obj/structure/cargo_container/grant/left,
/turf/open/floor/prison/floor_plate,
@@ -16473,13 +16712,10 @@
/obj/item/frame/rack,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"mIr" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/reagent_container/food/snacks/wrapped/barcardine,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
+"mIn" = (
+/obj/structure/machinery/fuelcell_recycler/full,
+/turf/open/floor/prison/bluecorner/west,
+/area/fiorina/station/power_ring/reactor)
"mIu" = (
/obj/effect/spawner/random/sentry/midchance,
/turf/open/floor/plating/prison,
@@ -16516,13 +16752,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"mJp" = (
-/obj/structure/monorail{
- name = "launch track"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/telecomm/lz1_tram)
"mJq" = (
/obj/item/trash/kepler,
/turf/open/floor/plating/prison,
@@ -16531,23 +16760,13 @@
/obj/item/device/flashlight/flare/on,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"mKa" = (
-/obj/structure/machinery/power/apc/power/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"mKd" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/showers_laundry)
-"mKh" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
+"mJO" = (
+/obj/structure/ice/thin/indestructible{
+ icon_state = "Straight"
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"mKo" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/effect/landmark/objective_landmark/close,
@@ -16560,6 +16779,14 @@
"mKx" = (
/turf/open/floor/prison/blue_plate,
/area/fiorina/station/botany)
+"mLq" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/bed/chair{
+ dir = 1;
+ layer = 2.7
+ },
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
"mLL" = (
/obj/item/tool/mop,
/turf/open/floor/prison/floor_plate,
@@ -16621,19 +16848,25 @@
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"mOc" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
+"mNX" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/item/storage/bible/hefa,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
"mOf" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ashtray/plastic,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"mOI" = (
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/showers_laundry)
+"mOr" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
"mOU" = (
/obj/structure/barricade/handrail/type_b{
dir = 4
@@ -16660,6 +16893,13 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"mPz" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/obj/structure/largecrate/random,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"mPW" = (
/obj/structure/prop/structure_lattice{
dir = 4;
@@ -16670,6 +16910,10 @@
"mPX" = (
/turf/open/floor/prison/darkbrown2/northeast,
/area/fiorina/station/park)
+"mQe" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/cell_stripe/east,
+/area/fiorina/station/security)
"mQy" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -16691,10 +16935,18 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
+"mQU" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"mQV" = (
/obj/item/tool/stamp,
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"mRz" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/darkbrown2,
+/area/fiorina/station/park)
"mRA" = (
/obj/structure/bed/chair/office/dark{
dir = 1
@@ -16708,10 +16960,6 @@
},
/turf/open/space,
/area/fiorina/oob)
-"mRR" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
"mRS" = (
/turf/open/floor/prison/darkpurple2/northeast,
/area/fiorina/station/central_ring)
@@ -16728,6 +16976,9 @@
/obj/item/weapon/gun/rifle/m16,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
+"mSF" = (
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/lowsec/showers_laundry)
"mSP" = (
/obj/effect/landmark/railgun_camera_pos,
/turf/open/floor/prison,
@@ -16736,18 +16987,6 @@
/obj/effect/alien/weeds/node,
/turf/open/floor/prison/darkbrown2,
/area/fiorina/tumor/aux_engi)
-"mTa" = (
-/obj/structure/ice/thin/indestructible{
- dir = 8;
- icon_state = "End"
- },
-/obj/structure/ice/thin/indestructible{
- dir = 8;
- icon_state = "End"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"mTl" = (
/obj/item/storage/box/gloves,
/turf/open/floor/prison/greenfull/northwest,
@@ -16758,17 +16997,16 @@
},
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
+"mTH" = (
+/obj/structure/prop/almayer/computers/sensor_computer1{
+ name = "computer"
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/lowsec/east)
"mTM" = (
/obj/item/tool/warning_cone,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"mUd" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/effect/decal/cleanable/blood/oil/streak,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"mUA" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/prison,
@@ -16815,16 +17053,23 @@
/obj/structure/largecrate/random,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/telecomm/lz1_tram)
-"mVE" = (
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/east)
"mVO" = (
/obj/item/tool/extinguisher,
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
+"mVV" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/cell_stripe/west,
+/area/fiorina/station/botany)
"mVY" = (
/turf/open/floor/prison/damaged2/southwest,
/area/fiorina/station/security)
+"mWj" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"mWs" = (
/obj/structure/prop/souto_land/streamer{
dir = 6
@@ -16859,6 +17104,12 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"mXC" = (
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
+"mXM" = (
+/turf/open/floor/prison/bluecorner/east,
+/area/fiorina/station/power_ring/reactor)
"mXS" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -16875,27 +17126,23 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/tumor/aux_engi)
-"mYz" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/whitegreen/east,
-/area/fiorina/tumor/ice_lab)
+"mYA" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/prison,
+/area/fiorina/station/research_cells/west)
"mYG" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/ship)
+"mZh" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/item/prop/almayer/handheld1,
+/obj/structure/surface/rack,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"mZo" = (
/obj/item/tool/shovel,
/turf/open/auto_turf/sand/layer1,
/area/fiorina/tumor/civres)
-"mZy" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/obj/effect/spawner/random/gun/smg/lowchance,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"mZH" = (
/obj/structure/stairs/perspective{
dir = 1;
@@ -16906,13 +17153,8 @@
"naf" = (
/turf/closed/shuttle/ert,
/area/fiorina/oob)
-"naj" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
-"naI" = (
-/obj/item/clothing/under/color/orange,
-/turf/open/floor/prison/yellow,
+"naU" = (
+/turf/open/floor/prison/yellowcorner/north,
/area/fiorina/station/lowsec/showers_laundry)
"naW" = (
/turf/closed/wall/r_wall/prison,
@@ -16921,10 +17163,27 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
+"nbr" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/blue/southeast,
+/area/fiorina/station/power_ring)
+"nbD" = (
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"nbP" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/yellow/north,
/area/fiorina/station/lowsec)
+"nbY" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ dir = 2;
+ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi'
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"ncb" = (
/turf/open/floor/prison/darkyellow2/southeast,
/area/fiorina/lz/near_lzI)
@@ -16955,6 +17214,14 @@
/obj/structure/machinery/vending/sovietsoda,
/turf/open/floor/prison/blue_plate/north,
/area/fiorina/station/botany)
+"ncE" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/bright_clean_marked/southwest,
+/area/fiorina/station/power_ring)
"ncF" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/whitegreen/west,
@@ -16972,19 +17239,13 @@
/obj/effect/spawner/random/pills/lowchance,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"ndC" = (
-/obj/structure/machinery/space_heater,
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreen/west,
-/area/fiorina/tumor/ice_lab)
+"ndo" = (
+/turf/closed/wall/prison,
+/area/fiorina/station/power_ring/reactor)
"ndD" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
-"ndQ" = (
-/obj/structure/machinery/recharge_station,
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/east)
"ndZ" = (
/obj/structure/machinery/constructable_frame{
icon_state = "box_1"
@@ -17004,6 +17265,10 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"nem" = (
+/obj/structure/window/framed/prison/reinforced,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"nez" = (
/obj/item/ammo_casing{
dir = 6;
@@ -17022,6 +17287,14 @@
"neY" = (
/turf/open/floor/prison/cell_stripe,
/area/fiorina/station/central_ring)
+"nfc" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"nfe" = (
/obj/effect/decal/cleanable/blood/writing{
icon_state = "u_psycopath_l";
@@ -17045,6 +17318,11 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
+"nfi" = (
+/obj/structure/closet/bodybag,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"nfu" = (
/obj/effect/decal/medical_decals{
icon_state = "cryomid"
@@ -17068,35 +17346,36 @@
name = "synthetic vegetation"
},
/area/fiorina/station/civres_blue)
-"ngg" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"ngn" = (
/obj/structure/machinery/deployable/barrier,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"ngo" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/barricade/handrail{
+"ngq" = (
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/east)
+"ngD" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/whitegreen/north,
+/area/fiorina/station/medbay)
+"ngX" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/showers_laundry)
+"nhi" = (
+/obj/structure/machinery/shower{
dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
+ pixel_y = -1
},
-/turf/open/space,
-/area/fiorina/oob)
-"ngF" = (
-/obj/item/device/flashlight/lamp/tripod,
/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"nhm" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
"nhM" = (
/obj/structure/barricade/handrail/type_b{
layer = 3.5
@@ -17125,6 +17404,12 @@
},
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"nig" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"nim" = (
/turf/open/floor/prison/darkyellowcorners2/north,
/area/fiorina/lz/near_lzI)
@@ -17134,18 +17419,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"niw" = (
-/obj/structure/barricade/handrail{
- dir = 8
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
-"niZ" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"njg" = (
/obj/effect/spawner/random/gun/rifle/lowchance,
/turf/open/floor/prison/darkyellow2/west,
@@ -17195,19 +17468,12 @@
},
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/station/medbay)
-"nkg" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"nkw" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"nkF" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/station/park)
@@ -17215,6 +17481,10 @@
/obj/structure/largecrate/supply/medicine/medkits,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"nkL" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/transit_hub)
"nkM" = (
/obj/item/stack/cable_coil,
/turf/open/floor/prison/darkpurple2,
@@ -17230,35 +17500,28 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"nlT" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
-"nlX" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/effect/landmark/corpsespawner/prisoner,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/east)
"nmh" = (
/obj/structure/window{
dir = 1
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"nmi" = (
-/obj/structure/machinery/door/airlock/almayer/marine{
+"nmq" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/disco/east_disco)
+"nmx" = (
+/obj/structure/prop/almayer/computers/sensor_computer1{
+ name = "computer"
+ },
+/obj/structure/machinery/light/double/blue{
dir = 1;
- icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'
+ pixel_y = 21
},
-/turf/open/floor/prison/floor_plate,
+/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/research_cells/west)
-"nmm" = (
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"nmy" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/prison/sterile_white/southwest,
@@ -17277,12 +17540,26 @@
/obj/item/toy/crayon/blue,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"nnr" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_full"
+"nmZ" = (
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
+"nnf" = (
+/obj/structure/largecrate/random/barrel/yellow,
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
},
-/turf/open/floor/plating/prison,
+/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/disco/east_disco)
+"nng" = (
+/obj/item/fuel_cell,
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"nny" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/trash/cigbutt/bcigbutt,
@@ -17293,6 +17570,13 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"nnD" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/research_cells/west)
"noa" = (
/obj/structure/largecrate/supply/supplies/plasteel,
/turf/open/floor/plating/prison,
@@ -17315,6 +17599,9 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
+"nqg" = (
+/turf/open/floor/prison/whitepurplecorner/east,
+/area/fiorina/station/research_cells/east)
"nqL" = (
/obj/structure/surface/rack,
/obj/item/reagent_container/spray/cleaner,
@@ -17342,6 +17629,14 @@
/obj/structure/surface/rack,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
+"nsg" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/tumor/ice_lab)
"nsm" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
/obj/structure/window/reinforced{
@@ -17351,13 +17646,6 @@
/obj/structure/medical_supply_link,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"nss" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/research_cells/west)
"nsD" = (
/obj/structure/prop/structure_lattice{
dir = 4;
@@ -17373,28 +17661,15 @@
"ntc" = (
/turf/open/floor/prison/green/east,
/area/fiorina/tumor/civres)
-"nte" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
"ntf" = (
/obj/item/implanter/compressed,
/obj/structure/safe,
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"ntv" = (
-/obj/structure/window/framed/prison,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"ntw" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/lz/near_lzI)
-"ntx" = (
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/disco/east_disco)
"ntE" = (
/obj/structure/barricade/handrail/type_b,
/turf/open/floor/prison/floor_plate,
@@ -17403,13 +17678,10 @@
/obj/structure/machinery/space_heater,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"ntW" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/machinery/autolathe/full{
- layer = 2.98
- },
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
+"ntQ" = (
+/obj/effect/spawner/random/goggles/midchance,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"ntZ" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -17429,6 +17701,11 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
+"nuf" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"nuo" = (
/obj/structure/bed/sofa/south/grey/left,
/turf/open/floor/prison/floor_plate,
@@ -17453,13 +17730,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/bluecorner/north,
/area/fiorina/station/chapel)
-"nvx" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"nvD" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/botany)
@@ -17468,32 +17738,29 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
+"nvM" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec)
"nvX" = (
/turf/open/floor/prison/blue/west,
/area/fiorina/station/power_ring)
"nvZ" = (
-/obj/structure/barricade/handrail/type_b{
- dir = 4;
- layer = 3.5
+/obj/structure/barricade/handrail,
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/east)
+"nwm" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
},
-/obj/structure/platform_decoration/metal/almayer/west,
+/obj/structure/platform/metal/almayer,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
+/area/fiorina/station/security)
"nwv" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/turf/open/floor/prison/darkbrown2/west,
/area/fiorina/tumor/aux_engi)
-"nwA" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/obj/structure/barricade/handrail/type_b{
- layer = 3.4
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/medbay)
"nwS" = (
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/prison/darkyellowfull2/east,
@@ -17525,9 +17792,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/chapel)
-"nxC" = (
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/power_ring/reactor)
"nxW" = (
/obj/structure/machinery/light/double/blue{
pixel_y = -1
@@ -17550,12 +17814,13 @@
/obj/item/stack/rods/plasteel,
/turf/open/floor/prison/floorscorched2,
/area/fiorina/station/security)
-"nyF" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
+"nyG" = (
+/obj/structure/barricade/metal/wired{
+ dir = 4
},
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/disco/east_disco)
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"nyO" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -17598,6 +17863,9 @@
},
/turf/open/floor/prison/chapel_carpet,
/area/fiorina/maintenance)
+"nAc" = (
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/east)
"nAf" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/book/manual/marine_law{
@@ -17608,17 +17876,12 @@
"nAm" = (
/turf/open/floor/prison/yellow/east,
/area/fiorina/lz/near_lzII)
-"nAs" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
-"nAK" = (
-/turf/open/floor/prison/yellowcorner/north,
-/area/fiorina/station/lowsec/showers_laundry)
-"nAV" = (
-/obj/structure/machinery/fuelcell_recycler/full,
-/turf/open/floor/prison/bluecorner/west,
-/area/fiorina/station/power_ring/reactor)
+"nAG" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"nBb" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -17659,18 +17922,6 @@
/obj/item/stack/rods,
/turf/open/floor/prison/yellow/northeast,
/area/fiorina/station/disco)
-"nCS" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
"nCV" = (
/obj/item/ammo_casing{
icon_state = "casing_7_1"
@@ -17680,6 +17931,13 @@
"nCX" = (
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"nDg" = (
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"nDq" = (
/obj/structure/bed/sofa/south/grey/left,
/turf/open/floor/prison/floor_plate,
@@ -17693,12 +17951,15 @@
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
"nDu" = (
-/obj/structure/toilet{
- dir = 4;
- pixel_y = 8
+/obj/structure/machinery/door/airlock/prison/horizontal{
+ dir = 4
},
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/east)
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
+"nDx" = (
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"nDI" = (
/obj/item/stack/tile/plasteel,
/turf/open/floor/prison/floor_plate,
@@ -17711,21 +17972,21 @@
/obj/item/device/flashlight,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
+"nEE" = (
+/obj/structure/largecrate/supply/supplies/flares,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"nEI" = (
/obj/structure/machinery/deployable/barrier,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"nEN" = (
-/obj/item/clothing/glasses/material,
-/obj/structure/barricade/handrail,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
-"nEP" = (
-/obj/structure/closet,
-/obj/item/reagent_container/spray/cleaner,
-/obj/item/stack/sheet/plasteel/small_stack,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
+"nEL" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/tumor/ice_lab)
"nEW" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/communications{
@@ -17733,6 +17994,9 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
+"nFa" = (
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/east)
"nFb" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/fancy/cigarettes/emeraldgreen,
@@ -17758,36 +18022,19 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"nGf" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
+"nFP" = (
+/turf/open/floor/prison/sterile_white/west,
+/area/fiorina/station/lowsec/east)
+"nGv" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"nGy" = (
/obj/item/newspaper,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
-"nGB" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
-"nGO" = (
-/obj/structure/largecrate/random/barrel/yellow,
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
-"nGV" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/west)
"nGZ" = (
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
@@ -17796,6 +18043,10 @@
/obj/item/storage/fancy/cigar,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/station/chapel)
+"nHC" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"nHZ" = (
/turf/closed/shuttle/ert{
icon_state = "wy_rightengine"
@@ -17833,31 +18084,32 @@
},
/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/security)
-"nIJ" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
-"nIU" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"nJu" = (
/obj/item/stack/rods,
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
+"nJw" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/obj/item/tool/pickaxe,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/tumor/ice_lab)
+"nJF" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
+"nJM" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/flight_deck)
"nJT" = (
/obj/structure/inflatable/popped/door,
/turf/open/floor/prison/whitegreen/west,
/area/fiorina/station/medbay)
-"nKf" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"nKo" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/microwave{
@@ -17882,18 +18134,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"nKZ" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
-"nLO" = (
-/obj/structure/window/framed/prison/reinforced/hull,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
+"nLv" = (
+/obj/item/stack/sheet/cardboard,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"nLS" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/condiment/saltshaker{
@@ -17938,21 +18182,12 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/ice_lab)
-"nMZ" = (
-/obj/structure/ice/thin/indestructible,
-/obj/structure/prop/invuln{
- desc = "Its eyes follow you around through the ice.";
- dir = 4;
- icon = 'icons/mob/xenos/queen.dmi';
- icon_state = "Normal Queen Knocked Down";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = -15;
- pixel_y = -16
+"nNy" = (
+/obj/structure/bed/chair{
+ dir = 8
},
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/tumor/ice_lab)
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"nNJ" = (
/obj/structure/surface/rack,
/turf/open/floor/plating/prison,
@@ -18004,6 +18239,13 @@
/obj/item/clothing/glasses/gglasses,
/turf/open/space,
/area/fiorina/oob)
+"nPn" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"nPA" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -18050,6 +18292,20 @@
/obj/item/tool/kitchen/knife/butcher,
/turf/open/floor/prison/kitchen,
/area/fiorina/station/power_ring)
+"nRa" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/tumor/ice_lab)
+"nRj" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
+"nRl" = (
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
"nRQ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/condiment/saltshaker{
@@ -18066,9 +18322,19 @@
/obj/structure/closet/emcloset,
/turf/open/floor/prison/whitegreen/southeast,
/area/fiorina/station/medbay)
-"nSx" = (
-/turf/closed/wall/r_wall/prison,
-/area/fiorina/station/disco/east_disco)
+"nRW" = (
+/obj/structure/bed/chair,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip{
+ icon_state = "2"
+ },
+/obj/effect/decal/cleanable/blood/drip{
+ icon_state = "4"
+ },
+/obj/item/prop/helmetgarb/flair_initech,
+/obj/effect/landmark/corpsespawner/scientist,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"nSS" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/dropper,
@@ -18102,61 +18368,37 @@
},
/turf/open/floor/prison,
/area/fiorina/station/park)
-"nUh" = (
-/turf/open/floor/prison/yellow/west,
-/area/fiorina/station/lowsec/east)
"nUm" = (
/obj/structure/barricade/wooden,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
-"nUr" = (
-/obj/structure/ice/thin/indestructible,
-/obj/structure/prop/invuln{
- desc = "It is slimy.";
- dir = 4;
- icon = 'icons/mob/xenos/sentinel.dmi';
- icon_state = "Normal Sentinel Knocked Down";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = -22;
- pixel_y = 8
- },
-/obj/structure/prop/invuln{
- desc = "He knows something that you don't.";
- dir = 4;
- icon = 'icons/mob/xenos/larva.dmi';
- icon_state = "Larva Sleeping";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = 8;
- pixel_y = -18
+"nUG" = (
+/obj/structure/closet/secure_closet/security,
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/disco/east_disco)
+"nUH" = (
+/obj/item/shard{
+ icon_state = "medium";
+ name = "ice shard"
},
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreen/west,
/area/fiorina/tumor/ice_lab)
"nUJ" = (
/obj/effect/spawner/random/technology_scanner,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"nUP" = (
+/obj/structure/machinery/door/airlock/prison/horizontal{
+ dir = 4
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"nUS" = (
/obj/structure/machinery/computer3/server/rack,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"nVu" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/obj/structure/largecrate/random/case/double,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
-"nVE" = (
-/obj/item/stack/tile/plasteel,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
-"nVK" = (
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/east)
"nVN" = (
/obj/item/trash/cigbutt,
/turf/open/floor/prison/floor_plate,
@@ -18217,6 +18459,9 @@
/obj/item/weapon/gun/smg/mp5,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzII)
+"nXL" = (
+/turf/closed/wall/r_wall/prison,
+/area/fiorina/station/disco/east_disco)
"nXX" = (
/obj/item/stack/medical/bruise_pack,
/turf/open/floor/prison,
@@ -18237,10 +18482,12 @@
/obj/item/tool/wrench,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"nYQ" = (
-/obj/structure/platform/metal/almayer,
+"nZk" = (
+/obj/structure/barricade/metal/wired{
+ dir = 4
+ },
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+/area/fiorina/station/lowsec/east)
"nZB" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
@@ -18265,10 +18512,28 @@
"oaa" = (
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
-"oaD" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/whitegreen/north,
+"oah" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
+"oas" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
+"oaw" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"obh" = (
/obj/structure/window/framed/prison/reinforced,
/turf/open/floor/prison,
@@ -18287,14 +18552,6 @@
},
/turf/closed/wall/prison,
/area/fiorina/tumor/civres)
-"obQ" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/telecomm/lz1_tram)
"occ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/drinks/cans/souto/lime{
@@ -18322,16 +18579,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"ocW" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space,
-/area/fiorina/oob)
+"ocA" = (
+/obj/structure/closet/wardrobe/orange,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"ode" = (
/obj/structure/stairs/perspective{
dir = 8;
@@ -18354,17 +18605,6 @@
"odC" = (
/turf/open/floor/prison/platingdmg1,
/area/fiorina/tumor/civres)
-"odQ" = (
-/obj/structure/largecrate/supply,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
-"oeh" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/lowsec/east)
"oer" = (
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
@@ -18372,6 +18612,12 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/civres)
+"oeD" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"oeN" = (
/obj/effect/landmark/corpsespawner/prison_security,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -18386,6 +18632,15 @@
},
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/civres)
+"oeU" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/obj/structure/reagent_dispensers/fueltank{
+ layer = 2.6
+ },
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"oeV" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/blue_plate/west,
@@ -18419,10 +18674,6 @@
},
/turf/open/floor/prison/whitegreen/northeast,
/area/fiorina/station/medbay)
-"ogc" = (
-/obj/item/reagent_container/food/drinks/cans/aspen,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"ogf" = (
/obj/structure/monorail{
name = "launch track"
@@ -18437,14 +18688,18 @@
/obj/item/clothing/head/helmet/marine/veteran/ua_riot,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
+"ohd" = (
+/obj/structure/barricade/sandbags{
+ icon_state = "sandbag_0";
+ layer = 2.97;
+ pixel_y = -14
+ },
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/disco/east_disco)
"ohl" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/darkpurple2/north,
/area/fiorina/station/central_ring)
-"oht" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
"ohx" = (
/obj/item/tool/match,
/turf/open/floor/prison/redfull,
@@ -18522,6 +18777,9 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
+"oka" = (
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/east)
"okg" = (
/obj/structure/barricade/handrail/type_b{
dir = 1
@@ -18538,74 +18796,10 @@
},
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"okF" = (
-/obj/structure/blocker/invisible_wall,
-/obj/structure/ice/thin/indestructible,
-/obj/structure/prop/invuln{
- desc = "The underside softly pulses.";
- dir = 4;
- icon = 'icons/mob/xenos/xenonid_crab.dmi';
- icon_state = "facehugger_thrown";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = -22;
- pixel_y = -10
- },
-/obj/structure/prop/invuln{
- desc = "The underside softly pulses.";
- dir = 4;
- icon = 'icons/mob/xenos/xenonid_crab.dmi';
- icon_state = "facehugger_thrown";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = 22;
- pixel_y = 8
- },
-/obj/structure/prop/invuln{
- desc = "The underside softly pulses.";
- dir = 4;
- icon = 'icons/mob/xenos/xenonid_crab.dmi';
- icon_state = "facehugger_thrown";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = -22;
- pixel_y = 8
- },
-/obj/structure/prop/invuln{
- desc = "The underside softly pulses.";
- dir = 4;
- icon = 'icons/mob/xenos/xenonid_crab.dmi';
- icon_state = "facehugger_thrown";
- layer = 2.5;
- name = "frozen creature";
- pixel_x = 22;
- pixel_y = -10
- },
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
-"okG" = (
-/obj/structure/barricade/deployable{
- dir = 4
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
-"okJ" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/machinery/shower{
- dir = 8
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
-"okQ" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/bright_clean_marked/southwest,
-/area/fiorina/station/power_ring)
+"okR" = (
+/obj/effect/decal/cleanable/blood/gibs/robot/limb,
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/east)
"okT" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/plating/prison,
@@ -18648,13 +18842,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
-"olB" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/tumor/ice_lab)
"omb" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/structure/machinery/computer/guestpass,
@@ -18681,6 +18868,9 @@
/obj/structure/barricade/wooden,
/turf/open/floor/prison/cell_stripe,
/area/fiorina/station/medbay)
+"omS" = (
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec/east)
"onb" = (
/obj/structure/bed/chair{
dir = 8
@@ -18712,12 +18902,10 @@
},
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/lz/near_lzI)
-"onW" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
+"onY" = (
+/obj/structure/bed/chair,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"oou" = (
/obj/structure/closet/emcloset,
/obj/item/clothing/head/cmcap{
@@ -18729,36 +18917,27 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"oox" = (
-/obj/structure/bed/chair,
-/turf/open/floor/prison/bluecorner,
-/area/fiorina/station/power_ring/reactor)
"ooF" = (
/obj/structure/machinery/power/apc/power/south,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"ooO" = (
-/obj/item/storage/briefcase/inflatable,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
-"ope" = (
+"opb" = (
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
+/obj/item/tool/crowbar/red,
/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
+ icon_state = "p_stair_ew_full_cap"
},
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/prison/cell_stripe/east,
+/area/fiorina/station/medbay)
"oph" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/reagent_container/food/drinks/bottle/holywater,
/obj/item/reagent_container/food/drinks/bottle/holywater,
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/station/chapel)
-"opj" = (
-/obj/effect/decal/cleanable/blood/gibs,
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/east)
"opM" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/bluefull,
@@ -18806,18 +18985,6 @@
/obj/item/tool/weldingtool,
/turf/open/auto_turf/sand/layer1,
/area/fiorina/tumor/civres)
-"osu" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/transit_hub)
-"osN" = (
-/obj/structure/closet/bodybag,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"osQ" = (
/obj/structure/bed{
icon_state = "abed"
@@ -18825,14 +18992,6 @@
/obj/item/bedsheet/green,
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/lowsec)
-"osS" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/security)
"osX" = (
/obj/structure/cable/heavyduty{
icon_state = "0-4"
@@ -18865,10 +19024,6 @@
"otK" = (
/turf/open/floor/prison/floor_marked/west,
/area/fiorina/tumor/servers)
-"otS" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
"ouH" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/med_data/laptop{
@@ -18876,10 +19031,11 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"ovb" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
+"ouP" = (
+/obj/structure/closet/bodybag,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"ovk" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/whitegreencorner/east,
@@ -18900,10 +19056,6 @@
},
/turf/open/floor/prison/chapel_carpet/doubleside/north,
/area/fiorina/station/chapel)
-"owc" = (
-/obj/structure/window/framed/prison,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
"owd" = (
/obj/item/storage/backpack/souto,
/turf/open/floor/prison,
@@ -18912,24 +19064,6 @@
/obj/effect/landmark/static_comms/net_two,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
-"owz" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/greenblue/southeast,
-/area/fiorina/station/botany)
-"owI" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/chapel)
-"owS" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
"oxv" = (
/obj/effect/alien/weeds/node,
/turf/open/floor/prison/floor_plate,
@@ -18943,14 +19077,6 @@
/obj/structure/largecrate/random/case/small,
/turf/open/floor/corsat/plate,
/area/fiorina/tumor/aux_engi)
-"oxR" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/tumor/servers)
"oxS" = (
/obj/item/paper/crumpled/bloody,
/turf/open/floor/prison/chapel_carpet/doubleside,
@@ -18966,12 +19092,10 @@
/obj/structure/flora/pottedplant/random,
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"oyy" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
+"oyA" = (
+/obj/structure/sign/nosmoking_1,
+/turf/closed/wall/prison,
+/area/fiorina/station/disco/east_disco)
"oyC" = (
/obj/structure/bed/sofa/south/grey/right,
/turf/open/floor/wood,
@@ -18997,11 +19121,6 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"ozB" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space,
-/area/fiorina/oob)
"ozC" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_29";
@@ -19019,45 +19138,27 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"oBc" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+"oAl" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
+"oAH" = (
+/obj/item/stack/rods/plasteel,
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"oBj" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"oBC" = (
-/obj/structure/ice/thin/indestructible{
- dir = 4;
- icon_state = "Corner"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"oCe" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/park)
"oCf" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"oCH" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/park)
-"oCM" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
+/obj/item/clothing/under/color/orange,
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
"oDe" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/plating/prison,
@@ -19080,14 +19181,6 @@
/obj/item/stack/rods,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"oDH" = (
-/obj/item/device/flashlight/lamp/tripod,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"oDV" = (
/obj/item/stack/rods,
/turf/open/floor/prison/whitegreen/west,
@@ -19105,16 +19198,14 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
+"oEC" = (
+/obj/effect/landmark/corpsespawner/ua_riot,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"oED" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"oEE" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/gm/river/desert/deep,
-/area/fiorina/lz/near_lzII)
"oEH" = (
/obj/structure/stairs/perspective{
dir = 4;
@@ -19151,6 +19242,15 @@
},
/turf/open/floor/prison/greenblue,
/area/fiorina/station/botany)
+"oEY" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
+ },
+/obj/item/clothing/gloves/combat,
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"oFf" = (
/obj/item/reagent_container/food/drinks/cans/aspen,
/turf/open/floor/prison/floor_plate,
@@ -19196,6 +19296,12 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/turf/open/floor/prison/darkbrown2/east,
/area/fiorina/tumor/aux_engi)
+"oGF" = (
+/obj/structure/stairs/perspective,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/medbay)
"oGR" = (
/obj/structure/machinery/landinglight/ds1/delaythree{
dir = 1
@@ -19209,14 +19315,13 @@
},
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"oHe" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/wood,
-/area/fiorina/station/park)
-"oHi" = (
-/obj/item/stool,
-/turf/open/floor/prison,
+"oGZ" = (
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/disco/east_disco)
+"oHl" = (
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"oHm" = (
/turf/open/floor/prison/darkbrown2/northeast,
/area/fiorina/tumor/aux_engi)
@@ -19283,17 +19388,6 @@
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/prison/green/southeast,
/area/fiorina/tumor/civres)
-"oKn" = (
-/obj/structure/holohoop{
- dir = 4;
- id = "basketball";
- side = "left"
- },
-/obj/structure/barricade/handrail{
- dir = 8
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"oKq" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/plating/prison,
@@ -19302,9 +19396,6 @@
/obj/structure/machinery/door/airlock/multi_tile/elevator/freight,
/turf/open/floor/corsat/plate,
/area/fiorina/station/civres_blue)
-"oLE" = (
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"oLF" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/darkbrown2,
@@ -19318,11 +19409,6 @@
/obj/structure/largecrate/random/secure,
/turf/open/floor/prison,
/area/fiorina/station/chapel)
-"oLX" = (
-/obj/structure/surface/rack,
-/obj/item/tank/emergency_oxygen/engi,
-/turf/open/floor/prison/bluecorner,
-/area/fiorina/station/power_ring/reactor)
"oMf" = (
/obj/structure/bed/chair/comfy,
/turf/open/floor/prison/floor_plate,
@@ -19331,51 +19417,12 @@
/obj/effect/landmark/survivor_spawner,
/turf/open/floor/prison,
/area/fiorina/station/park)
-"oMw" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 8
- },
-/obj/item/prop/helmetgarb/spacejam_tickets{
- desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
- name = "\improper arcade tickets";
- pixel_x = 1;
- pixel_y = -1
- },
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/west)
-"oMI" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/effect/decal/cleanable/blood/splatter{
- icon_state = "gibup1"
- },
-/turf/open/floor/prison/whitegreen/north,
-/area/fiorina/station/medbay)
-"oMW" = (
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/showers_laundry)
-"oNn" = (
-/obj/structure/platform/metal/almayer,
-/obj/item/stack/sheet/metal,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
"oNu" = (
/obj/structure/barricade/handrail/type_b{
layer = 3.4
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"oNx" = (
-/obj/structure/barricade/handrail{
- dir = 4
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
-"oNC" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"oOh" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/cameras{
@@ -19402,14 +19449,6 @@
/obj/structure/machinery/vending/coffee,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
-"oOU" = (
-/obj/structure/reagent_dispensers/water_cooler{
- density = 0;
- pixel_x = -8;
- pixel_y = 16
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"oOV" = (
/obj/structure/machinery/filtration/console{
pixel_y = 22
@@ -19420,14 +19459,10 @@
/obj/structure/bed/roller,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"oPH" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
-"oPN" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
+"oPK" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"oPR" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/disco)
@@ -19442,14 +19477,10 @@
/obj/structure/inflatable/popped,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"oQp" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
+"oQy" = (
+/obj/structure/closet/bodybag,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"oQI" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
@@ -19459,30 +19490,30 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"oQS" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
"oRg" = (
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/station/telecomm/lz1_cargo)
+"oRL" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"oRR" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"oSn" = (
-/obj/structure/inflatable/door,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/lowsec/showers_laundry)
"oSz" = (
/obj/item/shard{
icon_state = "medium"
},
/turf/open/floor/prison/yellow/northwest,
/area/fiorina/station/disco)
+"oSU" = (
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
"oTa" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ashtray/plastic,
@@ -19495,13 +19526,6 @@
"oTi" = (
/turf/open/floor/prison/whitegreen,
/area/fiorina/station/medbay)
-"oTx" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/bright_clean2/southwest,
-/area/fiorina/station/power_ring/reactor)
"oTy" = (
/obj/structure/prop/structure_lattice{
health = 300
@@ -19522,19 +19546,16 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/civres_blue)
-"oTL" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
"oTP" = (
/turf/open/floor/prison/darkyellow2/southwest,
/area/fiorina/station/telecomm/lz1_tram)
"oUg" = (
/turf/closed/wall/prison,
/area/fiorina/station/telecomm/lz1_cargo)
+"oUF" = (
+/obj/item/stack/cable_coil,
+/turf/open/floor/prison/blue/northeast,
+/area/fiorina/station/power_ring/reactor)
"oUP" = (
/obj/structure/lattice,
/obj/effect/landmark/nightmare{
@@ -19549,10 +19570,6 @@
"oWw" = (
/turf/open/floor/prison/darkbrowncorners2/east,
/area/fiorina/station/park)
-"oWC" = (
-/obj/item/stack/sandbags/large_stack,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
"oWF" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
@@ -19614,6 +19631,10 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"oYu" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/wood,
+/area/fiorina/station/park)
"oYG" = (
/obj/structure/stairs/perspective{
dir = 4;
@@ -19629,12 +19650,6 @@
},
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"oYX" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/prison/whitegreen/northeast,
-/area/fiorina/tumor/ice_lab)
"oZf" = (
/obj/structure/surface/rack,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -19644,13 +19659,13 @@
/obj/item/clothing/under/color/orange,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"oZj" = (
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"oZk" = (
/turf/open/floor/prison/darkpurple2/southwest,
/area/fiorina/tumor/ice_lab)
+"oZv" = (
+/obj/structure/platform_decoration/metal/kutjevo/east,
+/turf/open/space,
+/area/fiorina/oob)
"oZx" = (
/obj/item/trash/used_stasis_bag{
desc = "Wow, instant sand. They really have everything in space.";
@@ -19673,10 +19688,6 @@
/obj/item/clipboard,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"oZU" = (
-/obj/structure/largecrate/random/case,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"pab" = (
/obj/item/tool/weldpack{
pixel_x = 6
@@ -19693,17 +19704,6 @@
},
/turf/open/floor/prison/whitegreen,
/area/fiorina/station/medbay)
-"pai" = (
-/obj/structure/machinery/cm_vending/sorted/marine_food{
- desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society.";
- name = "\improper Fiorina Green Block Canteen Vendor"
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"pak" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/tumor/ice_lab)
"paF" = (
/obj/item/tool/shovel/etool,
/turf/open/floor/prison/floor_plate,
@@ -19714,6 +19714,14 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
+"paK" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/central_ring)
"paO" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/cameras{
@@ -19721,10 +19729,6 @@
},
/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/security)
-"pbo" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/chapel_carpet/doubleside,
-/area/fiorina/station/chapel)
"pbp" = (
/obj/structure/machinery/door/airlock/multi_tile/elevator/freight,
/turf/open/floor/corsat/plate,
@@ -19740,6 +19744,11 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
+"pbJ" = (
+/obj/structure/lattice,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space,
+/area/fiorina/oob)
"pbX" = (
/turf/open/floor/prison/red,
/area/fiorina/station/security)
@@ -19750,6 +19759,9 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"pco" = (
+/turf/open/floor/prison/whitepurplecorner/west,
+/area/fiorina/station/research_cells/east)
"pcu" = (
/turf/open/floor/almayer_hull,
/area/fiorina/oob)
@@ -19759,17 +19771,18 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
-"pcN" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
-"pdq" = (
-/obj/vehicle/powerloader,
-/obj/structure/platform/metal/almayer/west,
+"pdb" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/tumor/ice_lab)
+"pds" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
+/area/fiorina/station/transit_hub)
"pdB" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -19789,16 +19802,31 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
+"pdR" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"pdX" = (
/obj/structure/flora/bush/ausbushes/grassybush{
icon_state = "lavendergrass_1"
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/central_ring)
+"pei" = (
+/obj/item/stool,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"pen" = (
/obj/structure/bed/sofa/vert/grey/bot,
/turf/open/floor/prison/green,
/area/fiorina/station/transit_hub)
+"pes" = (
+/turf/closed/wall/prison,
+/area/fiorina/station/disco/east_disco)
+"pex" = (
+/obj/item/stool,
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/showers_laundry)
"peA" = (
/obj/structure/machinery/computer/communications{
dir = 4;
@@ -19813,6 +19841,16 @@
},
/turf/open/floor/prison/darkyellow2,
/area/fiorina/station/telecomm/lz1_cargo)
+"pfk" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform_decoration/metal/kutjevo,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space/basic,
+/area/fiorina/oob)
"pgb" = (
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/ice_lab)
@@ -19830,10 +19868,6 @@
/obj/structure/girder,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"pho" = (
-/obj/item/stack/sheet/wood,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"phz" = (
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
@@ -19841,22 +19875,13 @@
/obj/item/newspaper,
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/tumor/ice_lab)
-"pim" = (
+"phM" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
-/turf/open/floor/prison/redfull,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
+"pik" = (
+/turf/open/floor/prison/yellowcorner/north,
/area/fiorina/station/lowsec/east)
-"piC" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/closed/wall/mineral/bone_resin,
-/area/fiorina/tumor/ice_lab)
-"piV" = (
-/obj/item/shard{
- icon_state = "large";
- name = "ice shard"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreen/west,
-/area/fiorina/tumor/ice_lab)
"pjf" = (
/obj/item/ammo_magazine/rifle/m16,
/obj/item/clothing/head/helmet/marine/veteran/ua_riot,
@@ -19865,6 +19890,12 @@
"pjg" = (
/turf/open/floor/prison/green/northwest,
/area/fiorina/tumor/servers)
+"pjn" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"pjE" = (
/obj/structure/filingcabinet/filingcabinet{
pixel_x = 8
@@ -19921,6 +19952,11 @@
/obj/structure/foamed_metal,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
+"pmf" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/effect/spawner/random/toolbox,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"pmn" = (
/obj/structure/surface/rack,
/obj/item/poster,
@@ -19948,36 +19984,50 @@
"pnh" = (
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/tumor/servers)
-"pnn" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
"pnx" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"pnP" = (
-/obj/effect/landmark/corpsespawner/ua_riot,
-/turf/open/floor/prison/floor_plate,
+"pnC" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
+ },
+/obj/item/stool{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/turf/open/floor/prison/yellowfull,
/area/fiorina/station/lowsec/east)
"pnS" = (
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/tumor/servers)
-"pom" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/barricade/handrail{
+"poR" = (
+/obj/structure/machinery/light/double/blue{
dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
+ pixel_y = 21
},
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
-"poC" = (
-/obj/structure/machinery/photocopier,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
+"poT" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/folder/red{
+ pixel_x = 4;
+ pixel_y = -2
+ },
+/obj/item/folder/red{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/tool/stamp,
/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/lowsec/east)
+"ppf" = (
+/obj/structure/bed/chair/office/light{
+ dir = 8
+ },
+/turf/open/floor/wood,
/area/fiorina/station/research_cells/west)
"ppq" = (
/obj/structure/surface/table/reinforced/prison,
@@ -19987,6 +20037,18 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"ppr" = (
+/obj/structure/machinery/portable_atmospherics/powered/pump,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
+"ppF" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/flight_deck)
"ppG" = (
/obj/item/stack/rods/plasteel,
/turf/open/floor/plating/prison,
@@ -20016,10 +20078,6 @@
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"pqz" = (
-/obj/item/clothing/suit/storage/labcoat,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"pqC" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
@@ -20036,6 +20094,13 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
+"prc" = (
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/east)
+"pre" = (
+/obj/item/stool,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"prh" = (
/obj/structure/girder/reinforced,
/turf/open/floor/almayer/plating/northeast,
@@ -20070,12 +20135,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/central_ring)
-"psG" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"psL" = (
/obj/structure/machinery/optable{
desc = "This maybe could be used for advanced medical procedures.";
@@ -20098,6 +20157,16 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"ptd" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/turf/open/space/basic,
+/area/fiorina/oob)
"pte" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison_unmeltable,
@@ -20115,14 +20184,6 @@
/obj/item/clothing/gloves/latex,
/turf/open/floor/prison/redfull,
/area/fiorina/station/medbay)
-"pud" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/medbay)
"puw" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plating/prison,
@@ -20137,6 +20198,10 @@
},
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/lz/near_lzI)
+"pvm" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"pvz" = (
/obj/structure/janitorialcart,
/obj/structure/machinery/light/double/blue{
@@ -20151,13 +20216,15 @@
name = "metal wall"
},
/area/fiorina/oob)
-"pvE" = (
-/obj/item/clothing/under/color/orange,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"pvF" = (
/turf/open/floor/prison/whitegreencorner,
/area/fiorina/tumor/ice_lab)
+"pwb" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/turf/open/floor/prison/blue/northwest,
+/area/fiorina/station/power_ring/reactor)
"pwo" = (
/obj/structure/bed/chair/comfy{
dir = 1
@@ -20186,6 +20253,10 @@
/obj/item/reagent_container/syringe,
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
+"pxo" = (
+/obj/effect/landmark/objective_landmark/far,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"pxr" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/donut_box{
@@ -20193,20 +20264,9 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"pxu" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/transit_hub)
"pxL" = (
/turf/open/floor/prison/darkbrown2/east,
/area/fiorina/maintenance)
-"pxX" = (
-/obj/structure/largecrate/random/case/double,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
"pyK" = (
/obj/structure/machinery/door/airlock/multi_tile/elevator/freight,
/turf/open/floor/corsat/plate,
@@ -20215,15 +20275,37 @@
/obj/item/toy/beach_ball,
/turf/open/gm/river/red_pool,
/area/fiorina/station/park)
+"pzl" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
"pzE" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/whitegreen,
/area/fiorina/station/medbay)
+"pzK" = (
+/obj/item/stack/sheet/metal/medium_stack,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"pzL" = (
/obj/item/ammo_magazine/m56d,
/obj/item/ammo_magazine/m56d,
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/central_ring)
+"pzR" = (
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/turf/open/space,
+/area/fiorina/oob)
"pAl" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/prison/blue_plate/west,
@@ -20232,6 +20314,10 @@
/obj/structure/largecrate/random,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/station/park)
+"pAu" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/darkpurple2,
+/area/fiorina/tumor/servers)
"pBb" = (
/obj/structure/curtain/open/black,
/turf/open/floor/prison,
@@ -20240,22 +20326,25 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/green/east,
/area/fiorina/station/chapel)
-"pBj" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/obj/structure/machinery/light/double/blue{
+"pBg" = (
+/obj/structure/blocker/invisible_wall,
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/ice/thin/indestructible{
dir = 1;
- pixel_y = 21
+ icon_state = "Corner"
},
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
+/turf/open/ice/noweed,
+/area/fiorina/tumor/ice_lab)
"pBq" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
+"pBB" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"pBT" = (
/obj/structure/barricade/metal{
health = 250;
@@ -20286,6 +20375,10 @@
/obj/structure/blocker/invisible_wall,
/turf/open/ice/noweed,
/area/fiorina/tumor/ice_lab)
+"pCz" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
"pCG" = (
/obj/structure/largecrate/random/case,
/turf/open/floor/prison,
@@ -20297,26 +20390,22 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"pCQ" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/obj/item/stool{
- pixel_x = 4;
- pixel_y = 6
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"pCX" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
-"pDo" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
- icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
+"pDb" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/machinery/autolathe/full{
+ layer = 2.98
},
-/turf/open/floor/prison/sterile_white/southwest,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
+"pDJ" = (
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
/area/fiorina/station/research_cells/west)
"pDQ" = (
/obj/structure/bed/sofa/south/grey/right,
@@ -20325,6 +20414,9 @@
"pEt" = (
/turf/open/floor/prison/darkbrown2/northwest,
/area/fiorina/maintenance)
+"pEK" = (
+/turf/open/auto_turf/sand/layer1,
+/area/fiorina/station/disco/east_disco)
"pFc" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/prison/floor_plate,
@@ -20333,14 +20425,10 @@
/obj/item/storage/toolbox/emergency,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"pFB" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/gm/river/red_pool,
-/area/fiorina/station/park)
-"pFE" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/floor/almayer_hull,
-/area/fiorina/oob)
+"pFK" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/cell_stripe/west,
+/area/fiorina/station/security)
"pFP" = (
/obj/structure/ice/thin/indestructible{
dir = 4;
@@ -20365,13 +20453,6 @@
icon_state = "stan_white_t_up"
},
/area/fiorina/tumor/ship)
-"pGS" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"pHh" = (
/obj/structure/ice/thin/indestructible{
dir = 4;
@@ -20391,12 +20472,9 @@
/obj/structure/machinery/space_heater,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/ice_lab)
-"pHx" = (
-/obj/structure/barricade/metal/wired{
- dir = 4
- },
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/floor_plate,
+"pHA" = (
+/obj/structure/largecrate/supply/supplies/mre,
+/turf/open/floor/prison/yellowfull,
/area/fiorina/station/lowsec/east)
"pIs" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
@@ -20419,6 +20497,13 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
+"pIy" = (
+/obj/structure/barricade/wooden{
+ dir = 8
+ },
+/obj/structure/barricade/wooden,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"pIA" = (
/obj/structure/prop/structure_lattice{
dir = 4
@@ -20433,6 +20518,9 @@
"pJc" = (
/turf/open/floor/wood,
/area/fiorina/maintenance)
+"pJG" = (
+/turf/open/floor/prison/cell_stripe,
+/area/fiorina/station/research_cells/west)
"pJK" = (
/obj/structure/surface/rack,
/obj/item/reagent_container/glass/bucket/mopbucket,
@@ -20456,6 +20544,11 @@
/obj/item/tool/wet_sign,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"pKC" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"pKJ" = (
/obj/structure/flora/grass/tallgrass/jungle/corner,
/obj/structure/barricade/wooden{
@@ -20473,14 +20566,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"pKV" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/park)
"pKY" = (
/obj/structure/cable/heavyduty{
icon_state = "2-4"
@@ -20495,13 +20580,6 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"pLE" = (
-/obj/structure/machinery/washing_machine,
-/obj/structure/machinery/washing_machine{
- pixel_y = 15
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"pLM" = (
/obj/item/trash/cigbutt,
/turf/open/floor/prison/blue/west,
@@ -20514,26 +20592,25 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/greencorner/west,
/area/fiorina/tumor/aux_engi)
-"pMr" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/box/cups,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+"pMD" = (
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
+"pMZ" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec/showers_laundry)
"pNj" = (
/obj/structure/bookcase,
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"pNp" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/turf/open/space/basic,
-/area/fiorina/oob)
+"pNl" = (
+/obj/item/stack/sheet/mineral/plastic,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"pNG" = (
/obj/structure/closet/crate/science{
density = 0;
@@ -20565,6 +20642,13 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"pPg" = (
+/obj/structure/bed/chair{
+ dir = 1;
+ layer = 2.7
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"pPo" = (
/obj/effect/landmark/corpsespawner/ua_riot/burst,
/turf/open/floor/prison/darkpurple2/north,
@@ -20579,30 +20663,37 @@
},
/turf/closed/wall/prison,
/area/fiorina/tumor/servers)
-"pQc" = (
-/obj/structure/closet/basketball,
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
-"pQm" = (
+"pPK" = (
/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
},
-/obj/structure/platform/metal/stair_cut/platform_right,
/turf/open/floor/plating/prison,
-/area/fiorina/station/telecomm/lz1_tram)
+/area/fiorina/lz/near_lzI)
+"pQr" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/central_ring)
"pQs" = (
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
+"pQy" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"pQz" = (
/turf/open/floor/prison/bluecorner/west,
/area/fiorina/station/civres_blue)
-"pRa" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
+"pRh" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/showers_laundry)
"pRx" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/prison,
@@ -20621,10 +20712,6 @@
/obj/item/weapon/wirerod,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
-"pRM" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/park)
"pSr" = (
/obj/structure/pipes/standard/manifold/visible,
/turf/open/floor/prison/sterile_white/southwest,
@@ -20657,14 +20744,6 @@
dir = 5
},
/area/fiorina/station/telecomm/lz1_cargo)
-"pUD" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"pUG" = (
-/obj/item/stack/rods,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"pUO" = (
/obj/item/trash/boonie,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -20694,10 +20773,6 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/wood,
/area/fiorina/station/chapel)
-"pVY" = (
-/obj/item/stack/sheet/mineral/plastic,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/east)
"pWc" = (
/obj/item/tool/crowbar/red,
/turf/open/floor/prison/floor_plate,
@@ -20707,6 +20782,11 @@
icon_state = "stan8"
},
/area/fiorina/tumor/ship)
+"pWM" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space/basic,
+/area/fiorina/oob)
"pWO" = (
/obj/item/stack/rods,
/obj/structure/cable/heavyduty{
@@ -20725,6 +20805,10 @@
/obj/item/reagent_container/food/snacks/wrapped/booniebars,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/civres)
+"pXF" = (
+/obj/structure/window/framed/prison/reinforced/hull,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"pXH" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/plating/prison,
@@ -20750,25 +20834,25 @@
},
/turf/open/floor/wood,
/area/fiorina/station/chapel)
-"pYe" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
-"pYl" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
+"pYv" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
},
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"pYz" = (
/obj/structure/closet/emcloset,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/maintenance)
+"pYA" = (
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
"pYB" = (
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
@@ -20800,16 +20884,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"pZn" = (
-/turf/open/floor/prison/yellowcorner/west,
-/area/fiorina/station/lowsec/showers_laundry)
-"pZp" = (
-/obj/item/tool/soap,
-/obj/structure/machinery/shower{
- dir = 8
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
"qaA" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/clipboard,
@@ -20888,6 +20962,10 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"qcI" = (
+/obj/structure/largecrate/random,
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"qcX" = (
/obj/structure/machinery/vending/snack/packaged,
/turf/open/floor/prison/floor_plate,
@@ -20901,6 +20979,14 @@
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"qdA" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"qdC" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -20920,13 +21006,16 @@
/obj/structure/window/framed/prison/reinforced,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"qeq" = (
-/obj/structure/platform/metal/almayer/east,
+"qdM" = (
/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/east,
/obj/structure/platform_decoration/metal/almayer/southeast,
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
+"qec" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"qes" = (
/obj/structure/stairs/perspective{
dir = 1;
@@ -20979,28 +21068,6 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"qfh" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
-"qfi" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
-"qfK" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/prison/whitegreen/northwest,
-/area/fiorina/tumor/ice_lab)
-"qfR" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
"qgd" = (
/obj/item/explosive/grenade/incendiary/molotov{
pixel_x = 8;
@@ -21024,6 +21091,10 @@
},
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/lz/near_lzI)
+"qgt" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/greenblue/southeast,
+/area/fiorina/station/botany)
"qgv" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/tool/surgery/scalpel/laser{
@@ -21043,24 +21114,13 @@
/obj/item/reagent_container/food/drinks/golden_cup,
/turf/open/space,
/area/fiorina/oob)
-"qgY" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/effect/decal/cleanable/blood/oil,
+"qgR" = (
/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
-"qhh" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
+ dir = 1;
+ pixel_y = 21
},
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/tumor/ice_lab)
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"qhk" = (
/turf/open/floor/prison/darkbrown2/southeast,
/area/fiorina/station/park)
@@ -21083,10 +21143,6 @@
},
/turf/open/floor/prison/redcorner/west,
/area/fiorina/station/power_ring)
-"qhL" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
"qhN" = (
/turf/open/floor/prison/redcorner/east,
/area/fiorina/station/security)
@@ -21096,18 +21152,20 @@
/obj/item/attachable/bipod,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
+"qhQ" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/prop/almayer/computers/mission_planning_system{
+ density = 0;
+ desc = "Its a telephone, and a computer. Woah.";
+ name = "\improper funny telephone booth";
+ pixel_x = 2;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"qhZ" = (
/turf/open/floor/prison/platingdmg3,
/area/fiorina/station/transit_hub)
-"qib" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = -3
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"qif" = (
/obj/item/inflatable,
/obj/structure/surface/table/reinforced/prison,
@@ -21134,6 +21192,10 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"qjP" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"qjR" = (
/obj/structure/machinery/computer/station_alert{
dir = 4;
@@ -21142,6 +21204,9 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
+"qjT" = (
+/turf/closed/wall/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"qjX" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -21165,6 +21230,10 @@
/obj/structure/bed/chair/office/dark,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
+"qkK" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"qkN" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/communications,
@@ -21176,20 +21245,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"qlz" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/medbay)
-"qlC" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/botany)
"qmj" = (
/obj/structure/closet/emcloset,
/obj/item/weapon/nullrod{
@@ -21207,22 +21262,37 @@
},
/turf/open/space,
/area/fiorina/oob)
+"qmU" = (
+/obj/structure/prop/structure_lattice{
+ dir = 4;
+ health = 300
+ },
+/obj/structure/prop/structure_lattice{
+ dir = 4;
+ layer = 3.1;
+ pixel_y = 10
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/research_cells/west)
"qnb" = (
/obj/structure/bed/roller,
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/station/medbay)
+"qnf" = (
+/obj/structure/machinery/power/reactor/colony,
+/turf/open/floor/prison/bluecorner/north,
+/area/fiorina/station/power_ring/reactor)
+"qnu" = (
+/obj/structure/closet/crate/miningcar{
+ name = "\improper materials storage bin"
+ },
+/obj/item/reagent_container/food/snacks/meat,
+/turf/open/floor/prison/yellow,
+/area/fiorina/station/lowsec/showers_laundry)
"qny" = (
/obj/item/tool/wirecutters/clippers,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/civres)
-"qnL" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"qob" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -21261,10 +21331,6 @@
/obj/item/stack/cable_coil/blue,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"qpF" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
"qpM" = (
/turf/closed/shuttle/ert{
icon_state = "stan_leftengine"
@@ -21284,6 +21350,12 @@
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/flight_deck)
+"qpS" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer/east,
+/obj/vehicle/powerloader/ft,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"qpX" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/prison/floor_plate,
@@ -21302,19 +21374,17 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"qqm" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/botany)
-"qqC" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
+"qqr" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/west)
+"qqH" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
},
-/turf/open/floor/prison/sterile_white/southwest,
+/obj/item/clothing/gloves/combat,
+/turf/open/floor/prison/whitepurple/northwest,
/area/fiorina/station/research_cells/west)
"qqQ" = (
/turf/open/floor/prison/green/northeast,
@@ -21335,10 +21405,6 @@
/obj/item/explosive/plastic,
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz1_cargo)
-"qrB" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/blue/southwest,
-/area/fiorina/station/power_ring)
"qrI" = (
/obj/structure/bed/sofa/south/grey/left,
/obj/item/reagent_container/food/snacks/sandwich{
@@ -21346,18 +21412,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"qrN" = (
-/obj/item/shard{
- icon_state = "medium";
- name = "ice shard"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreen/west,
-/area/fiorina/tumor/ice_lab)
-"qrU" = (
-/obj/effect/landmark/monkey_spawn,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"qsc" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
@@ -21377,17 +21431,15 @@
"qsF" = (
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/maintenance)
-"qsV" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
+"qts" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
},
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/flight_deck)
-"qtp" = (
-/obj/structure/window/framed/prison,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"qtP" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/prop/helmetgarb/raincover,
@@ -21413,20 +21465,26 @@
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"qva" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/weapon/gun/smg/mp5,
-/obj/structure/machinery/door/window/eastright{
- dir = 2
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+"qvJ" = (
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"qvN" = (
/obj/structure/prop/resin_prop{
icon_state = "rack"
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
+"qvR" = (
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/east)
+"qwf" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"qwo" = (
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"qws" = (
/obj/effect/decal/hefa_cult_decals/d32{
icon_state = "bee"
@@ -21437,16 +21495,9 @@
/obj/structure/surface/rack,
/turf/open/floor/prison/darkbrown2/southeast,
/area/fiorina/maintenance)
-"qwH" = (
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/lowsec/east)
"qwK" = (
/turf/open/floor/prison/floorscorched2,
/area/fiorina/station/civres_blue)
-"qxx" = (
-/obj/item/ammo_magazine/smg/mp5,
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"qxy" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/greenfull/northwest,
@@ -21462,43 +21513,13 @@
"qxP" = (
/turf/open/floor/prison/darkbrown2/southwest,
/area/fiorina/tumor/aux_engi)
-"qxW" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_half_cap"
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
-"qxZ" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = -3
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
-"qya" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/obj/item/clothing/gloves/combat,
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
-"qyq" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
+"qyX" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/device/radio{
+ pixel_y = 8
},
-/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring/reactor)
-"qyM" = (
-/turf/open/floor/prison/darkyellowfull2/east,
-/area/fiorina/station/disco/east_disco)
"qzo" = (
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/prison,
@@ -21507,14 +21528,6 @@
/obj/structure/largecrate/random/case,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"qzZ" = (
-/obj/structure/barricade/sandbags{
- dir = 8;
- icon_state = "sandbag_0";
- pixel_y = 2
- },
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
"qAe" = (
/obj/item/trash/eat,
/turf/open/floor/prison/floor_plate,
@@ -21529,10 +21542,6 @@
/obj/structure/reagent_dispensers/water_cooler/stacks,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"qAO" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/botany)
"qAQ" = (
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/tumor/aux_engi)
@@ -21549,9 +21558,19 @@
/obj/item/storage/briefcase,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security/wardens)
-"qBw" = (
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
+"qBz" = (
+/obj/item/storage/secure/briefcase{
+ pixel_x = 9;
+ pixel_y = 18
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
+"qBA" = (
+/obj/vehicle/powerloader,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"qBB" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "A ticket to Souto Man's raffle!";
@@ -21568,19 +21587,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"qBI" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
-"qBT" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
"qCa" = (
/obj/structure/prop/resin_prop{
dir = 1;
@@ -21589,6 +21595,12 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
+"qCj" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"qCk" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/condiment/saltshaker{
@@ -21601,10 +21613,6 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
-"qCx" = (
-/obj/item/reagent_container/food/drinks/sillycup,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"qCE" = (
/obj/structure/machinery/computer/emails{
dir = 1;
@@ -21613,9 +21621,6 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"qCK" = (
-/turf/open/floor/prison/damaged1/southwest,
-/area/fiorina/station/lowsec/east)
"qCW" = (
/turf/closed/shuttle/elevator{
dir = 6
@@ -21653,25 +21658,9 @@
/obj/structure/closet/bodybag,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"qEp" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
"qEs" = (
/turf/open/floor/prison/yellowcorner/east,
/area/fiorina/station/lowsec)
-"qEt" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
-"qEC" = (
-/obj/structure/largecrate/random/barrel/blue,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
"qFf" = (
/obj/item/tool/kitchen/rollingpin,
/turf/open/floor/prison/kitchen,
@@ -21704,12 +21693,6 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"qFW" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/lowsec/east)
"qGe" = (
/obj/structure/machinery/landinglight/ds1/delaytwo{
dir = 4
@@ -21727,14 +21710,17 @@
"qGn" = (
/turf/open/floor/corsat/plate,
/area/fiorina/station/telecomm/lz1_cargo)
+"qGx" = (
+/obj/structure/barricade/handrail,
+/obj/structure/barricade/handrail{
+ dir = 4
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"qGy" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
-"qGB" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/west)
"qGO" = (
/obj/structure/machinery/photocopier,
/obj/structure/machinery/light/double/blue,
@@ -21744,25 +21730,12 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"qGW" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
"qHi" = (
/obj/effect/landmark/nightmare{
insert_tag = "riot_control"
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"qHl" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
"qHG" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
pixel_y = 25
@@ -21787,6 +21760,15 @@
},
/turf/open/floor/prison/blue,
/area/fiorina/station/chapel)
+"qIW" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"qJf" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/drinks/cans/souto/blue{
@@ -21814,12 +21796,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"qJl" = (
-/obj/structure/bedsheetbin{
- icon_state = "linenbin-empty"
- },
-/turf/open/floor/prison/yellow/west,
-/area/fiorina/station/lowsec/showers_laundry)
"qJr" = (
/turf/open/floor/prison,
/area/fiorina/tumor/fiberbush)
@@ -21864,9 +21840,15 @@
/obj/item/disk/data,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
-"qJY" = (
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/east)
+"qJU" = (
+/obj/structure/blocker/invisible_wall,
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/ice/thin/indestructible{
+ dir = 8;
+ icon_state = "Straight"
+ },
+/turf/open/ice/noweed,
+/area/fiorina/tumor/ice_lab)
"qKq" = (
/obj/structure/machinery/computer/arcade,
/obj/item/toy/syndicateballoon{
@@ -21882,10 +21864,20 @@
},
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"qKr" = (
+/obj/item/weapon/gun/rifle/mar40,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"qKx" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_tram)
+"qKM" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
"qKT" = (
/obj/item/stack/rods/plasteel,
/turf/open/auto_turf/sand/layer1,
@@ -21894,6 +21886,14 @@
/obj/item/weapon/baseballbat/metal,
/turf/open/floor/prison/blue/west,
/area/fiorina/station/chapel)
+"qLg" = (
+/obj/structure/platform_decoration/metal/almayer,
+/obj/item/shard{
+ icon_state = "medium";
+ name = "ice shard"
+ },
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/tumor/ice_lab)
"qLi" = (
/obj/structure/toilet{
dir = 8;
@@ -21918,10 +21918,6 @@
/obj/item/storage/toolbox/mechanical/green,
/turf/open/floor/corsat/plate,
/area/fiorina/tumor/aux_engi)
-"qMk" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/park)
"qMs" = (
/obj/item/stack/cable_coil/green,
/turf/open/floor/prison/floor_plate,
@@ -21955,10 +21951,6 @@
"qNF" = (
/turf/open/floor/prison/yellow/northeast,
/area/fiorina/station/lowsec)
-"qOq" = (
-/obj/structure/grille,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"qOu" = (
/turf/open/floor/prison/damaged3,
/area/fiorina/station/disco)
@@ -21966,6 +21958,10 @@
/obj/item/stack/cable_coil/cyan,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"qOT" = (
+/obj/item/clothing/mask/cigarette/bcigarette,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"qOW" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -21978,15 +21974,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"qOZ" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"qPa" = (
/obj/item/device/motiondetector,
/turf/open/floor/prison/yellow/north,
@@ -21994,19 +21981,16 @@
"qPb" = (
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
+"qPl" = (
+/obj/structure/bedsheetbin{
+ icon_state = "linenbin-empty"
+ },
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/showers_laundry)
"qPr" = (
/obj/item/ammo_magazine/smg/nailgun,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/maintenance)
-"qPL" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/spawner/random/powercell,
-/obj/item/storage/syringe_case/burn{
- pixel_x = -10;
- pixel_y = 8
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"qQa" = (
/turf/open/floor/prison/darkpurple2/north,
/area/fiorina/station/central_ring)
@@ -22042,12 +22026,6 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"qQy" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/turf/open/floor/prison/blue/northwest,
-/area/fiorina/station/power_ring/reactor)
"qQA" = (
/obj/item/reagent_container/food/drinks/bottle/holywater{
desc = "A flask of the holy HEFA grenade oil.";
@@ -22055,33 +22033,25 @@
},
/turf/open/floor/prison/chapel_carpet/doubleside,
/area/fiorina/station/chapel)
-"qRa" = (
-/obj/effect/decal/cleanable/blood/gibs/core,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"qRf" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/toy/beach_ball/holoball,
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/east)
"qRg" = (
/obj/structure/sign/prop3{
desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
},
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/servers)
-"qRi" = (
-/obj/structure/machinery/door/airlock/prison/horizontal{
- density = 0;
- dir = 4;
- icon_state = "door_open";
- opacity = 0
- },
-/obj/structure/barricade/metal/wired{
- dir = 4
+"qRv" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
},
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/disco/east_disco)
+"qRz" = (
+/obj/item/stool,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
+"qRC" = (
+/obj/item/stack/barbed_wire,
/turf/open/floor/plating/prison,
/area/fiorina/station/lowsec/east)
"qRK" = (
@@ -22098,6 +22068,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"qSh" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"qSm" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison,
@@ -22108,38 +22082,44 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"qSz" = (
-/obj/structure/closet/wardrobe/orange,
-/obj/item/clothing/gloves/boxing/yellow,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"qSA" = (
/obj/item/trash/candy,
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/tumor/ice_lab)
+"qSW" = (
+/obj/structure/machinery/door/airlock/prison/horizontal{
+ dir = 4
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"qTe" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
-"qTt" = (
-/obj/item/stack/tile/plasteel,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
+"qTp" = (
+/obj/structure/window/framed/prison,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
"qTx" = (
/obj/structure/surface/rack,
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/regular,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"qTP" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
"qTW" = (
/obj/effect/landmark/survivor_spawner,
/turf/open/floor/prison/blue/east,
/area/fiorina/station/power_ring)
-"qUb" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
+"qUn" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space,
+/area/fiorina/oob)
"qUo" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
@@ -22157,10 +22137,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"qUw" = (
-/obj/item/device/multitool,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
"qUC" = (
/obj/item/ammo_casing{
dir = 2;
@@ -22168,27 +22144,22 @@
},
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/station/park)
-"qVb" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
"qVW" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison,
/area/fiorina/station/park)
"qWe" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/prisoner,
-/turf/open/floor/prison,
-/area/fiorina/station/security)
-"qXj" = (
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
},
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco)
+"qXA" = (
+/obj/structure/window/framed/prison,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"qXM" = (
/obj/item/stack/tile/plasteel,
/turf/open/floor/plating/prison,
@@ -22209,9 +22180,10 @@
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
"qZp" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/gm/river/pool,
-/area/fiorina/station/park)
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/prisoner,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec)
"qZv" = (
/obj/structure/stairs/perspective{
dir = 1;
@@ -22219,20 +22191,23 @@
},
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/station/central_ring)
-"qZz" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
+"qZH" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
+"qZN" = (
+/obj/structure/monorail{
+ name = "launch track"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/telecomm/lz1_tram)
"raC" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/lz/near_lzI)
-"raJ" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"raL" = (
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
@@ -22276,13 +22251,6 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
-"rce" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/reagent_dispensers/water_cooler{
- pixel_y = 11
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"rcg" = (
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
@@ -22295,10 +22263,14 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"rcy" = (
-/obj/structure/platform_decoration/metal/kutjevo/north,
-/turf/open/space,
-/area/fiorina/oob)
+"rcs" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
+ },
+/obj/item/stool,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"rcE" = (
/obj/structure/inflatable/popped/door,
/obj/item/stack/barbed_wire,
@@ -22316,6 +22288,16 @@
"rdo" = (
/turf/open/floor/prison/greenbluecorner/north,
/area/fiorina/station/botany)
+"rdS" = (
+/obj/item/stool,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
+"rdX" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"red" = (
/obj/structure/barricade/metal/wired{
dir = 8
@@ -22323,13 +22305,13 @@
/obj/structure/largecrate/random/secure,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
-"rez" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/cameras{
- dir = 4
+"ree" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
},
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/disco/east_disco)
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/medbay)
"reZ" = (
/obj/structure/barricade/sandbags{
dir = 8;
@@ -22349,17 +22331,6 @@
"rft" = (
/turf/open/floor/prison/greenblue,
/area/fiorina/station/botany)
-"rfy" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft"
- },
-/turf/open/floor/prison/whitegreen/northwest,
-/area/fiorina/station/medbay)
-"rfI" = (
-/obj/structure/platform_decoration/metal/kutjevo,
-/turf/open/space,
-/area/fiorina/oob)
"rfQ" = (
/obj/effect/spawner/random/tech_supply,
/obj/structure/machinery/light/double/blue{
@@ -22368,13 +22339,9 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
-"rgc" = (
-/obj/item/device/binoculars/civ,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/north,
+"rfW" = (
+/obj/structure/window/framed/prison/reinforced,
+/turf/open/floor/plating/prison,
/area/fiorina/station/lowsec/showers_laundry)
"rgg" = (
/obj/item/tool/candle{
@@ -22382,9 +22349,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/chapel)
-"rhf" = (
-/turf/open/floor/prison/cell_stripe,
-/area/fiorina/station/research_cells/west)
"rhh" = (
/obj/structure/monorail{
dir = 4;
@@ -22392,16 +22356,6 @@
},
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/transit_hub)
-"rhH" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
-"rhR" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space,
-/area/fiorina/oob)
"rie" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/whitegreen/west,
@@ -22413,44 +22367,34 @@
"rja" = (
/turf/closed/wall/prison,
/area/fiorina/station/civres_blue)
-"rjw" = (
-/turf/closed/wall/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"rji" = (
+/obj/structure/platform_decoration/metal/kutjevo/north,
+/turf/open/space,
+/area/fiorina/oob)
"rjy" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"rjD" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
- icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"rjP" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"rki" = (
-/obj/item/stack/tile/plasteel,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/tumor/civres)
-"rkp" = (
+"rkg" = (
/obj/structure/toilet{
dir = 4;
pixel_y = 8
},
-/obj/effect/decal/cleanable/blood/gibs,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/east)
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
+"rki" = (
+/obj/item/stack/tile/plasteel,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/tumor/civres)
"rkv" = (
/turf/open/floor/prison/greencorner/west,
/area/fiorina/station/chapel)
-"rkF" = (
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"rkH" = (
/obj/structure/grille,
/obj/structure/lattice,
@@ -22460,10 +22404,6 @@
/obj/item/clothing/glasses/science,
/turf/open/space,
/area/fiorina/oob)
-"rkX" = (
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"rle" = (
/obj/item/stack/cable_coil/green,
/turf/open/floor/wood,
@@ -22481,6 +22421,51 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
+"rmL" = (
+/obj/structure/blocker/invisible_wall,
+/obj/structure/ice/thin/indestructible,
+/obj/structure/prop/invuln{
+ desc = "The underside softly pulses.";
+ dir = 4;
+ icon = 'icons/mob/xenonids/xenonid_crab.dmi';
+ icon_state = "facehugger_thrown";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = -22;
+ pixel_y = -10
+ },
+/obj/structure/prop/invuln{
+ desc = "The underside softly pulses.";
+ dir = 4;
+ icon = 'icons/mob/xenonids/xenonid_crab.dmi';
+ icon_state = "facehugger_thrown";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = 22;
+ pixel_y = 8
+ },
+/obj/structure/prop/invuln{
+ desc = "The underside softly pulses.";
+ dir = 4;
+ icon = 'icons/mob/xenonids/xenonid_crab.dmi';
+ icon_state = "facehugger_thrown";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = -22;
+ pixel_y = 8
+ },
+/obj/structure/prop/invuln{
+ desc = "The underside softly pulses.";
+ dir = 4;
+ icon = 'icons/mob/xenonids/xenonid_crab.dmi';
+ icon_state = "facehugger_thrown";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = 22;
+ pixel_y = -10
+ },
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"rmZ" = (
/obj/structure/barricade/metal/wired{
dir = 4
@@ -22508,15 +22493,17 @@
/obj/structure/largecrate/supply/explosives/mortar_flare,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"rnE" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/lowsec/showers_laundry)
"rnM" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/fancy/crayons,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"roh" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/turf/open/floor/prison/whitegreen/southwest,
+/area/fiorina/tumor/ice_lab)
"roi" = (
/obj/structure/prop/souto_land/streamer{
dir = 9
@@ -22530,17 +22517,6 @@
},
/turf/open/floor/prison/darkpurple2/southeast,
/area/fiorina/tumor/ice_lab)
-"rov" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/bright_clean2/southwest,
-/area/fiorina/station/park)
-"roC" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/darkbrown2/northeast,
-/area/fiorina/station/park)
"roF" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/window/reinforced{
@@ -22560,14 +22536,14 @@
"roQ" = (
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/disco)
-"rpf" = (
-/obj/structure/grille,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"rpt" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/disco)
+"rpE" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/turf/open/space,
+/area/fiorina/oob)
"rpL" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison,
@@ -22578,12 +22554,10 @@
},
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/lz/near_lzI)
-"rqd" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"rqi" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/east)
"rqq" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -22609,20 +22583,42 @@
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/servers)
+"rrf" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/lowsec/east)
+"rrk" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/botany)
"rrs" = (
/obj/item/stack/rods/plasteel,
/turf/open/floor/prison/darkyellow2/northeast,
/area/fiorina/lz/near_lzI)
-"rru" = (
-/obj/effect/spawner/random/goggles/midchance,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"rrD" = (
/obj/structure/machinery/landinglight/ds1{
dir = 1
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
+"rrU" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
+"rrY" = (
+/turf/open/floor/prison/blue/east,
+/area/fiorina/station/power_ring/reactor)
"rsp" = (
/obj/item/toy/crayon/purple,
/turf/open/floor/plating/prison,
@@ -22632,6 +22628,18 @@
/obj/item/reagent_container/food/drinks/coffee,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"rsN" = (
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
+"rsO" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
"rsR" = (
/turf/open/floor/prison/blue/northeast,
/area/fiorina/station/power_ring)
@@ -22657,6 +22665,17 @@
},
/turf/open/floor/prison/blue/northeast,
/area/fiorina/station/civres_blue)
+"rtC" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
+"rtL" = (
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/east)
+"rtM" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"rtP" = (
/obj/item/trash/cigbutt,
/turf/open/floor/prison/sterile_white/southwest,
@@ -22684,17 +22703,17 @@
},
/turf/closed/wall/prison,
/area/fiorina/tumor/servers)
+"rwg" = (
+/obj/structure/window_frame/prison/reinforced,
+/obj/item/shard{
+ icon_state = "large"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"rwj" = (
/obj/structure/barricade/plasteel,
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"rwm" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"rwu" = (
/obj/structure/bed/chair{
dir = 1
@@ -22707,13 +22726,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"rwK" = (
-/obj/item/clothing/under/color/orange,
-/obj/item/clothing/under/color/orange,
-/obj/item/clothing/under/color/orange,
-/obj/structure/surface/rack,
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/lowsec/showers_laundry)
+"rwH" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/closed/wall/mineral/bone_resin,
+/area/fiorina/tumor/ice_lab)
"rwQ" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/greenblue/west,
@@ -22727,11 +22743,6 @@
},
/turf/open/floor/almayer_hull,
/area/fiorina/oob)
-"ryp" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/open/space,
-/area/fiorina/oob)
"ryJ" = (
/obj/structure/machinery/door/airlock/prison/horizontal{
dir = 4
@@ -22745,29 +22756,14 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"rzF" = (
-/obj/structure/holohoop{
- pixel_y = 25
- },
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/east)
-"rzZ" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/bed/chair{
- dir = 1;
- layer = 2.7
- },
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
+"rzY" = (
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/showers_laundry)
"rAm" = (
/obj/structure/surface/rack,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
-"rAw" = (
-/obj/structure/bed/chair,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"rAK" = (
/obj/structure/barricade/metal{
dir = 4;
@@ -22794,11 +22790,9 @@
/turf/open/floor/prison,
/area/fiorina/station/security)
"rBh" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
+/obj/item/ammo_magazine/shotgun/buckshot,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"rBr" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/plating/prison,
@@ -22818,52 +22812,44 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"rBE" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/tumor/ice_lab)
"rBF" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/flight_deck)
-"rCq" = (
-/obj/structure/largecrate/supply/supplies/flares,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"rCt" = (
-/obj/structure/bed/chair/comfy{
- dir = 4
+"rDp" = (
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
+"rEe" = (
+/obj/item/trash/boonie,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
+"rEN" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
},
-/turf/open/floor/wood,
+/turf/open/floor/prison/yellow,
/area/fiorina/station/lowsec/east)
-"rDf" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
-"rEk" = (
-/obj/structure/lattice,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space,
-/area/fiorina/oob)
-"rEr" = (
-/obj/structure/blocker/invisible_wall,
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/ice/thin/indestructible{
- dir = 8;
- icon_state = "Straight"
+"rES" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
},
-/turf/open/ice/noweed,
-/area/fiorina/tumor/ice_lab)
-"rEx" = (
-/turf/open/floor/prison/whitepurplecorner/east,
-/area/fiorina/station/research_cells/east)
-"rEG" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/floor_plate,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
+"rFj" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
/area/fiorina/station/park)
+"rFo" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"rFu" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/chapel_carpet/doubleside,
@@ -22885,9 +22871,6 @@
/obj/structure/machinery/computer3/laptop/secure_data,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"rGf" = (
-/turf/open/auto_turf/sand/layer1,
-/area/fiorina/station/disco/east_disco)
"rGq" = (
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
@@ -22895,14 +22878,6 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/telecomm/lz1_tram)
-"rGB" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/item/shard{
- icon_state = "medium";
- name = "ice shard"
- },
-/turf/open/floor/prison/whitegreen/east,
-/area/fiorina/tumor/ice_lab)
"rGK" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 9
@@ -22932,6 +22907,10 @@
/obj/structure/window/framed/prison,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"rHM" = (
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"rHV" = (
/obj/structure/bed/chair,
/obj/structure/machinery/light/double/blue{
@@ -22943,14 +22922,6 @@
"rHX" = (
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
-"rIr" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = -3
- },
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/west)
"rIy" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/phone{
@@ -22962,12 +22933,20 @@
/obj/item/stack/rods,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"rIP" = (
+/obj/structure/machinery/constructable_frame,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"rIS" = (
/obj/structure/sign/poster{
icon_state = "poster6"
},
/turf/closed/wall/prison,
/area/fiorina/station/medbay)
+"rIV" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"rJc" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/floor_plate,
@@ -22985,6 +22964,10 @@
"rJF" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
+"rJH" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"rJO" = (
/turf/open/floor/carpet,
/area/fiorina/station/security/wardens)
@@ -23000,13 +22983,9 @@
/obj/item/stack/cable_coil/green,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"rKd" = (
-/obj/item/stool,
-/obj/structure/sign/poster{
- icon_state = "poster14";
- pixel_y = 32
- },
-/turf/open/floor/prison/yellow/north,
+"rKi" = (
+/obj/effect/decal/cleanable/blood/gibs/core,
+/turf/open/floor/prison,
/area/fiorina/station/lowsec/showers_laundry)
"rKm" = (
/obj/structure/machinery/vending/coffee,
@@ -23028,13 +23007,16 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/blue_plate/west,
/area/fiorina/station/botany)
-"rLG" = (
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
-"rLJ" = (
-/obj/item/clothing/gloves/boxing,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/showers_laundry)
+"rKY" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
+"rMa" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/east)
"rMo" = (
/obj/effect/landmark/objective_landmark/far,
/obj/structure/closet/secure_closet/engineering_personal,
@@ -23045,10 +23027,10 @@
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"rMw" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
+"rMQ" = (
+/obj/item/storage/pill_bottle/spaceacillin/skillless,
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/west)
"rMT" = (
/obj/structure/prop/almayer/computers/mission_planning_system{
density = 0;
@@ -23074,6 +23056,14 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
+"rNt" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/chapel)
"rNK" = (
/obj/effect/spawner/random/gun/pistol/lowchance,
/turf/open/floor/prison/darkbrown2/north,
@@ -23082,6 +23072,10 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/tumor/civres)
+"rOn" = (
+/obj/item/paper/prison_station/inmate_handbook,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"rOu" = (
/obj/structure/closet,
/obj/effect/spawner/random/sentry/midchance,
@@ -23101,10 +23095,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/central_ring)
-"rOV" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/chapel_carpet/doubleside/north,
-/area/fiorina/station/chapel)
"rPd" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/stack/sheet/metal/medium_stack,
@@ -23120,18 +23110,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/transit_hub)
-"rPj" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/transit_hub)
-"rPs" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
"rPD" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/floor_plate,
@@ -23163,15 +23141,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"rPM" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/floor/almayer_hull,
-/area/fiorina/station/medbay)
-"rPS" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
"rPW" = (
/obj/effect/spawner/random/gun/rifle/lowchance,
/turf/open/floor/prison/floor_plate,
@@ -23188,22 +23157,11 @@
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"rQi" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
-"rQt" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space,
-/area/fiorina/oob)
"rQu" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/stack/cable_coil/orange,
/turf/open/floor/prison/floor_plate,
/area/fiorina/maintenance)
-"rQB" = (
-/turf/open/floor/prison/sterile_white/west,
-/area/fiorina/station/lowsec/east)
"rQK" = (
/obj/item/bananapeel{
name = "tactical banana peel"
@@ -23213,14 +23171,6 @@
"rQN" = (
/turf/open/floor/prison/darkbrown2/southeast,
/area/fiorina/station/power_ring)
-"rRd" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/barricade/handrail/type_b{
- dir = 4;
- layer = 3.5
- },
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
"rRg" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/stack/sheet/mineral/plastic,
@@ -23235,13 +23185,6 @@
},
/turf/open/floor/prison/blue/north,
/area/fiorina/station/civres_blue)
-"rSr" = (
-/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
- dir = 1;
- req_one_access = null
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"rSU" = (
/obj/structure/barricade/sandbags{
dir = 4;
@@ -23256,6 +23199,9 @@
},
/turf/open/floor/prison/whitegreen/west,
/area/fiorina/tumor/ice_lab)
+"rTs" = (
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"rTD" = (
/obj/effect/spawner/random/powercell,
/turf/open/floor/prison/bluefull,
@@ -23267,12 +23213,10 @@
},
/turf/open/floor/carpet,
/area/fiorina/station/security/wardens)
-"rTY" = (
-/turf/open/floor/prison/bluecorner,
-/area/fiorina/station/power_ring/reactor)
-"rTZ" = (
-/turf/open/floor/prison/whitepurplecorner/north,
-/area/fiorina/station/research_cells/west)
+"rUc" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/blue/northwest,
+/area/fiorina/station/power_ring)
"rUf" = (
/turf/open/floor/prison/darkyellow2/northwest,
/area/fiorina/tumor/servers)
@@ -23296,6 +23240,27 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"rUV" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 8
+ },
+/obj/item/prop/helmetgarb/spacejam_tickets{
+ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
+ name = "\improper arcade tickets";
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/whitepurple/northeast,
+/area/fiorina/station/research_cells/west)
+"rVh" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
"rVi" = (
/obj/structure/barricade/handrail/type_b,
/turf/open/floor/prison/darkyellow2/southeast,
@@ -23305,6 +23270,10 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/darkbrown2/southeast,
/area/fiorina/maintenance)
+"rVt" = (
+/obj/structure/inflatable/door,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/lowsec/showers_laundry)
"rVM" = (
/obj/structure/closet/crate/miningcar,
/obj/structure/barricade/wooden{
@@ -23331,6 +23300,10 @@
/obj/item/stack/cable_coil/cut,
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
+"rWx" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
"rWQ" = (
/obj/structure/disposalpipe/segment{
color = "#c4c4c4";
@@ -23343,32 +23316,27 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
+"rWU" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
"rXt" = (
/obj/structure/surface/rack,
/obj/item/device/camera,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/fiberbush)
+"rXw" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"rYw" = (
/obj/item/trash/liquidfood,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"rYy" = (
-/obj/item/stool{
- pixel_x = -4;
- pixel_y = 10
- },
-/obj/structure/sign/poster{
- icon_state = "poster1";
- pixel_y = 32
- },
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
-"rYK" = (
-/obj/structure/machinery/light/double/blue{
- pixel_y = -1
- },
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/east)
"rYY" = (
/obj/structure/bed/roller,
/obj/structure/machinery/filtration/console{
@@ -23387,11 +23355,6 @@
icon_state = "stan_rightengine"
},
/area/fiorina/station/power_ring)
-"rZF" = (
-/obj/effect/decal/cleanable/blood/gibs,
-/obj/effect/spawner/random/gun/rifle,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"rZI" = (
/obj/structure/surface/rack,
/obj/effect/landmark/objective_landmark/close,
@@ -23417,21 +23380,19 @@
"rZP" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/aux_engi)
-"saL" = (
-/obj/structure/reagent_dispensers/water_cooler{
- pixel_x = -9;
- pixel_y = 8
- },
-/obj/structure/reagent_dispensers/water_cooler{
- pixel_x = 11;
- pixel_y = 8
+"sag" = (
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
+"sbb" = (
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
},
-/obj/structure/reagent_dispensers/water_cooler{
- pixel_x = 1;
- pixel_y = 8
+/obj/structure/machinery/shower{
+ dir = 4
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"sbf" = (
/obj/effect/landmark/corpsespawner/prisoner,
/turf/open/gm/river/darkred_pool,
@@ -23455,14 +23416,6 @@
"sbW" = (
/turf/open/floor/prison/greenbluecorner/east,
/area/fiorina/station/botany)
-"scb" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/darkbrowncorners2,
-/area/fiorina/station/park)
-"sce" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/park)
"scp" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/trash/uscm_mre,
@@ -23476,6 +23429,12 @@
/obj/structure/machinery/washing_machine,
/turf/open/floor/prison/sterile_white,
/area/fiorina/station/civres_blue)
+"scK" = (
+/obj/structure/machinery/shower{
+ dir = 1
+ },
+/turf/open/floor/interior/plastic,
+/area/fiorina/station/research_cells/east)
"scM" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/telecomm/lz1_tram)
@@ -23494,16 +23453,14 @@
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"sdw" = (
+/obj/item/reagent_container/food/snacks/meat,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"sdE" = (
/obj/item/storage/wallet/random,
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"sdG" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
"sdK" = (
/obj/structure/surface/table/woodentable,
/obj/item/device/flashlight/lamp{
@@ -23586,15 +23543,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"sfZ" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/weapon/baton,
-/obj/item/reagent_container/food/drinks/coffee{
- pixel_x = -6;
- pixel_y = 12
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"sga" = (
/obj/effect/decal{
icon = 'icons/obj/items/policetape.dmi';
@@ -23605,17 +23553,16 @@
/obj/structure/barricade/metal/wired,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
-"sgt" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/east)
"sgw" = (
/obj/structure/window_frame/prison,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"sgI" = (
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+"sgB" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/east)
"sgJ" = (
/obj/structure/surface/rack,
/obj/item/storage/belt/gun/flaregun/full,
@@ -23631,17 +23578,11 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"shh" = (
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
-"shC" = (
-/obj/structure/platform_decoration/metal/almayer/east,
+"shs" = (
+/obj/structure/platform_decoration/metal/almayer,
+/obj/item/reagent_container/food/drinks/sillycup,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec)
+/area/fiorina/station/flight_deck)
"shH" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
@@ -23654,14 +23595,6 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/fiberbush)
-"siy" = (
-/obj/item/stack/cable_coil,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"siB" = (
-/obj/item/poster,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
"siE" = (
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
/turf/open/floor/prison/darkbrownfull2,
@@ -23674,11 +23607,6 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"siW" = (
-/obj/structure/closet/bodybag,
-/obj/effect/decal/cleanable/blood/gibs/up,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"sjd" = (
/obj/structure/stairs/perspective{
dir = 8;
@@ -23686,6 +23614,15 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
+"sji" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/poster,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
+"sjA" = (
+/obj/item/stool,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
"sjJ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/recharger{
@@ -23732,21 +23669,6 @@
/obj/item/reagent_container/blood,
/turf/open/floor/prison/greenbluecorner/east,
/area/fiorina/station/botany)
-"sjZ" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
-"skj" = (
-/obj/structure/closet/crate/miningcar{
- name = "\improper materials storage bin"
- },
-/obj/item/reagent_container/food/snacks/meat,
-/turf/open/floor/prison/yellow,
-/area/fiorina/station/lowsec/showers_laundry)
"skG" = (
/turf/open/floor/prison/blue/southwest,
/area/fiorina/tumor/servers)
@@ -23785,6 +23707,12 @@
/obj/structure/barricade/handrail/type_b,
/turf/open/floor/prison,
/area/fiorina/station/disco)
+"smn" = (
+/obj/structure/bookcase/manuals/research_and_development{
+ pixel_y = 10
+ },
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"sms" = (
/turf/open/floor/prison/bluecorner/north,
/area/fiorina/station/civres_blue)
@@ -23795,12 +23723,28 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
+"smQ" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/chapel_carpet/doubleside,
+/area/fiorina/station/chapel)
"smR" = (
/obj/structure/barricade/metal/wired{
dir = 8
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzI)
+"snp" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring/reactor)
+"snB" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"snW" = (
/obj/structure/prop/resin_prop{
icon_state = "rack"
@@ -23813,6 +23757,17 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/botany)
+"son" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
+"sor" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"sov" = (
/turf/closed/shuttle/ert{
icon_state = "rightengine_1";
@@ -23830,13 +23785,6 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/botany)
-"spl" = (
-/obj/item/stack/sheet/metal,
-/obj/structure/barricade/handrail{
- dir = 4
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"spm" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/flora/pottedplant{
@@ -23854,14 +23802,6 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"spI" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"spR" = (
-/obj/structure/surface/table/reinforced/prison,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"sqx" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
density = 0;
@@ -23869,14 +23809,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
-"sqC" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/r_wall/prison,
-/area/fiorina/station/lowsec/east)
-"sqL" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
"sqR" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/supply_kit,
@@ -23886,14 +23818,16 @@
/obj/item/reagent_container/food/drinks/bottle/sake,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
+"srA" = (
+/obj/item/ammo_magazine/rifle/m16{
+ current_rounds = 0
+ },
+/turf/open/floor/prison/yellowcorner,
+/area/fiorina/station/lowsec/showers_laundry)
"srI" = (
/obj/item/tool/crowbar/red,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"srQ" = (
-/obj/structure/barricade/handrail,
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/east)
"ssb" = (
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_tram)
@@ -23924,12 +23858,6 @@
/obj/item/clothing/under/shorts/black,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/central_ring)
-"sta" = (
-/obj/structure/machinery/door/airlock/almayer/marine{
- icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"stf" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/prison,
@@ -23938,6 +23866,37 @@
/obj/structure/machinery/line_nexter,
/turf/open/floor/prison/red/west,
/area/fiorina/station/security)
+"stx" = (
+/obj/structure/barricade/wooden{
+ dir = 8
+ },
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/east)
+"sty" = (
+/obj/structure/ice/thin/indestructible,
+/obj/structure/prop/invuln{
+ desc = "It is slimy.";
+ dir = 4;
+ icon = 'icons/mob/xenos/castes/tier_1/sentinel.dmi';
+ icon_state = "Normal Sentinel Knocked Down";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = -22;
+ pixel_y = 8
+ },
+/obj/structure/prop/invuln{
+ desc = "He knows something that you don't.";
+ dir = 4;
+ icon = 'icons/mob/xenos/castes/tier_0/larva.dmi';
+ icon_state = "Larva Sleeping";
+ layer = 2.5;
+ name = "frozen creature";
+ pixel_x = 8;
+ pixel_y = -18
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/tumor/ice_lab)
"stC" = (
/obj/structure/largecrate/random,
/turf/open/floor/prison/greenfull/northwest,
@@ -23963,10 +23922,12 @@
/obj/item/device/tracker,
/turf/open/floor/prison/yellow/northwest,
/area/fiorina/station/disco)
-"suq" = (
-/obj/item/stool,
-/turf/open/floor/prison/damaged2/southwest,
-/area/fiorina/station/lowsec/east)
+"suD" = (
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
+"suR" = (
+/turf/closed/wall/r_wall/prison_unmeltable,
+/area/fiorina/station/lowsec/showers_laundry)
"suX" = (
/turf/open/floor/prison,
/area/fiorina/station/central_ring)
@@ -23990,22 +23951,13 @@
/obj/structure/machinery/computer/telecomms/monitor,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"svN" = (
-/obj/structure/machinery/shower{
- dir = 1;
- pixel_y = -1
- },
-/obj/structure/machinery/shower{
- dir = 4
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
+"svH" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"svP" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
-"svS" = (
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/disco/east_disco)
"svW" = (
/obj/structure/surface/rack,
/obj/item/clothing/gloves/latex,
@@ -24024,6 +23976,22 @@
/obj/item/weapon/gun/rifle/mar40,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
+"sxe" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
+"sxg" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/security)
"sxk" = (
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/prison,
@@ -24031,30 +23999,27 @@
"sxE" = (
/turf/open/floor/prison/redcorner,
/area/fiorina/station/power_ring)
-"sxY" = (
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_sn_full_cap"
- },
+"sye" = (
/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/park)
+/obj/structure/machinery/door/airlock/prison_hatch/autoname{
+ dir = 1
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/tumor/ice_lab)
"syj" = (
/obj/item/clothing/under/color/orange,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"syF" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
"syG" = (
/obj/item/tool/wirecutters/clippers,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"syM" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/turf/open/floor/prison,
-/area/fiorina/station/flight_deck)
"syU" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 8
@@ -24073,10 +24038,12 @@
"sze" = (
/turf/open/floor/prison/greencorner/north,
/area/fiorina/tumor/civres)
-"szn" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/blue/southeast,
-/area/fiorina/station/power_ring)
+"szk" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
"szs" = (
/obj/item/clothing/accessory/armband/cargo{
desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured.";
@@ -24084,6 +24051,10 @@
},
/turf/open/floor/prison/bluecorner/east,
/area/fiorina/station/chapel)
+"szv" = (
+/obj/item/stool,
+/turf/open/floor/prison/damaged2,
+/area/fiorina/station/lowsec/east)
"szD" = (
/obj/structure/stairs/perspective{
dir = 9;
@@ -24099,18 +24070,14 @@
/obj/item/stack/sandbags_empty/half,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"sAg" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/station/medbay)
+"sAe" = (
+/obj/structure/platform_decoration/metal/kutjevo,
+/turf/open/space/basic,
+/area/fiorina/oob)
"sAp" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"sAF" = (
-/obj/item/inflatable,
-/turf/open/floor/prison/yellow/north,
-/area/fiorina/station/lowsec/showers_laundry)
"sBj" = (
/obj/structure/barricade/metal{
health = 85;
@@ -24125,6 +24092,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
+"sBH" = (
+/obj/structure/largecrate/random/case/double,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"sBM" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison/whitegreencorner/east,
@@ -24133,6 +24104,14 @@
/obj/structure/machinery/power/apc/power/south,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"sBU" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 1;
+ icon_state = "Corner"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"sBY" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/goggles/lowchance,
@@ -24146,25 +24125,30 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
+"sCo" = (
+/turf/open/floor/prison/yellowcorner/west,
+/area/fiorina/station/lowsec/showers_laundry)
"sCH" = (
/obj/item/frame/rack,
/obj/item/clothing/under/marine/ua_riot,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"sCU" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/park)
"sDn" = (
/obj/structure/inflatable/popped/door,
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/whitegreen,
/area/fiorina/station/medbay)
-"sDp" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/filingcabinet,
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
"sDw" = (
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/east)
+/obj/structure/stairs/perspective{
+ dir = 1;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/research_cells/west)
"sDL" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
@@ -24172,23 +24156,17 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"sDR" = (
-/obj/effect/decal/cleanable/blood/tracks/footprints{
- dir = 1;
- icon_state = "human2"
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"sDS" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ammo_magazine/rifle/m16,
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
-"sEK" = (
-/obj/structure/bed{
- icon_state = "abed"
+"sEw" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
},
-/turf/open/floor/prison/whitepurple/southeast,
+/turf/open/floor/prison/whitepurple/north,
/area/fiorina/station/research_cells/east)
"sEO" = (
/turf/closed/wall/r_wall/prison,
@@ -24207,19 +24185,17 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/flight_deck)
-"sFH" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/folder/red{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/item/folder/red{
- pixel_x = -3;
- pixel_y = 2
+"sFG" = (
+/obj/item/bedsheet,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/showers_laundry)
+"sFQ" = (
+/obj/structure/bed{
+ icon_state = "abed"
},
-/obj/item/tool/stamp,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/lowsec/east)
+/obj/effect/landmark/corpsespawner/prisoner,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"sFY" = (
/obj/structure/barricade/metal/wired{
dir = 4
@@ -24227,6 +24203,13 @@
/obj/structure/largecrate/random/secure,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
+"sGi" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecaldir"
+ },
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"sGk" = (
/obj/structure/bed/roller,
/obj/structure/machinery/iv_drip{
@@ -24251,39 +24234,6 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"sGS" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
-"sGX" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/reagent_container/food/snacks/mre_pack/meal4{
- name = "\improper prison food";
- pixel_y = 9
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"sHe" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/stock_parts/subspace/amplifier{
- pixel_x = 6;
- pixel_y = 3
- },
-/obj/item/stock_parts/subspace/analyzer{
- pixel_x = -9;
- pixel_y = 8
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"sHj" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"sHL" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/greenfull/east,
@@ -24304,15 +24254,13 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"sIi" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"sIj" = (
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/station/flight_deck)
-"sIk" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
"sIs" = (
/obj/item/weapon/gun/smg/nailgun,
/obj/structure/surface/rack,
@@ -24339,6 +24287,13 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison,
/area/fiorina/lz/near_lzI)
+"sJb" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/item/reagent_container/food/snacks/wrapped/barcardine,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"sJu" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname{
dir = 1
@@ -24355,9 +24310,6 @@
/obj/item/stack/folding_barricade,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"sJH" = (
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/east)
"sJN" = (
/obj/structure/sign/prop3{
desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
@@ -24368,30 +24320,6 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
-"sJX" = (
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/turf/open/space,
-/area/fiorina/oob)
-"sKr" = (
-/obj/item/storage/secure/briefcase{
- pixel_x = 9;
- pixel_y = 18
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"sKt" = (
-/obj/structure/bed/chair{
- dir = 1;
- layer = 2.7
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"sKY" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
@@ -24416,11 +24344,6 @@
},
/turf/closed/wall/r_wall/prison,
/area/fiorina/tumor/civres)
-"sLF" = (
-/obj/structure/lattice,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/turf/open/space,
-/area/fiorina/oob)
"sMe" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/book/manual/security_space_law{
@@ -24429,10 +24352,18 @@
},
/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/security)
-"sMq" = (
+"sMo" = (
/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
+/turf/open/floor/prison,
+/area/fiorina/tumor/ice_lab)
+"sMO" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/wood,
+/area/fiorina/station/park)
"sMX" = (
/obj/structure/machinery/cm_vending/sorted/tech/comp_storage,
/turf/open/floor/prison/darkbrownfull2,
@@ -24450,10 +24381,6 @@
/obj/item/storage/pill_bottle/bicaridine/skillless,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"sNi" = (
-/obj/item/device/flashlight,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"sNj" = (
/obj/structure/barricade/metal/wired{
dir = 8
@@ -24525,11 +24452,11 @@
},
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"sQv" = (
-/obj/structure/platform/metal/almayer,
-/obj/item/clothing/gloves/botanic_leather,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
+"sQu" = (
+/obj/structure/platform_decoration/metal/almayer,
+/obj/effect/spawner/random/toolbox,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"sQy" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/spawner/random/gun/pistol/midchance,
@@ -24544,25 +24471,17 @@
/obj/item/restraint/handcuffs,
/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/security)
-"sRv" = (
-/obj/item/clothing/shoes/marine/upp/knife,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"sRJ" = (
-/obj/structure/machinery/constructable_frame,
+"sSS" = (
+/obj/structure/machinery/washing_machine,
+/obj/structure/machinery/washing_machine{
+ pixel_y = 15
+ },
/obj/structure/machinery/light/double/blue{
dir = 1;
pixel_y = 21
},
-/turf/open/floor/prison/damaged2/southwest,
-/area/fiorina/station/lowsec/east)
-"sSv" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/medbay)
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/showers_laundry)
"sSY" = (
/obj/structure/disposalpipe/segment{
color = "#c4c4c4";
@@ -24619,10 +24538,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
-"sUd" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
"sUe" = (
/obj/structure/bed/chair{
dir = 8
@@ -24646,13 +24561,20 @@
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/prison,
/area/fiorina/station/park)
+"sUP" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_half_cap"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"sUV" = (
/turf/open/floor/prison/darkbrowncorners2/east,
/area/fiorina/tumor/aux_engi)
-"sUX" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
+"sUW" = (
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"sUY" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/corsat/squares,
@@ -24711,24 +24633,10 @@
/obj/item/storage/bag/trash,
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"sWR" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/cell_stripe/west,
-/area/fiorina/station/security)
-"sWX" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_full"
- },
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/research_cells/west)
"sXa" = (
/obj/structure/machinery/filtration/console,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"sXe" = (
-/turf/open/floor/prison,
-/area/fiorina/station/research_cells/east)
"sXi" = (
/turf/open/floor/corsat/plate,
/area/fiorina/tumor/aux_engi)
@@ -24751,12 +24659,21 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
+"sYv" = (
+/obj/structure/largecrate/supply,
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/medbay)
"sYy" = (
/obj/item/ammo_casing{
icon_state = "casing_1"
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
+"sYA" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"sYB" = (
/turf/open/floor/prison/darkyellow2/northwest,
/area/fiorina/station/telecomm/lz1_tram)
@@ -24764,23 +24681,22 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/station/security)
-"sYX" = (
-/obj/structure/lattice,
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/open/space,
-/area/fiorina/oob)
+"sZh" = (
+/obj/item/newspaper,
+/turf/open/floor/prison/whitepurplecorner,
+/area/fiorina/station/research_cells/west)
"sZt" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_tram)
+"sZG" = (
+/obj/item/tool/surgery/scalpel,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"sZZ" = (
/obj/structure/barricade/wooden,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"tad" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/disco/east_disco)
"tai" = (
/obj/structure/bed/chair,
/obj/structure/prop/souto_land/pole,
@@ -24802,18 +24718,13 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"taI" = (
-/obj/structure/machinery/vending/coffee,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+"taF" = (
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"taL" = (
/obj/item/clothing/under/color/orange,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"taS" = (
-/obj/item/stack/cable_coil,
-/turf/open/floor/prison/blue/northeast,
-/area/fiorina/station/power_ring/reactor)
"taY" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/space/basic,
@@ -24836,10 +24747,17 @@
},
/turf/open/floor/prison/greenfull/east,
/area/fiorina/tumor/servers)
-"tcd" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
+"tcb" = (
+/obj/structure/holohoop{
+ dir = 8;
+ id = "basketball";
+ side = "right"
+ },
+/obj/structure/barricade/handrail{
+ dir = 4
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"tco" = (
/obj/item/paper/crumpled/bloody/csheet,
/turf/open/floor/prison/floor_plate,
@@ -24877,10 +24795,15 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"tdY" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/central_ring)
+"tdI" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/item/tool/shovel/spade,
+/turf/open/floor/prison/greenfull/northwest,
+/area/fiorina/station/botany)
+"ted" = (
+/obj/effect/landmark/wo_supplies/storage/belts/knifebelt,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"tel" = (
/turf/closed/wall/mineral/bone_resin,
/area/fiorina/station/medbay)
@@ -24899,14 +24822,10 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/servers)
-"teE" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_left,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
+"tez" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/darkbrown2/east,
+/area/fiorina/station/park)
"teI" = (
/obj/structure/largecrate/supply/supplies/tables_racks,
/turf/open/floor/prison/floor_plate,
@@ -24923,6 +24842,10 @@
},
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/tumor/ice_lab)
+"tfn" = (
+/obj/structure/largecrate/random/barrel/blue,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
"tfw" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/darkpurplefull2,
@@ -24933,13 +24856,6 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"tfy" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecaldir"
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"tfP" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/fiberbush)
@@ -24956,12 +24872,25 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
+"tgi" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"tgB" = (
/obj/structure/barricade/wooden{
dir = 4
},
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
+"tgE" = (
+/obj/structure/platform_decoration/metal/almayer,
+/obj/structure/inflatable,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
"tgK" = (
/obj/structure/machinery/landinglight/ds1/delayone,
/turf/open/floor/prison/darkyellowfull2/east,
@@ -24974,14 +24903,14 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"thz" = (
+"thB" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/lockbox/vials{
- pixel_x = -4;
- pixel_y = 4
+/obj/item/reagent_container/food/snacks/mre_pack/meal4{
+ name = "\improper prison food";
+ pixel_y = 9
},
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"thI" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -25000,14 +24929,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"tim" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/tumor/ice_lab)
"tir" = (
/obj/item/ammo_magazine/rifle/m16,
/turf/open/floor/prison,
@@ -25020,14 +24941,13 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"tiP" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
-"tiX" = (
-/obj/item/stack/sheet/mineral/plastic,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
+"tiw" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/obj/item/stack/barbed_wire,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"tiY" = (
/turf/open/floor/prison/floorscorched2,
/area/fiorina/tumor/civres)
@@ -25037,13 +24957,6 @@
"tja" = (
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"tjh" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/east)
"tji" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22";
@@ -25061,15 +24974,25 @@
/turf/open/floor/prison,
/area/fiorina/station/telecomm/lz1_cargo)
"tjR" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
+/obj/structure/platform/metal/almayer/east,
+/obj/item/shard{
+ icon_state = "medium";
+ name = "ice shard"
},
-/obj/structure/machinery/shower{
- dir = 1;
+/turf/open/floor/prison/whitegreen/east,
+/area/fiorina/tumor/ice_lab)
+"tjT" = (
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/turf/open/space/basic,
+/area/fiorina/oob)
+"tkc" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue{
pixel_y = -1
},
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"tkd" = (
/obj/structure/filingcabinet,
/obj/structure/filingcabinet{
@@ -25081,20 +25004,9 @@
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
-"tkh" = (
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
"tkj" = (
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/station/park)
-"tkZ" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = -3
- },
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
"tle" = (
/obj/structure/filingcabinet{
pixel_x = 8;
@@ -25107,12 +25019,6 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
-"tlj" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/open/floor/prison/bluecorner,
-/area/fiorina/station/power_ring/reactor)
"tlq" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/flashlight/lamp{
@@ -25146,6 +25052,11 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
+"tmf" = (
+/obj/structure/machinery/space_heater,
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/whitegreen/east,
+/area/fiorina/tumor/ice_lab)
"tmo" = (
/obj/structure/stairs/perspective,
/turf/open/floor/plating/prison,
@@ -25161,6 +25072,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"tmz" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"tmF" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/prison/whitegreen/north,
@@ -25191,14 +25106,10 @@
/obj/effect/landmark/queen_spawn,
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/tumor/aux_engi)
-"tnx" = (
-/obj/structure/platform_decoration/metal/almayer,
-/obj/item/shard{
- icon_state = "medium";
- name = "ice shard"
- },
-/turf/open/floor/prison/whitegreen,
-/area/fiorina/tumor/ice_lab)
+"tnU" = (
+/obj/item/stack/sheet/cardboard,
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
"tob" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 2;
@@ -25206,35 +25117,9 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"tok" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
"toE" = (
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"toG" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space,
-/area/fiorina/oob)
-"toN" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"tpa" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
@@ -25247,6 +25132,19 @@
},
/turf/open/floor/prison/chapel_carpet/doubleside,
/area/fiorina/maintenance)
+"tph" = (
+/obj/structure/extinguisher_cabinet,
+/obj/structure/window/framed/prison,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
+"tpn" = (
+/obj/structure/largecrate/random/barrel/white,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"tpt" = (
/obj/structure/closet/wardrobe/chaplain_black,
/obj/effect/spawner/random/goggles,
@@ -25315,13 +25213,11 @@
/obj/item/stack/barbed_wire,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"trR" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
+"trO" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
},
-/obj/item/storage/fancy/cigarettes/blackpack,
-/turf/open/floor/prison/whitepurple/southeast,
+/turf/open/floor/prison/kitchen,
/area/fiorina/station/research_cells/west)
"trS" = (
/obj/structure/barricade/wooden{
@@ -25380,10 +25276,20 @@
},
/turf/open/floor/prison/darkredfull2,
/area/fiorina/station/security)
-"ttU" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/gm/river/red_pool,
-/area/fiorina/station/park)
+"ttc" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/stack/sheet/plasteel/medium_stack,
+/obj/item/reagent_container/food/drinks/flask/vacuumflask{
+ pixel_x = 7;
+ pixel_y = 22
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
+"ttK" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/item/trash/used_stasis_bag,
+/turf/open/floor/prison/whitegreen/northwest,
+/area/fiorina/station/medbay)
"tuf" = (
/obj/item/clothing/shoes/jackboots{
name = "Awesome Guy"
@@ -25402,6 +25308,13 @@
"tuA" = (
/turf/open/floor/prison/cell_stripe/west,
/area/fiorina/station/telecomm/lz1_tram)
+"tuT" = (
+/obj/item/clothing/under/color/orange,
+/obj/item/clothing/under/color/orange,
+/obj/item/clothing/under/color/orange,
+/obj/structure/surface/rack,
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/showers_laundry)
"tvi" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
@@ -25423,16 +25336,6 @@
/obj/structure/machinery/door/poddoor/shutters/almayer,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
-"txf" = (
-/obj/structure/prop/almayer/computers/sensor_computer1{
- name = "computer"
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"txh" = (
/obj/structure/bed/sofa/vert/grey,
/turf/open/floor/prison,
@@ -25445,9 +25348,21 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/darkbrown2/west,
/area/fiorina/station/park)
+"tye" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/darkbrown2/northeast,
+/area/fiorina/station/park)
"tyj" = (
/turf/open/floor/prison/blue/east,
/area/fiorina/station/chapel)
+"tyk" = (
+/obj/structure/window/framed/prison/reinforced/hull,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
+"tyo" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/blue/southwest,
+/area/fiorina/station/power_ring)
"tyt" = (
/obj/item/ammo_casing{
dir = 8;
@@ -25468,13 +25383,14 @@
/obj/structure/closet/crate/freezer,
/turf/open/floor/prison/kitchen,
/area/fiorina/station/power_ring)
-"tzy" = (
-/obj/item/ammo_magazine/smg/mp5,
-/obj/structure/extinguisher_cabinet{
- pixel_y = 29
+"tyQ" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/effect/decal/cleanable/blood/splatter{
+ icon_state = "gibup1"
},
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+/turf/open/floor/prison/whitegreen/north,
+/area/fiorina/station/medbay)
"tzU" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/prison/bluefull,
@@ -25498,10 +25414,26 @@
},
/turf/open/floor/prison/cell_stripe/east,
/area/fiorina/station/medbay)
-"tAE" = (
-/obj/structure/barricade/handrail,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/east)
+"tAq" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform_decoration/metal/kutjevo/north,
+/obj/structure/barricade/handrail{
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "solar lattice"
+ },
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/fiorina/oob)
+"tAN" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"tAR" = (
/obj/structure/surface/rack,
/obj/item/tool/extinguisher,
@@ -25512,16 +25444,12 @@
/obj/item/tool/crowbar,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"tBP" = (
-/obj/structure/machinery/shower{
- dir = 1
- },
-/turf/open/floor/interior/plastic,
-/area/fiorina/station/research_cells/east)
-"tCm" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/flight_deck)
+"tCc" = (
+/obj/item/weapon/gun/rifle/m16,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/prisoner,
+/turf/open/floor/prison/damaged3,
+/area/fiorina/station/security)
"tCv" = (
/obj/effect/landmark/corpsespawner/ua_riot/burst,
/turf/open/floor/prison/greenfull/east,
@@ -25557,14 +25485,14 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"tDK" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
-"tDO" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/civres_blue)
+"tDF" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/tumor/servers)
"tDQ" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -25588,8 +25516,9 @@
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
"tEU" = (
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
+/obj/item/stack/sheet/mineral/plastic,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/east)
"tEX" = (
/obj/structure/machinery/vending/cigarette,
/turf/open/floor/prison/floor_plate,
@@ -25600,19 +25529,20 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
+"tFi" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/greenfull/northwest,
+/area/fiorina/station/transit_hub)
"tFo" = (
/obj/structure/reagent_dispensers/watertank{
layer = 2.6
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
-"tFB" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/effect/decal/medical_decals{
- icon_state = "cryomid"
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
+"tGc" = (
+/obj/item/stack/rods,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"tGU" = (
/obj/structure/closet/crate/medical,
/obj/item/storage/pill_bottle/tramadol/skillless,
@@ -25629,19 +25559,14 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/security/wardens)
-"tHl" = (
-/obj/structure/inflatable,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"tHp" = (
-/obj/structure/machinery/space_heater,
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/whitegreen/east,
-/area/fiorina/tumor/ice_lab)
"tHw" = (
/obj/item/stack/rods,
/turf/open/floor/prison/darkbrown2/east,
/area/fiorina/tumor/aux_engi)
+"tHC" = (
+/obj/item/clothing/gloves/boxing,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/lowsec/showers_laundry)
"tHJ" = (
/obj/structure/closet/firecloset,
/obj/effect/landmark/objective_landmark/medium,
@@ -25674,10 +25599,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"tIN" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"tIU" = (
/obj/item/tool/candle,
/turf/open/floor/prison/chapel_carpet,
@@ -25709,6 +25630,10 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"tJS" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/telecomm/lz1_tram)
"tJU" = (
/obj/structure/machinery/vending/coffee,
/obj/structure/machinery/light/double/blue{
@@ -25718,13 +25643,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"tKh" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/machinery/door/airlock/prison_hatch/autoname{
- dir = 1
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/tumor/ice_lab)
"tKk" = (
/obj/structure/bed{
icon_state = "abed"
@@ -25732,6 +25650,12 @@
/obj/item/reagent_container/food/snacks/wrapped/barcardine,
/turf/open/floor/prison/yellow/southwest,
/area/fiorina/station/lowsec)
+"tKm" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
+ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"tKv" = (
/obj/structure/machinery/computer/secure_data{
dir = 8
@@ -25739,6 +25663,27 @@
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
+"tKH" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/prop/souto_land/pole{
+ dir = 1
+ },
+/obj/structure/prop/souto_land/pole{
+ dir = 8;
+ pixel_y = 24
+ },
+/turf/open/floor/prison/darkbrown2/east,
+/area/fiorina/station/park)
+"tKI" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/east,
+/area/fiorina/station/research_cells/west)
"tKN" = (
/obj/item/trash/used_stasis_bag{
desc = "Wow, instant sand. They really have everything in space.";
@@ -25746,6 +25691,11 @@
},
/turf/open/floor/prison/green/east,
/area/fiorina/tumor/civres)
+"tKU" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/trash/cigbutt,
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"tLk" = (
/obj/item/paper/crumpled,
/turf/open/floor/prison/sterile_white/southwest,
@@ -25754,20 +25704,18 @@
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"tLZ" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/northeast,
+/turf/open/floor/prison/whitegreen/northwest,
+/area/fiorina/tumor/ice_lab)
"tMb" = (
/obj/structure/prop/souto_land/pole{
dir = 1
},
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
-"tMr" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/central_ring)
"tMs" = (
/obj/item/weapon/gun/smg/mp5,
/obj/effect/decal/cleanable/blood,
@@ -25792,12 +25740,6 @@
/obj/structure/closet/firecloset/full,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"tMW" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/turf/open/floor/prison/blue/southeast,
-/area/fiorina/station/power_ring/reactor)
"tNf" = (
/obj/structure/stairs/perspective{
dir = 1;
@@ -25805,6 +25747,11 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"tNo" = (
+/obj/item/tool/wirecutters,
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"tNF" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -25816,22 +25763,31 @@
/obj/item/prop/helmetgarb/riot_shield,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"tNQ" = (
+/obj/structure/barricade/sandbags{
+ icon_state = "sandbag_0";
+ layer = 2.97;
+ pixel_y = -14
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"tNV" = (
/obj/item/stack/sheet/wood,
/turf/open/floor/plating/prison,
/area/fiorina/station/park)
-"tOc" = (
-/turf/open/floor/wood,
-/area/fiorina/station/disco/east_disco)
-"tOp" = (
-/obj/structure/window/framed/prison/cell,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
"tOG" = (
/obj/structure/surface/table/woodentable,
/obj/item/storage/pill_bottle/kelotane/skillless,
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
+"tOK" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"tOM" = (
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
@@ -25843,6 +25799,10 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"tPf" = (
+/obj/structure/machinery/vending/sovietsoda,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"tPz" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/device/flashlight/lamp/candelabra{
@@ -25856,9 +25816,6 @@
/obj/structure/largecrate/supply/medicine/iv,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/telecomm/lz1_cargo)
-"tPB" = (
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
"tPC" = (
/turf/open/floor/prison/darkyellowcorners2,
/area/fiorina/station/flight_deck)
@@ -25866,11 +25823,15 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"tPR" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/surface/rack,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
+"tQi" = (
+/obj/structure/machinery/door/airlock/prison/horizontal{
+ density = 0;
+ dir = 4;
+ icon_state = "door_open";
+ opacity = 0
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"tQk" = (
/obj/item/shard{
icon_state = "medium"
@@ -25888,25 +25849,25 @@
"tRH" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/botany)
-"tSl" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/stack/sheet/mineral/plastic,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"tSm" = (
/turf/open/floor/prison/greenblue/west,
/area/fiorina/station/botany)
+"tSv" = (
+/obj/item/stool,
+/obj/structure/sign/poster{
+ icon_state = "poster14";
+ pixel_y = 32
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
+"tSI" = (
+/obj/structure/bed/chair,
+/turf/open/floor/prison/bluecorner,
+/area/fiorina/station/power_ring/reactor)
"tSY" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/transit_hub)
-"tTm" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/stool{
- pixel_y = 12
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"tTv" = (
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/prison/darkyellow2/west,
@@ -25942,6 +25903,13 @@
/obj/structure/closet,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/flight_deck)
+"tUF" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/item/fuel_cell,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"tUG" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/toolbox/mechanical/green,
@@ -25952,30 +25920,12 @@
/obj/item/explosive/grenade/high_explosive/frag,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"tVp" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/closet/crate/bravo,
-/obj/item/stack/sheet/plasteel,
-/obj/item/tool/wirecutters,
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = 13
+"tVb" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname{
+ dir = 1
},
/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"tVI" = (
-/obj/structure/inflatable/popped/door,
-/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/research_cells/west)
-"tVV" = (
-/obj/effect/landmark/corpsespawner/ua_riot,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"tVY" = (
-/obj/structure/machinery/power/smes/buildable,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
"tWf" = (
/obj/structure/inflatable/popped,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -25984,19 +25934,6 @@
/obj/structure/closet/secure_closet/hydroponics,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/botany)
-"tWo" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/greenblue/west,
-/area/fiorina/station/botany)
-"tWs" = (
-/obj/item/toy/deck,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"tWz" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/tool/pen/blue/clicky,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"tXt" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -26027,13 +25964,6 @@
"tYw" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/civres)
-"tYz" = (
-/obj/structure/bed/roller,
-/obj/item/bedsheet/green,
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"tYQ" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/blue_plate/east,
@@ -26043,12 +25973,9 @@
/obj/item/paper_bin,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
-"tZe" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
+"tYX" = (
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"tZk" = (
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/aux_engi)
@@ -26056,14 +25983,17 @@
/obj/structure/prop/almayer/computers/sensor_computer1,
/turf/open/floor/prison/darkredfull2,
/area/fiorina/lz/near_lzI)
-"tZE" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
"tZO" = (
/obj/item/frame/rack,
/turf/open/floor/plating/prison,
/area/fiorina/station/disco)
+"tZP" = (
+/obj/item/stack/sheet/metal,
+/obj/structure/barricade/handrail{
+ dir = 4
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"tZW" = (
/obj/item/tool/wet_sign,
/turf/open/floor/almayer/plate,
@@ -26085,24 +26015,6 @@
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"ubh" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
-"ubo" = (
-/obj/item/stack/sheet/metal/medium_stack,
-/obj/structure/surface/rack,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"ubx" = (
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
"ubA" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/emails{
@@ -26119,14 +26031,6 @@
"ubP" = (
/turf/open/floor/prison,
/area/fiorina/station/security)
-"ubQ" = (
-/obj/structure/ice/thin/indestructible{
- dir = 8;
- icon_state = "Straight"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
"ubX" = (
/turf/open/floor/prison/whitegreen/northeast,
/area/fiorina/tumor/ice_lab)
@@ -26158,10 +26062,6 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/telecomm/lz1_tram)
-"udd" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/darkbrown2,
-/area/fiorina/station/park)
"udj" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/floor_plate,
@@ -26201,14 +26101,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
-"ueD" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/disco)
+"ueE" = (
+/obj/structure/machinery/vending/coffee,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"ueI" = (
/obj/structure/filingcabinet,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -26223,10 +26119,10 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"ufE" = (
-/obj/effect/decal/cleanable/blood/drip,
+"ufh" = (
+/obj/structure/platform_decoration/metal/almayer,
/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+/area/fiorina/station/transit_hub)
"ufL" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_sn_full_cap"
@@ -26241,16 +26137,14 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/prison/panelscorched,
/area/fiorina/tumor/aux_engi)
-"ufR" = (
-/turf/open/floor/prison/whitepurplecorner/east,
-/area/fiorina/station/research_cells/west)
-"ugg" = (
-/obj/structure/closet/crate/miningcar{
- name = "\improper materials storage bin"
+"ufP" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
},
-/obj/item/reagent_container/food/snacks/meat,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/park)
"ugk" = (
/turf/open/floor/prison/darkbrowncorners2,
/area/fiorina/tumor/aux_engi)
@@ -26289,14 +26183,13 @@
},
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"uhm" = (
-/obj/structure/window_frame/prison/reinforced,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
-"uhA" = (
-/obj/structure/closet/bodybag,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
+"uhW" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/cameras{
+ dir = 4
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/disco/east_disco)
"uhX" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/whitegreen/northeast,
@@ -26308,6 +26201,17 @@
},
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/botany)
+"uid" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/prisoner,
+/turf/open/floor/prison,
+/area/fiorina/station/security)
+"uin" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/fiorina/station/research_cells/west)
"uiD" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -26321,13 +26225,10 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"ujs" = (
-/obj/item/shard{
- icon_state = "large";
- name = "ice shard"
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
+"ujx" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/prison,
+/area/fiorina/station/research_cells/east)
"ujz" = (
/obj/item/paper/prison_station/inmate_handbook,
/turf/open/floor/prison/floor_plate/southwest,
@@ -26342,14 +26243,20 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"ulc" = (
-/obj/item/paper,
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
-"ulN" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
+"ulj" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/power_ring)
+"ulp" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southeast,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
"ume" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/drinks/coffee{
@@ -26369,12 +26276,6 @@
"umm" = (
/turf/open/floor/prison/yellow/north,
/area/fiorina/station/central_ring)
-"umu" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- icon = 'icons/obj/structures/doors/2x1prepdoor.dmi'
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"umy" = (
/obj/structure/prop/resin_prop{
dir = 4;
@@ -26391,9 +26292,6 @@
/obj/item/clothing/gloves/boxing/blue,
/turf/open/floor/prison/yellow/northwest,
/area/fiorina/station/central_ring)
-"umN" = (
-/turf/closed/wall/prison,
-/area/fiorina/station/lowsec/east)
"umW" = (
/obj/structure/bed/sofa/pews,
/turf/open/floor/wood,
@@ -26420,6 +26318,10 @@
},
/turf/open/floor/prison,
/area/fiorina/station/security)
+"unv" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"unz" = (
/obj/structure/closet/secure_closet/security_empty,
/obj/structure/window/reinforced{
@@ -26431,32 +26333,18 @@
"unA" = (
/turf/open/floor/prison/platingdmg1,
/area/fiorina/station/civres_blue)
-"uou" = (
-/obj/structure/barricade/sandbags{
- dir = 8;
- icon_state = "sandbag_0";
- pixel_y = 2
- },
-/obj/item/storage/toolbox/syndicate,
+"unJ" = (
+/obj/structure/platform_decoration/metal/almayer/north,
/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
-"uow" = (
-/obj/structure/machinery/light/double/blue{
- dir = 8;
- pixel_x = -10;
- pixel_y = -3
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"uoH" = (
-/obj/structure/barricade/sandbags{
- dir = 4;
- icon_state = "sandbag_0";
- pixel_y = 2
- },
-/obj/item/storage/pouch/tools/full,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/disco/east_disco)
+/area/fiorina/station/power_ring)
+"uon" = (
+/obj/item/stack/sheet/wood,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
+"uox" = (
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/lowsec/east)
"upf" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/prison/darkbrown2/west,
@@ -26474,10 +26362,6 @@
},
/turf/open/floor/prison/redcorner/east,
/area/fiorina/station/power_ring)
-"upM" = (
-/obj/structure/disposalpipe/broken,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
"upX" = (
/obj/structure/sign/nosmoking_1,
/turf/closed/wall/prison,
@@ -26490,50 +26374,32 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"uqV" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
+"uqF" = (
+/obj/structure/closet,
+/turf/open/floor/prison/bluecorner/east,
+/area/fiorina/station/power_ring/reactor)
+"urj" = (
+/obj/structure/platform_decoration/metal/kutjevo/west,
+/turf/open/space,
+/area/fiorina/oob)
"urv" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
-"urw" = (
-/obj/structure/machinery/power/apc/power/north,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/east)
"usg" = (
/obj/effect/spawner/random/attachment,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"utl" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
-"utm" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
"uts" = (
/obj/structure/surface/rack,
/obj/item/storage/toolbox/mechanical/green,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"utw" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/computer/secure_data{
- dir = 4
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
+"utB" = (
+/obj/item/stack/sheet/metal/medium_stack,
+/obj/structure/surface/rack,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"utL" = (
/obj/structure/bed/chair,
/turf/open/floor/prison/darkbrown2/north,
@@ -26542,33 +26408,17 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/lz/near_lzI)
-"uud" = (
-/obj/structure/bed/chair/office/dark,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+"uui" = (
+/obj/structure/ice/thin/indestructible{
+ icon_state = "Corner"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"uuk" = (
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzII)
-"uuG" = (
-/obj/structure/machinery/washing_machine,
-/obj/structure/machinery/washing_machine{
- pixel_y = 15
- },
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
-"uuJ" = (
-/obj/structure/holohoop{
- dir = 8;
- id = "basketball";
- side = "right"
- },
-/obj/structure/barricade/handrail{
- dir = 4
- },
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"uuL" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
density = 0;
@@ -26580,6 +26430,12 @@
/obj/item/prop/helmetgarb/gunoil,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"uvg" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"uvn" = (
/turf/open/floor/prison/darkyellow2,
/area/fiorina/station/telecomm/lz1_cargo)
@@ -26621,10 +26477,14 @@
/obj/structure/largecrate/supply/supplies/water,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"uwk" = (
-/obj/structure/window/framed/prison/reinforced/hull,
+"uwn" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+/area/fiorina/station/civres_blue)
"uwT" = (
/obj/structure/sign/poster{
icon_state = "poster10";
@@ -26636,6 +26496,13 @@
/obj/effect/spawner/random/tool,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
+"uxh" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/item/toy/beach_ball/holoball,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"uxv" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
@@ -26658,19 +26525,6 @@
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"uyA" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
-"uyC" = (
-/obj/structure/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/machinery/shower{
- dir = 4
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
"uyM" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/prison,
@@ -26715,6 +26569,24 @@
"uAg" = (
/turf/open/floor/prison/whitegreencorner/north,
/area/fiorina/tumor/ice_lab)
+"uAB" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/closet/crate/bravo,
+/obj/item/stack/sheet/plasteel,
+/obj/item/tool/wirecutters,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"uAE" = (
+/obj/structure/bed/chair/comfy{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/fiorina/station/lowsec/east)
"uAX" = (
/obj/effect/decal/hefa_cult_decals/d32,
/turf/open/floor/prison/chapel_carpet/doubleside,
@@ -26727,23 +26599,25 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"uBX" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+"uBH" = (
+/obj/structure/platform_decoration/metal/kutjevo,
+/turf/open/space,
+/area/fiorina/oob)
+"uCc" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"uCO" = (
/obj/structure/bed/chair/comfy{
dir = 4
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"uDF" = (
-/obj/structure/window/framed/prison/reinforced/hull,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco/east_disco)
+"uCV" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/surface/rack,
+/turf/open/floor/prison,
+/area/fiorina/lz/near_lzI)
"uDX" = (
/obj/structure/prop/structure_lattice{
health = 300
@@ -26765,10 +26639,12 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"uEl" = (
-/obj/structure/platform_decoration/metal/kutjevo/east,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"uEx" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
+ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi'
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"uEy" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/cell_stripe/east,
@@ -26802,32 +26678,22 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"uFr" = (
-/obj/structure/platform_decoration/metal/almayer,
-/obj/structure/barricade/handrail/type_b{
- dir = 4;
- layer = 3.5
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"uFx" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"uFv" = (
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/greenblue/west,
+/area/fiorina/station/botany)
"uFC" = (
/obj/structure/barricade/metal/wired,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"uFL" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
-"uFW" = (
-/obj/effect/landmark/corpsespawner/scientist,
-/turf/open/floor/prison/whitepurple/north,
+"uFO" = (
+/obj/item/trash/chunk,
+/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/station/research_cells/west)
+"uGb" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/tumor/servers)
"uGu" = (
/obj/effect/decal/hefa_cult_decals/d32{
icon_state = "3"
@@ -26840,13 +26706,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/lz/near_lzI)
-"uGL" = (
-/obj/item/trash/used_stasis_bag{
- desc = "Wow, instant sand. They really have everything in space.";
- name = "Insta-Sand! bag"
- },
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
"uGT" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
@@ -26858,14 +26717,6 @@
/obj/item/tool/weldingtool,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
-"uHv" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/stairs/perspective{
- dir = 4;
- icon_state = "p_stair_full"
- },
-/turf/open/floor/prison,
-/area/fiorina/station/botany)
"uIg" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/toolbox/mechanical{
@@ -26873,6 +26724,10 @@
},
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/maintenance)
+"uIi" = (
+/obj/item/stack/tile/plasteel,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"uIB" = (
/obj/structure/bed/chair{
dir = 1
@@ -26907,16 +26762,19 @@
},
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
-"uJp" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/showers_laundry)
"uJG" = (
/obj/item/ammo_casing{
icon_state = "casing_10_1"
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"uJM" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalleft"
+ },
+/turf/open/floor/prison/whitegreen/north,
+/area/fiorina/station/medbay)
"uJQ" = (
/obj/item/stack/cable_coil,
/turf/open/floor/prison/whitegreen/southeast,
@@ -26938,18 +26796,23 @@
/obj/item/clipboard,
/turf/open/floor/prison,
/area/fiorina/station/park)
-"uKK" = (
-/obj/structure/bed/roller,
-/obj/item/bedsheet/green,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
+"uKJ" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 8;
+ icon_state = "Corner"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"uKX" = (
/turf/open/floor/prison/redfull,
/area/fiorina/station/security/wardens)
-"uLj" = (
-/obj/effect/decal/cleanable/blood/gibs/robot/limb,
-/turf/open/floor/prison/whitepurple/northeast,
-/area/fiorina/station/research_cells/east)
+"uLo" = (
+/obj/structure/barricade/metal/wired{
+ dir = 8
+ },
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/disco/east_disco)
"uLq" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/cell_stripe/east,
@@ -26959,15 +26822,20 @@
/obj/structure/machinery/computer/station_alert,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
+"uLK" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"uLM" = (
/obj/item/clothing/mask/cigarette/cigar/cohiba,
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/station/chapel)
-"uLV" = (
-/obj/item/bedsheet,
+"uLT" = (
+/obj/effect/landmark/corpsespawner/prisoner,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
+/area/fiorina/station/research_cells/west)
"uMc" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/prison,
@@ -26985,15 +26853,13 @@
/obj/structure/surface/rack,
/turf/open/floor/plating/plating_catwalk,
/area/fiorina/tumor/ship)
-"uMt" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
"uMw" = (
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
+"uMy" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/darkbrown2/west,
+/area/fiorina/station/park)
"uMN" = (
/obj/item/trash/semki,
/turf/open/floor/prison/floor_plate,
@@ -27016,12 +26882,6 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
-"uNh" = (
-/obj/structure/stairs/perspective,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/medbay)
"uNm" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/spawner/random/gun/rifle/highchance,
@@ -27037,14 +26897,6 @@
/obj/structure/machinery/landinglight/ds1,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
-"uNB" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/cell_stripe,
-/area/fiorina/station/lowsec)
"uNG" = (
/obj/structure/machinery/power/apc/power/north,
/turf/open/floor/prison,
@@ -27056,12 +26908,21 @@
"uNM" = (
/turf/closed/wall/prison,
/area/fiorina/tumor/aux_engi)
+"uOb" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"uOu" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_sn_full_cap"
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
+"uOw" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison/whitegreen/west,
+/area/fiorina/tumor/ice_lab)
"uOx" = (
/obj/effect/decal/hefa_cult_decals/d32{
icon_state = "bee"
@@ -27087,6 +26948,33 @@
"uPl" = (
/turf/open/floor/prison/darkyellowcorners2/east,
/area/fiorina/station/telecomm/lz1_cargo)
+"uPw" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/obj/item/reagent_container/food/drinks/flask/barflask,
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
+"uPy" = (
+/obj/effect/landmark/corpsespawner/engineer,
+/turf/open/floor/prison/bluecorner/north,
+/area/fiorina/station/power_ring/reactor)
+"uPC" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
+"uPE" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"uPX" = (
/turf/open/floor/prison/green/northeast,
/area/fiorina/tumor/civres)
@@ -27108,15 +26996,6 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/prison/whitegreen/southeast,
/area/fiorina/tumor/ice_lab)
-"uRh" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/disco)
"uRv" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -27165,13 +27044,6 @@
},
/turf/open/floor/prison/darkyellow2/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"uTq" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/turf/open/floor/prison/whitepurple/southwest,
-/area/fiorina/station/research_cells/east)
"uTr" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/prison/whitegreen/west,
@@ -27184,14 +27056,6 @@
/obj/item/device/flashlight/flare,
/turf/open/floor/prison/darkyellowcorners2/north,
/area/fiorina/station/telecomm/lz1_cargo)
-"uTv" = (
-/obj/structure/window/framed/prison/reinforced/hull,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
-"uTw" = (
-/obj/item/weapon/gun/rifle/mar40,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"uTA" = (
/obj/structure/bed/chair{
dir = 8
@@ -27203,6 +27067,17 @@
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
+"uUJ" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/transit_hub)
+"uUU" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison/bluecorner/north,
+/area/fiorina/station/power_ring/reactor)
"uVk" = (
/obj/effect/decal{
icon = 'icons/obj/items/policetape.dmi';
@@ -27218,6 +27093,10 @@
icon_state = "stan_inner_w_1"
},
/area/fiorina/tumor/ship)
+"uVo" = (
+/obj/structure/largecrate/random/barrel/white,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"uVD" = (
/turf/open/floor/corsat/squares,
/area/fiorina/station/medbay)
@@ -27236,12 +27115,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"uVM" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/closet/firecloset/full,
-/obj/item/paper/prison_station/inmate_handbook,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"uVO" = (
/obj/structure/prop/souto_land/pole{
dir = 1
@@ -27271,12 +27144,6 @@
},
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
-"uWk" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/east,
-/obj/item/tool/extinguisher/mini,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
"uWA" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/obj/structure/machinery/light/double/blue{
@@ -27287,6 +27154,10 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/greenfull/east,
/area/fiorina/tumor/civres)
+"uXa" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"uXn" = (
/obj/structure/flora/bush/ausbushes/ausbush{
desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now.";
@@ -27317,6 +27188,10 @@
/obj/item/reagent_container/food/drinks/bottle/pwine,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/civres)
+"uXV" = (
+/obj/item/stack/medical/bruise_pack,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"uXY" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
pixel_y = 32
@@ -27326,6 +27201,20 @@
"uYi" = (
/turf/open/floor/prison/darkyellow2,
/area/fiorina/lz/near_lzI)
+"uYj" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space/basic,
+/area/fiorina/oob)
+"uYr" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_left,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"uYx" = (
/obj/structure/prop/resin_prop{
icon_state = "coolanttank"
@@ -27338,6 +27227,15 @@
},
/turf/open/floor/prison,
/area/fiorina/tumor/servers)
+"uZo" = (
+/obj/item/prop/helmetgarb/spacejam_tickets{
+ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
+ name = "\improper arcade tickets";
+ pixel_x = 1;
+ pixel_y = -1
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"uZt" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "A ticket to Souto Man's raffle!";
@@ -27363,6 +27261,10 @@
/obj/effect/spawner/random/gun/rifle/lowchance,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"uZS" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"uZX" = (
/obj/structure/curtain,
/turf/open/floor/plating/prison,
@@ -27377,10 +27279,6 @@
/obj/item/device/flashlight/flare,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/telecomm/lz1_cargo)
-"vao" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"vaC" = (
/obj/structure/closet/bombcloset,
/obj/item/clothing/suit/armor/bulletproof,
@@ -27389,15 +27287,14 @@
/obj/item/stack/sheet/mineral/plastic,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
+"vaX" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"vbV" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"vce" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/item/tool/shovel/spade,
-/turf/open/floor/prison/greenfull/northwest,
-/area/fiorina/station/botany)
"vcf" = (
/turf/closed/shuttle/ert{
icon_state = "stan5"
@@ -27407,22 +27304,10 @@
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
-"vcn" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"vcq" = (
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/prison/blue_plate/west,
/area/fiorina/station/botany)
-"vcv" = (
-/obj/item/tool/screwdriver,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"vcC" = (
/obj/item/stack/rods,
/turf/open/space,
@@ -27456,17 +27341,18 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"vdR" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
"vdW" = (
/obj/effect/decal/cleanable/blood{
icon_state = "gib6"
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/disco)
-"vej" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
"vel" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/prison/floor_plate,
@@ -27486,6 +27372,21 @@
opacity = 0
},
/area/fiorina/oob)
+"veC" = (
+/obj/structure/reagent_dispensers/water_cooler{
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/obj/structure/reagent_dispensers/water_cooler{
+ pixel_x = 11;
+ pixel_y = 8
+ },
+/obj/structure/reagent_dispensers/water_cooler{
+ pixel_x = 1;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"veJ" = (
/obj/item/clothing/head/helmet/marine/specialist/hefa,
/turf/open/floor/prison,
@@ -27498,10 +27399,6 @@
/obj/structure/inflatable,
/turf/open/floor/prison/whitegreen/southwest,
/area/fiorina/station/medbay)
-"vft" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring)
"vfz" = (
/obj/item/storage/box/donkpockets,
/obj/structure/surface/table/reinforced/prison,
@@ -27511,6 +27408,9 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
+"vfA" = (
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"vfL" = (
/obj/item/storage/box/flashbangs,
/obj/structure/surface/table/reinforced/prison,
@@ -27521,9 +27421,14 @@
icon_state = "stan27"
},
/area/fiorina/station/power_ring)
-"vfO" = (
-/turf/open/floor/prison/floor_marked/west,
-/area/fiorina/station/lowsec/showers_laundry)
+"vfV" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"vgi" = (
/obj/item/stack/rods,
/turf/open/floor/prison/floor_plate,
@@ -27532,13 +27437,6 @@
/obj/item/storage/toolbox/antag,
/turf/open/floor/prison/green/west,
/area/fiorina/tumor/civres)
-"vgA" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/obj/structure/closet/emcloset,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"vgC" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -27546,16 +27444,6 @@
},
/turf/open/floor/prison/darkyellow2/northwest,
/area/fiorina/lz/near_lzI)
-"vgG" = (
-/obj/structure/machinery/power/apc/power/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco)
-"vgK" = (
-/obj/structure/platform/metal/kutjevo_smooth/west,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer_hull,
-/area/fiorina/station/medbay)
"vgL" = (
/obj/structure/closet/secure_closet/guncabinet{
req_access = null
@@ -27568,6 +27456,11 @@
/obj/item/clothing/suit/storage/marine/veteran/ua_riot,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"vgT" = (
+/obj/structure/surface/rack,
+/obj/item/tank/emergency_oxygen/engi,
+/turf/open/floor/prison/blue/southeast,
+/area/fiorina/station/power_ring/reactor)
"vhd" = (
/obj/structure/window/reinforced/tinted,
/obj/structure/surface/table/reinforced/prison,
@@ -27584,6 +27477,23 @@
"vhI" = (
/turf/open/gm/river/darkred_pool,
/area/fiorina/station/park)
+"vhX" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
+"vix" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/central_ring)
"viL" = (
/obj/item/stock_parts/micro_laser/ultra,
/turf/open/floor/prison,
@@ -27609,10 +27519,6 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"vjR" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/power_ring/reactor)
"vjT" = (
/obj/effect/alien/weeds/node,
/turf/open/floor/plating/prison,
@@ -27638,6 +27544,10 @@
},
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/station/medbay)
+"vlE" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"vlK" = (
/obj/structure/surface/rack,
/turf/open/floor/prison/whitegreen/northwest,
@@ -27667,6 +27577,13 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
+"vmc" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/bright_clean2/southwest,
+/area/fiorina/station/park)
"vmj" = (
/obj/effect/landmark/nightmare{
insert_tag = "podholder"
@@ -27689,12 +27606,24 @@
},
/turf/open/floor/prison/darkyellow2/north,
/area/fiorina/station/telecomm/lz1_cargo)
+"vmS" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/floor/prison/whitegreen/northeast,
+/area/fiorina/tumor/ice_lab)
"vmT" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/toolbox,
/obj/effect/spawner/random/toolbox,
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/aux_engi)
+"vnj" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"vnl" = (
/obj/structure/largecrate/random/barrel/white,
/obj/structure/barricade/wooden{
@@ -27705,6 +27634,15 @@
"vnr" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/telecomm/lz1_cargo)
+"vnt" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = 13
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"vnA" = (
/obj/item/tool/warning_cone{
pixel_x = -4;
@@ -27728,10 +27666,13 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/darkyellow2/southeast,
/area/fiorina/lz/near_lzI)
-"voh" = (
-/obj/item/tool/warning_cone,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
+"vnQ" = (
+/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
+"vob" = (
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/disco/east_disco)
"voi" = (
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/station/park)
@@ -27742,16 +27683,6 @@
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
/area/fiorina/station/security/wardens)
-"vor" = (
-/obj/item/weapon/gun/rifle/m16,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/prisoner,
-/turf/open/floor/prison/damaged3,
-/area/fiorina/station/security)
-"voI" = (
-/obj/item/tool/wrench,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring/reactor)
"voO" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/yellow,
@@ -27760,12 +27691,41 @@
/obj/structure/dropship_equipment/medevac_system,
/turf/open/floor/prison/floor_marked/southwest,
/area/fiorina/station/power_ring)
+"voT" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "Straight"
+ },
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "Straight"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"voV" = (
/obj/item/ammo_casing{
icon_state = "casing_6_1"
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
+"vpm" = (
+/obj/structure/surface/rack,
+/obj/item/tank/emergency_oxygen/engi,
+/turf/open/floor/prison/bluecorner,
+/area/fiorina/station/power_ring/reactor)
+"vpv" = (
+/obj/structure/holohoop{
+ dir = 1
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/east)
+"vpD" = (
+/obj/structure/machinery/door/airlock/prison_hatch/autoname{
+ dir = 1
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"vql" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/tool,
@@ -27775,36 +27735,29 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/transit_hub)
-"vqs" = (
-/obj/item/paper/prison_station/inmate_handbook,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
-"vqW" = (
-/obj/item/stack/sheet/cardboard,
-/turf/open/floor/prison/whitepurple/west,
-/area/fiorina/station/research_cells/west)
-"vrp" = (
-/obj/structure/ice/thin/indestructible{
- icon_state = "Corner"
- },
-/obj/structure/blocker/invisible_wall,
-/turf/open/ice/noweed,
-/area/fiorina/station/research_cells/basketball)
+"vqH" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/botany)
+"vrs" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/showers_laundry)
"vrA" = (
/obj/structure/machinery/landinglight/ds1/delaythree{
dir = 8
},
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/lz/near_lzI)
+"vrC" = (
+/obj/structure/platform/metal/kutjevo_smooth,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space,
+/area/fiorina/oob)
"vrF" = (
/obj/item/toy/crayon/green,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"vrH" = (
-/obj/item/stack/sheet/metal,
-/obj/item/stack/sheet/metal,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"vrO" = (
/obj/structure/closet/secure_closet/engineering_materials,
/turf/open/floor/prison/darkbrownfull2,
@@ -27813,21 +27766,10 @@
/obj/item/reagent_container/food/snacks/donkpocket,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/station/transit_hub)
-"vsr" = (
-/obj/structure/barricade/handrail,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/east)
"vsL" = (
/obj/structure/prop/dam/crane,
/turf/open/floor/prison/floor_marked/west,
/area/fiorina/tumor/servers)
-"vsM" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/obj/item/ammo_magazine/smg/mp5,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"vsT" = (
/obj/structure/cable/heavyduty{
icon_state = "1-8"
@@ -27878,19 +27820,11 @@
},
/turf/open/floor/prison/yellow/northwest,
/area/fiorina/station/disco)
-"vui" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{
- layer = 3.5
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
-"vuq" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
+"vud" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/turf/open/space/basic,
+/area/fiorina/oob)
"vuK" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/prison,
@@ -27906,6 +27840,12 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"vvo" = (
+/obj/effect/landmark/nightmare{
+ insert_tag = "researchprestine"
+ },
+/turf/closed/wall/prison,
+/area/fiorina/station/research_cells/west)
"vvp" = (
/obj/item/tool/candle{
pixel_x = 5;
@@ -27952,12 +27892,14 @@
},
/turf/open/floor/prison/blue_plate/north,
/area/fiorina/station/botany)
-"vwX" = (
-/obj/structure/barricade/wooden{
- dir = 8
+"vxp" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
},
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/east)
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
"vxs" = (
/turf/closed/shuttle/ert{
icon_state = "stan_inner_w_2"
@@ -27992,9 +27934,6 @@
},
/turf/open/floor/prison/darkyellow2/east,
/area/fiorina/station/telecomm/lz1_cargo)
-"vza" = (
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/lowsec/showers_laundry)
"vzh" = (
/obj/structure/foamed_metal,
/turf/open/floor/plating/prison,
@@ -28018,11 +27957,6 @@
},
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"vzu" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"vzB" = (
/obj/structure/machinery/door/poddoor/almayer/locked{
explo_proof = 1;
@@ -28041,22 +27975,9 @@
opacity = 0
},
/area/fiorina/tumor/ship)
-"vAU" = (
-/obj/structure/barricade/wooden{
- dir = 8
- },
-/obj/structure/barricade/wooden,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"vAX" = (
/turf/open/floor/prison/blue_plate/west,
/area/fiorina/station/botany)
-"vBa" = (
-/obj/structure/machinery/shower{
- dir = 4
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
"vBF" = (
/obj/structure/machinery/light/double/blue{
dir = 8;
@@ -28076,6 +27997,14 @@
/obj/item/tool/shovel/spade,
/turf/open/floor/prison/blue_plate/north,
/area/fiorina/station/botany)
+"vCp" = (
+/obj/structure/machinery/power/apc/power/west,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco)
+"vCr" = (
+/obj/structure/largecrate/supply/ammo,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"vCu" = (
/obj/item/storage/bible/hefa,
/turf/open/floor/prison/green/north,
@@ -28090,10 +28019,6 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"vCM" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
"vCQ" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "A ticket to Souto Man's raffle!";
@@ -28103,6 +28028,10 @@
},
/turf/open/floor/prison/blue/east,
/area/fiorina/station/chapel)
+"vCR" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/east)
"vDf" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -28124,6 +28053,13 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/corsat/plate,
/area/fiorina/station/civres_blue)
+"vDS" = (
+/obj/item/trash/used_stasis_bag{
+ desc = "Wow, instant sand. They really have everything in space.";
+ name = "Insta-Sand! bag"
+ },
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"vEK" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/power_ring)
@@ -28171,18 +28107,10 @@
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/ice_lab)
-"vFV" = (
-/obj/structure/inflatable,
-/turf/open/floor/prison/yellow/southwest,
-/area/fiorina/station/lowsec/showers_laundry)
"vFY" = (
/obj/item/reagent_container/glass/bucket,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
-"vGf" = (
-/obj/structure/largecrate/random/barrel/white,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
"vGM" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper_bin{
@@ -28193,13 +28121,6 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/flight_deck)
-"vHk" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/item/prop/almayer/comp_open{
- pixel_y = 6
- },
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"vHo" = (
/turf/open/floor/prison/blue/northeast,
/area/fiorina/tumor/servers)
@@ -28232,24 +28153,16 @@
"vIG" = (
/turf/open/floor/prison/platingdmg2,
/area/fiorina/station/security)
-"vIH" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/telecomm/lz1_tram)
-"vJh" = (
-/obj/effect/spawner/random/sentry/midchance,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
+"vIP" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring)
"vJo" = (
/obj/structure/bed/chair/office/dark{
dir = 4
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"vJw" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
"vJL" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -28265,10 +28178,6 @@
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/almayer,
/area/fiorina/tumor/ship)
-"vJR" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
"vKz" = (
/obj/item/stack/sheet/metal{
amount = 5
@@ -28285,6 +28194,14 @@
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/prison/darkbrown2/east,
/area/fiorina/maintenance)
+"vLr" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
+"vLB" = (
+/obj/structure/bed/chair/office/light,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"vLH" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/wood,
@@ -28293,10 +28210,25 @@
/obj/effect/landmark/corpsespawner/ua_riot/burst,
/turf/open/floor/prison/greenfull/northwest,
/area/fiorina/tumor/civres)
+"vLY" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/lowsec/east)
"vMk" = (
/obj/structure/machinery/vending/snack/packaged,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
+"vMl" = (
+/obj/structure/barricade/sandbags{
+ dir = 8;
+ icon_state = "sandbag_0";
+ pixel_y = 2
+ },
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
"vMs" = (
/obj/structure/machinery/vending/hydroseeds,
/turf/open/floor/prison/greenfull/northwest,
@@ -28304,11 +28236,6 @@
"vMK" = (
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/power_ring)
-"vMR" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/prisoner,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec)
"vMT" = (
/turf/open/floor/prison/darkyellowfull2/east,
/area/fiorina/station/flight_deck)
@@ -28344,10 +28271,22 @@
},
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/tumor/servers)
+"vOQ" = (
+/obj/structure/machinery/power/apc/power/south,
+/turf/open/floor/delivery,
+/area/fiorina/station/power_ring/reactor)
+"vOT" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison,
+/area/fiorina/station/transit_hub)
"vOZ" = (
/obj/structure/largecrate/supply/supplies/metal,
/turf/open/floor/plating/prison,
/area/fiorina/station/central_ring)
+"vPh" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/whitegreen,
+/area/fiorina/station/medbay)
"vPF" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/toy/prize/honk{
@@ -28368,16 +28307,16 @@
/obj/item/clothing/gloves/botanic_leather,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
+"vQn" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/west)
"vQC" = (
/obj/structure/closet/crate/trashcart,
/obj/item/storage/pill_bottle/kelotane/skillless,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison,
/area/fiorina/station/park)
-"vQD" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/security)
"vQJ" = (
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{
density = 0;
@@ -28385,16 +28324,6 @@
},
/turf/open/floor/prison/darkbrown2/north,
/area/fiorina/maintenance)
-"vQK" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/park)
-"vRk" = (
-/obj/structure/machinery/recharge_station,
-/turf/open/floor/prison/blue/northwest,
-/area/fiorina/station/power_ring/reactor)
"vRu" = (
/obj/structure/sink{
dir = 4;
@@ -28403,9 +28332,6 @@
/obj/structure/blocker/invisible_wall,
/turf/open/floor/prison/whitepurple/southeast,
/area/fiorina/oob)
-"vRA" = (
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"vRF" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/pamphlet/skill/powerloader,
@@ -28419,12 +28345,6 @@
/obj/item/trash/cigbutt/cigarbutt,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"vSn" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/southeast,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"vSC" = (
/obj/item/reagent_container/food/condiment/saltshaker{
pixel_x = -5;
@@ -28466,17 +28386,6 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"vUl" = (
-/obj/structure/machinery/washing_machine,
-/obj/structure/machinery/washing_machine{
- pixel_y = 15
- },
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/showers_laundry)
"vUv" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/window/reinforced,
@@ -28487,13 +28396,28 @@
/obj/item/tool/screwdriver,
/turf/open/floor/prison/green/southwest,
/area/fiorina/tumor/civres)
-"vUP" = (
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
+"vUJ" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
+"vVg" = (
+/obj/structure/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
"vVi" = (
/obj/structure/window/framed/prison,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
+"vVv" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/transit_hub)
"vVN" = (
/obj/structure/stairs/perspective{
dir = 8;
@@ -28526,6 +28450,13 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
+"vXr" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/disco/east_disco)
"vXy" = (
/turf/open/floor/prison/green/southeast,
/area/fiorina/tumor/civres)
@@ -28537,10 +28468,14 @@
/obj/structure/girder/reinforced,
/turf/open/floor/almayer/plate,
/area/fiorina/tumor/ship)
-"vYX" = (
-/obj/item/roller,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"vYJ" = (
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
+"vYK" = (
+/obj/item/tool/wirecutters,
+/turf/open/floor/prison/bluecorner/north,
+/area/fiorina/station/power_ring/reactor)
"vYY" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_29";
@@ -28549,10 +28484,6 @@
},
/turf/open/floor/prison/greenfull/east,
/area/fiorina/station/transit_hub)
-"vZe" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/prison/bluecorner,
-/area/fiorina/station/power_ring/reactor)
"vZs" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/floor_plate,
@@ -28561,10 +28492,13 @@
/obj/item/storage/box/donkpockets,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"vZL" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"vZI" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/prison/bright_clean2/southwest,
+/area/fiorina/station/power_ring/reactor)
"vZV" = (
/turf/closed/wall/strata_ice/jungle{
desc = "It is made of Fiberbush(tm). It contains asbestos.";
@@ -28574,12 +28508,8 @@
"vZX" = (
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
-"wam" = (
-/obj/item/stack/medical/bruise_pack,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"wat" = (
-/turf/open/floor/prison/yellow/west,
+/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec/showers_laundry)
"waQ" = (
/turf/open/floor/prison/darkyellow2/southwest,
@@ -28620,21 +28550,11 @@
/obj/item/storage/toolbox,
/turf/open/floor/prison,
/area/fiorina/station/civres_blue)
-"wbW" = (
-/obj/item/reagent_container/food/snacks/meat,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"wcB" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/gun/pistol/midchance,
/turf/open/floor/prison/darkpurple2/north,
/area/fiorina/tumor/servers)
-"wcC" = (
-/obj/structure/closet/basketball,
-/obj/item/storage/pill_bottle/bicaridine/skillless,
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"wcP" = (
/obj/effect/landmark/queen_spawn,
/turf/open/floor/plating/prison,
@@ -28649,36 +28569,22 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/disco)
-"wdo" = (
-/obj/structure/closet,
-/turf/open/floor/prison/bluecorner/east,
-/area/fiorina/station/power_ring/reactor)
-"wdv" = (
-/obj/structure/bed/chair,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/drip{
- icon_state = "2"
- },
-/obj/effect/decal/cleanable/blood/drip{
- icon_state = "4"
- },
-/obj/item/prop/helmetgarb/flair_initech,
-/obj/effect/landmark/corpsespawner/scientist,
+"wdy" = (
+/obj/structure/platform/metal/almayer,
/turf/open/floor/prison,
-/area/fiorina/station/medbay)
-"wdL" = (
-/obj/structure/barricade/wooden{
- dir = 8
- },
-/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/transit_hub)
+"wdQ" = (
+/obj/structure/largecrate/random/case/double,
+/turf/open/floor/prison/whitepurple/southeast,
/area/fiorina/station/research_cells/west)
"wdU" = (
/obj/structure/foamed_metal,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/civres_blue)
-"wef" = (
-/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/west)
+"weh" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/gm/river/pool,
+/area/fiorina/station/park)
"wet" = (
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/prison/darkyellow2/north,
@@ -28761,15 +28667,6 @@
/obj/item/device/flashlight/flare/on,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"wge" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/northeast,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomright"
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"wgi" = (
/obj/effect/landmark/nightmare{
insert_tag = "scavshipholder"
@@ -28794,10 +28691,22 @@
"wgO" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/park)
-"whc" = (
-/obj/structure/platform/metal/kutjevo_smooth,
-/turf/open/floor/almayer_hull,
-/area/fiorina/oob)
+"wha" = (
+/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
+ dir = 1;
+ req_one_access = null
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
+"whb" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"whf" = (
/turf/closed/shuttle/elevator{
dir = 4
@@ -28814,20 +28723,26 @@
"whu" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/tumor/civres)
+"wiO" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"wiR" = (
/obj/structure/surface/rack,
/obj/item/key,
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison/whitegreen/southwest,
/area/fiorina/station/medbay)
+"wjc" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/turf/open/floor/prison/bluecorner,
+/area/fiorina/station/power_ring/reactor)
"wjC" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/prison/darkbrown2/northwest,
/area/fiorina/tumor/aux_engi)
-"wjH" = (
-/obj/item/stack/barbed_wire,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"wjO" = (
/obj/structure/bed/chair,
/obj/effect/decal/cleanable/blood,
@@ -28863,10 +28778,6 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/darkpurplefull2,
/area/fiorina/tumor/ice_lab)
-"wlv" = (
-/obj/item/trash/barcardine,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"wly" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/lz/near_lzII)
@@ -28890,6 +28801,11 @@
/obj/item/stack/folding_barricade,
/turf/open/floor/prison/red/west,
/area/fiorina/station/security)
+"wmT" = (
+/obj/structure/platform/metal/kutjevo_smooth/north,
+/obj/structure/platform/metal/kutjevo_smooth/west,
+/turf/open/space/basic,
+/area/fiorina/oob)
"wnh" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/prison/blue/north,
@@ -28936,6 +28852,13 @@
/obj/item/stack/sheet/plasteel,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
+"wpq" = (
+/obj/structure/machinery/door/airlock/almayer/marine{
+ dir = 1;
+ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/west)
"wps" = (
/obj/structure/bed/sofa/south/grey/left,
/obj/structure/machinery/light/double/blue{
@@ -28953,12 +28876,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
-"wpO" = (
-/obj/structure/machinery/door/airlock/almayer/marine{
- dir = 1
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"wpW" = (
/obj/structure/sign/kiddieplaque{
desc = "It is a warning sign that describes the process by which fiberbush expands in humid environments, behaving similar to kudzu vines.";
@@ -28967,26 +28884,6 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
-"wqs" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/poster,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
-"wqz" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/obj/item/clothing/gloves/combat,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
-"wqY" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"wrR" = (
/turf/closed/wall/prison,
/area/fiorina/station/botany)
@@ -28996,13 +28893,32 @@
},
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"wsw" = (
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
+"wse" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/park)
+"wsq" = (
+/obj/structure/surface/table/reinforced/prison{
+ dir = 8;
+ flipped = 1
+ },
+/obj/item/storage/box/ids,
+/obj/item/reagent_container/food/drinks/cans/souto/grape{
+ pixel_x = 14;
+ pixel_y = 7
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"wsz" = (
/turf/open/floor/prison/darkbrown2/west,
/area/fiorina/tumor/aux_engi)
+"wsA" = (
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
+"wsK" = (
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor/prison/bluecorner/west,
+/area/fiorina/station/power_ring/reactor)
"wsM" = (
/obj/structure/barricade/handrail/type_b{
layer = 3.4
@@ -29012,15 +28928,17 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
-"wsR" = (
+"wtd" = (
+/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/east,
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
+/obj/structure/platform_decoration/metal/almayer/northwest,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
+/area/fiorina/station/transit_hub)
+"wtf" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/briefcase/inflatable,
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"wtm" = (
/obj/structure/monorail{
name = "launch track"
@@ -29040,6 +28958,22 @@
/obj/item/weapon/classic_baton,
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"wtJ" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/communications{
+ dir = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
+"wuf" = (
+/obj/structure/machinery/constructable_frame,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/damaged2/southwest,
+/area/fiorina/station/lowsec/east)
"wun" = (
/turf/open/floor/prison/whitegreencorner/west,
/area/fiorina/tumor/ice_lab)
@@ -29063,6 +28997,10 @@
},
/turf/open/floor/wood,
/area/fiorina/station/park)
+"wuD" = (
+/obj/item/device/flashlight/lamp/tripod,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
"wuN" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/turf/open/floor/prison/darkbrownfull2,
@@ -29071,6 +29009,23 @@
/obj/item/tool/warning_cone,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/disco)
+"wuY" = (
+/obj/effect/spawner/random/gun/smg,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
+"wvF" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/obj/structure/machinery/light/double/blue{
+ dir = 8;
+ pixel_x = -10;
+ pixel_y = -3
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/flight_deck)
"wvH" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/prison/chapel_carpet/doubleside,
@@ -29100,17 +29055,17 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"wws" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
"wxl" = (
/obj/structure/machinery/recharge_station,
/turf/open/floor/prison/darkbrown2/northeast,
/area/fiorina/maintenance)
-"wxW" = (
-/obj/structure/prop/almayer/computers/mapping_computer,
-/turf/open/floor/prison/darkredfull2,
+"wxt" = (
+/obj/effect/landmark/corpsespawner/ua_riot,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
+"wxP" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/prison/whitepurple/north,
/area/fiorina/station/research_cells/west)
"wxX" = (
/obj/structure/machinery/computer/cameras{
@@ -29135,14 +29090,18 @@
/obj/structure/machinery/computer/cameras,
/turf/open/floor/plating/prison,
/area/fiorina/station/security/wardens)
-"wyb" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"wyl" = (
/obj/structure/machinery/power/port_gen/pacman,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
+"wyG" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/flight_deck)
"wyK" = (
/obj/structure/prop/structure_lattice{
dir = 4;
@@ -29155,18 +29114,10 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/oob)
-"wyQ" = (
-/obj/structure/largecrate/supply/supplies/mre,
-/turf/open/floor/prison/yellowfull,
-/area/fiorina/station/lowsec/east)
"wyT" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"wyU" = (
-/obj/effect/decal/cleanable/blood/gibs/robot/up,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
"wzd" = (
/obj/structure/stairs/perspective{
dir = 10;
@@ -29184,10 +29135,21 @@
"wzH" = (
/turf/open/floor/prison/blue/northeast,
/area/fiorina/station/chapel)
-"wzN" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/fiorina/station/telecomm/lz1_tram)
+"wzU" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_sn_full_cap"
+ },
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/tumor/ice_lab)
+"wAb" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/disco/east_disco)
"wAn" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname{
dir = 1
@@ -29199,12 +29161,23 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/darkredfull2,
/area/fiorina/lz/near_lzI)
+"wAP" = (
+/turf/closed/wall/r_wall/prison,
+/area/fiorina/station/lowsec/east)
"wAQ" = (
/obj/structure/bed/chair/office/dark{
dir = 4
},
/turf/open/floor/prison/whitegreen/east,
/area/fiorina/tumor/ice_lab)
+"wBe" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/botany)
"wBx" = (
/obj/item/prop/helmetgarb/spacejam_tickets{
desc = "A ticket to Souto Man's raffle!";
@@ -29229,13 +29202,6 @@
/obj/item/stack/tile/plasteel,
/turf/open/floor/plating/prison,
/area/fiorina/station/security)
-"wBV" = (
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/surface/rack,
-/obj/item/stack/flag/yellow,
-/obj/item/stack/flag/yellow,
-/turf/open/floor/prison,
-/area/fiorina/lz/near_lzI)
"wBX" = (
/obj/structure/largecrate/supply/supplies,
/turf/open/floor/plating/prison,
@@ -29247,6 +29213,15 @@
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"wCY" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
+ },
+/obj/structure/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"wDe" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/prison/greenblue,
@@ -29276,6 +29251,12 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"wEc" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"wED" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -29303,25 +29284,14 @@
},
/turf/open/floor/prison/darkpurple2/north,
/area/fiorina/tumor/servers)
+"wFe" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring)
"wFp" = (
/obj/item/stack/cable_coil/pink,
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/station/medbay)
-"wFs" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_ew_full_cap"
- },
-/obj/structure/platform/metal/stair_cut/platform_right,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/security)
-"wFB" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"wFM" = (
/obj/structure/machinery/power/apc/power/west,
/turf/open/floor/prison/floor_plate/southwest,
@@ -29333,6 +29303,9 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
+"wGa" = (
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"wGb" = (
/obj/item/ammo_casing{
icon_state = "casing_1"
@@ -29378,19 +29351,27 @@
},
/turf/open/floor/prison/red/west,
/area/fiorina/station/security)
-"wHu" = (
-/obj/structure/machinery/door/airlock/prison_hatch/autoname{
- dir = 1
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
"wHw" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname,
/turf/open/floor/plating/prison,
/area/fiorina/station/security/wardens)
-"wHV" = (
+"wHN" = (
+/obj/structure/machinery/shower{
+ dir = 1;
+ pixel_y = -1
+ },
+/obj/structure/machinery/shower{
+ dir = 4
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/lowsec/showers_laundry)
+"wHS" = (
+/obj/item/stack/tile/plasteel{
+ pixel_x = 12;
+ pixel_y = 13
+ },
/turf/open/floor/plating/prison,
-/area/fiorina/station/research_cells/east)
+/area/fiorina/station/research_cells/west)
"wId" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating/prison,
@@ -29431,10 +29412,9 @@
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/chapel)
-"wJd" = (
-/obj/structure/barricade/handrail,
-/turf/open/organic/grass/astroturf,
-/area/fiorina/station/research_cells/basketball)
+"wJs" = (
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
"wJw" = (
/obj/structure/closet/crate/trashcart,
/obj/item/weapon/gun/rifle/m16,
@@ -29444,12 +29424,30 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"wJC" = (
+/obj/item/stack/sheet/wood,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/east)
+"wKa" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/yellow/northwest,
+/area/fiorina/station/lowsec/showers_laundry)
"wKb" = (
/obj/effect/spawner/random/gun/rifle/midchance,
/turf/open/floor/wood,
/area/fiorina/station/park)
-"wKi" = (
-/turf/open/floor/prison/yellow/north,
+"wKh" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/reagent_container/food/drinks/cans/waterbottle{
+ pixel_x = 8;
+ pixel_y = 5
+ },
+/obj/structure/machinery/light/double/blue{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec/east)
"wKl" = (
/obj/structure/bed/sofa/south/grey/right,
@@ -29478,6 +29476,10 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/medbay)
+"wLe" = (
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/tumor/ice_lab)
"wLA" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison_unmeltable,
@@ -29520,10 +29522,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
-"wMp" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison/bluefull,
-/area/fiorina/station/power_ring)
"wMv" = (
/obj/item/shard{
icon_state = "medium"
@@ -29539,17 +29537,21 @@
/obj/item/disk/botany,
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
+"wMN" = (
+/obj/structure/barricade/handrail,
+/obj/structure/barricade/handrail{
+ dir = 8
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
+"wNb" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/yellow/southeast,
+/area/fiorina/station/disco/east_disco)
"wNi" = (
/obj/effect/landmark/yautja_teleport,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"wNo" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"wNr" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -29580,23 +29582,20 @@
"wNX" = (
/turf/open/floor/prison/green/west,
/area/fiorina/station/chapel)
-"wOq" = (
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
+"wPt" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
},
-/turf/open/space/basic,
-/area/fiorina/oob)
-"wOG" = (
-/obj/structure/largecrate/random,
-/turf/open/floor/prison/floor_plate/southwest,
-/area/fiorina/station/disco/east_disco)
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/transit_hub)
"wPz" = (
/turf/closed/shuttle/elevator,
/area/fiorina/station/telecomm/lz1_cargo)
+"wPI" = (
+/obj/item/stack/cable_coil,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"wQb" = (
/turf/open/floor/prison/blue/north,
/area/fiorina/station/civres_blue)
@@ -29615,14 +29614,6 @@
/obj/item/weapon/gun/energy/taser,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"wQF" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/central_ring)
"wQN" = (
/obj/structure/machinery/floodlight/landing/floor,
/turf/open/floor/plating/prison,
@@ -29657,6 +29648,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/tumor/servers)
+"wRx" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"wRz" = (
/obj/structure/barricade/wooden,
/turf/open/floor/prison/cell_stripe/west,
@@ -29668,10 +29663,6 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"wRS" = (
-/obj/structure/platform_decoration/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"wSb" = (
/obj/structure/machinery/gibber,
/turf/open/floor/prison/kitchen,
@@ -29703,24 +29694,10 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/station/transit_hub)
-"wSC" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/reagent_container/glass/bottle/spaceacillin{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"wSD" = (
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
-"wSN" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/research_cells/west)
"wSU" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/transit_hub)
@@ -29738,17 +29715,9 @@
"wUs" = (
/turf/open/floor/prison/floorscorched1,
/area/fiorina/station/civres_blue)
-"wUv" = (
-/obj/effect/decal/cleanable/blood{
- dir = 4;
- icon_state = "gib6"
- },
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
-"wUz" = (
-/obj/item/frame/toolbox_tiles,
-/turf/open/floor/prison/whitepurple/northwest,
-/area/fiorina/station/research_cells/west)
+"wUL" = (
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"wVc" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/drinks/coffee{
@@ -29757,22 +29726,37 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/tumor/fiberbush)
-"wWm" = (
-/turf/open/floor/prison/yellowcorner/north,
-/area/fiorina/station/lowsec/east)
+"wVj" = (
+/obj/structure/platform_decoration/metal/almayer/east,
+/turf/open/floor/prison/chapel_carpet/doubleside/north,
+/area/fiorina/station/chapel)
+"wVD" = (
+/obj/item/clothing/under/color/orange,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/showers_laundry)
+"wWi" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/central_ring)
"wWs" = (
/turf/open/floor/greengrid,
/area/fiorina/station/security)
+"wWN" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/disco/east_disco)
+"wWT" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi'
+ },
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"wXe" = (
/obj/structure/machinery/computer/cameras{
dir = 1
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
-"wXo" = (
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
"wXy" = (
/obj/structure/largecrate/random,
/obj/structure/machinery/light/double/blue{
@@ -29787,41 +29771,11 @@
/obj/structure/pipes/standard/cap/hidden,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"wXQ" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
-"wXR" = (
-/obj/structure/platform/metal/almayer/east,
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/lz/near_lzI)
-"wXY" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/floor/prison/darkbrown2/southeast,
-/area/fiorina/station/park)
"wYq" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/chem_dispenser/soda,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"wYT" = (
-/obj/structure/surface/rack,
-/obj/item/tank/emergency_oxygen/engi,
-/turf/open/floor/prison/blue/southeast,
-/area/fiorina/station/power_ring/reactor)
-"wZt" = (
-/turf/open/floor/prison/floor_marked/west,
-/area/fiorina/station/research_cells/west)
"wZv" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/wood,
@@ -29830,6 +29784,15 @@
/obj/structure/filingcabinet,
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
+"wZL" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/weapon/baton,
+/obj/item/reagent_container/food/drinks/coffee{
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"wZN" = (
/obj/item/reagent_container/food/drinks/bottle/melonliquor,
/turf/open/floor/plating/prison,
@@ -29839,10 +29802,18 @@
/obj/item/storage/pill_bottle/kelotane/skillless,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/tumor/ice_lab)
+"xas" = (
+/obj/structure/largecrate/random,
+/turf/open/floor/prison,
+/area/fiorina/station/research_cells/east)
"xat" = (
/obj/item/stool,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
+"xax" = (
+/obj/effect/landmark/corpsespawner/scientist,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"xaO" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/prison/floor_plate,
@@ -29854,6 +29825,10 @@
},
/turf/open/floor/prison/cell_stripe/north,
/area/fiorina/station/central_ring)
+"xbf" = (
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/disco/east_disco)
"xbm" = (
/obj/structure/machinery/line_nexter{
id = "line2";
@@ -29862,14 +29837,6 @@
/obj/structure/barricade/handrail/type_b,
/turf/open/floor/prison,
/area/fiorina/station/disco)
-"xbo" = (
-/obj/structure/barricade/sandbags{
- dir = 8;
- icon_state = "sandbag_0";
- pixel_y = 2
- },
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/disco/east_disco)
"xbp" = (
/obj/item/card/id/silver/clearance_badge/cl{
desc = "Wow sorry, didn't mean to drop that in front of you, it's real, btw.";
@@ -29887,43 +29854,17 @@
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison/yellowfull,
/area/fiorina/station/disco)
-"xbG" = (
-/obj/structure/platform/metal/almayer,
-/obj/structure/platform/metal/almayer/west,
-/obj/structure/platform_decoration/metal/almayer/southwest,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring)
"xbM" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/lowsec)
+"xbX" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"xck" = (
/obj/structure/largecrate/random/case/small,
/turf/open/floor/plating/plating_catwalk/prison,
/area/fiorina/station/park)
-"xct" = (
-/turf/open/floor/prison/blue/north,
-/area/fiorina/station/power_ring/reactor)
-"xcz" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"xdb" = (
-/obj/structure/closet/bodybag,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"xdz" = (
-/obj/structure/stairs/perspective{
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/botany)
"xdE" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
@@ -29936,27 +29877,19 @@
/obj/item/trash/cigbutt,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
-"xdZ" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = -3
- },
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"xei" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/organic/grass/astroturf,
/area/fiorina/station/central_ring)
-"xel" = (
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/east)
"xew" = (
/turf/closed/shuttle/ert{
icon_state = "stan_leftengine"
},
/area/fiorina/lz/near_lzI)
+"xeL" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/east)
"xeO" = (
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
@@ -29978,6 +29911,14 @@
},
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/station/medbay)
+"xfG" = (
+/obj/item/device/binoculars/civ,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
"xgb" = (
/obj/effect/landmark/corpsespawner/ua_riot/burst,
/turf/open/floor/prison/floor_plate,
@@ -29992,25 +29933,21 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"xgC" = (
-/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/disco/east_disco)
"xgF" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"xgH" = (
-/obj/item/toy/handcard/uno_reverse_blue,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/west)
"xgU" = (
/obj/item/circuitboard/machine/rdserver,
/turf/open/floor/prison/floorscorched1,
/area/fiorina/tumor/servers)
+"xgY" = (
+/obj/effect/decal/cleanable/blood/tracks/footprints{
+ dir = 1;
+ icon_state = "human2"
+ },
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
"xhL" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecaltopleft"
@@ -30021,21 +29958,10 @@
/obj/structure/curtain/red,
/turf/open/floor/prison/sterile_white,
/area/fiorina/station/civres_blue)
-"xhV" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
"xia" = (
/obj/item/ammo_magazine/smg/mp5,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
-"xig" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/effect/decal/medical_decals{
- icon_state = "docdecal1"
- },
-/turf/open/floor/prison/whitegreenfull/southwest,
-/area/fiorina/station/medbay)
"xiF" = (
/obj/structure/largecrate/random/case/double,
/obj/structure/machinery/light/double/blue{
@@ -30051,9 +29977,6 @@
/obj/structure/machinery/vending/cigarette/free,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"xiZ" = (
-/turf/open/floor/prison/yellowcorner/west,
-/area/fiorina/station/lowsec/east)
"xja" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
@@ -30064,13 +29987,17 @@
/obj/structure/computerframe,
/turf/open/floor/plating/prison,
/area/fiorina/station/telecomm/lz2_maint)
+"xjF" = (
+/obj/item/tool/wrench,
+/turf/open/floor/prison/whitepurple/north,
+/area/fiorina/station/research_cells/west)
"xjM" = (
/turf/open/floor/prison/redcorner/west,
/area/fiorina/station/security)
-"xkg" = (
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
+"xjR" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring/reactor)
"xkm" = (
/obj/effect/landmark/static_comms/net_two,
/turf/open/floor/prison/bluefull,
@@ -30078,6 +30005,17 @@
"xkv" = (
/turf/closed/wall/prison,
/area/fiorina/station/telecomm/lz1_tram)
+"xkB" = (
+/obj/structure/machinery/shower{
+ pixel_y = 13
+ },
+/obj/structure/platform/metal/almayer/west,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/fiorina/station/medbay)
+"xkO" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/turf/open/space,
+/area/fiorina/oob)
"xlb" = (
/obj/structure/machinery/door/airlock/prison_hatch/autoname{
dir = 1
@@ -30090,21 +30028,17 @@
},
/turf/open/floor/prison/whitegreenfull/southwest,
/area/fiorina/station/medbay)
-"xlp" = (
-/obj/structure/bed/chair/office/dark{
+"xlu" = (
+/obj/structure/bed/chair{
dir = 8
},
-/turf/open/floor/wood,
-/area/fiorina/station/research_cells/west)
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
"xlx" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/snacks/tomatosoup,
/turf/open/floor/prison/blue,
/area/fiorina/station/power_ring)
-"xlC" = (
-/obj/item/device/flashlight/lamp/tripod,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
"xlZ" = (
/obj/structure/surface/table/woodentable,
/obj/item/storage/box/pillbottles,
@@ -30136,26 +30070,10 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
-"xnt" = (
-/obj/structure/closet{
- density = 0;
- pixel_y = 18
- },
-/obj/item/clothing/gloves/combat,
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
"xnU" = (
/obj/structure/machinery/camera/autoname/lz_camera,
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzII)
-"xoh" = (
-/obj/structure/stairs/perspective{
- dir = 1;
- icon_state = "p_stair_sn_full_cap"
- },
-/obj/structure/platform/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
"xoi" = (
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/plating/prison,
@@ -30163,6 +30081,13 @@
"xow" = (
/turf/open/floor/prison/green/east,
/area/fiorina/station/chapel)
+"xoE" = (
+/turf/open/floor/wood,
+/area/fiorina/station/research_cells/west)
+"xoJ" = (
+/obj/structure/window/framed/prison/reinforced/hull,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"xoK" = (
/obj/structure/closet,
/obj/item/restraint/handcuffs,
@@ -30175,18 +30100,24 @@
/obj/structure/machinery/computer/atmos_alert,
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"xpd" = (
-/obj/structure/platform/metal/almayer/north,
+"xpc" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_sn_full_cap"
+ },
/obj/structure/platform/metal/almayer/east,
-/obj/structure/platform_decoration/metal/almayer/northwest,
/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/botany)
+/area/fiorina/station/central_ring)
"xpj" = (
/obj/structure/flora/bush/ausbushes/grassybush{
icon_state = "lavendergrass_4"
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/central_ring)
+"xps" = (
+/obj/structure/machinery/light/double/blue,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/east)
"xpw" = (
/obj/structure/machinery/power/apc/power/west,
/turf/open/floor/prison,
@@ -30195,32 +30126,12 @@
/obj/item/storage/belt/marine,
/turf/open/floor/prison,
/area/fiorina/station/security)
-"xpy" = (
-/obj/structure/toilet{
- dir = 8;
- pixel_y = 8
- },
-/turf/open/floor/prison/yellow/northeast,
-/area/fiorina/station/lowsec/east)
-"xpF" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/turf/open/space/basic,
-/area/fiorina/oob)
"xpO" = (
/obj/structure/machinery/power/terminal{
dir = 1
},
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"xqi" = (
-/obj/item/tool/wrench,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/power_ring/reactor)
-"xql" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
"xqP" = (
/obj/structure/surface/rack,
/obj/item/tool/plantspray/weeds,
@@ -30244,16 +30155,6 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/power_ring)
-"xrw" = (
-/obj/structure/barricade/handrail{
- dir = 1;
- icon_state = "hr_kutjevo";
- name = "solar lattice"
- },
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/platform/metal/kutjevo_smooth/north,
-/turf/open/space,
-/area/fiorina/oob)
"xrz" = (
/obj/item/clothing/head/cmcap,
/turf/open/floor/prison/green,
@@ -30301,21 +30202,19 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"xts" = (
-/obj/effect/landmark/corpsespawner/prisoner,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/research_cells/west)
-"xtI" = (
-/obj/structure/platform_decoration/metal/kutjevo/north,
-/turf/open/space/basic,
-/area/fiorina/oob)
"xuQ" = (
/obj/effect/decal/medical_decals{
icon_state = "docstripingdir"
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
+"xvr" = (
+/obj/structure/toilet{
+ dir = 4;
+ pixel_y = 8
+ },
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/east)
"xvv" = (
/turf/open/floor/prison,
/area/fiorina/station/botany)
@@ -30339,14 +30238,26 @@
/obj/item/trash/eat,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/ice_lab)
-"xwc" = (
-/obj/structure/platform/metal/almayer/north,
-/obj/item/fuel_cell,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
-"xwm" = (
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring/reactor)
+"xvJ" = (
+/obj/structure/platform/metal/almayer,
+/obj/item/ammo_casing{
+ dir = 2;
+ icon_state = "casing_5"
+ },
+/turf/open/gm/river/red_pool,
+/area/fiorina/station/park)
+"xwg" = (
+/obj/structure/platform/metal/kutjevo_smooth/east,
+/obj/structure/platform/metal/kutjevo_smooth,
+/turf/open/space,
+/area/fiorina/oob)
+"xwh" = (
+/obj/item/tool/soap,
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/prison/kitchen,
+/area/fiorina/station/research_cells/west)
"xwo" = (
/obj/structure/surface/rack,
/obj/item/storage/box/sprays,
@@ -30359,12 +30270,19 @@
"xwC" = (
/turf/closed/wall/mineral/bone_resin,
/area/fiorina/tumor/fiberbush)
-"xxg" = (
-/turf/closed/wall/r_wall/prison_unmeltable,
-/area/fiorina/station/lowsec/east)
+"xwI" = (
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"xxD" = (
/turf/open/floor/wood,
/area/fiorina/station/civres_blue)
+"xxL" = (
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/turf/open/gm/river/desert/deep,
+/area/fiorina/lz/near_lzII)
"xxP" = (
/obj/structure/flora/bush/ausbushes/grassybush{
icon_state = "lavendergrass_2"
@@ -30377,10 +30295,6 @@
},
/turf/open/floor/prison/whitegreen/north,
/area/fiorina/tumor/ice_lab)
-"xxW" = (
-/obj/structure/platform/metal/almayer/north,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/transit_hub)
"xxX" = (
/obj/effect/decal/cleanable/blood/splatter{
icon_state = "gib4"
@@ -30393,6 +30307,10 @@
},
/turf/open/floor/prison/blue_plate/east,
/area/fiorina/station/botany)
+"xyv" = (
+/obj/structure/platform/metal/almayer/east,
+/turf/open/floor/prison/yellow/southwest,
+/area/fiorina/station/disco/east_disco)
"xyw" = (
/obj/structure/machinery/computer/arcade,
/turf/open/floor/prison,
@@ -30400,6 +30318,10 @@
"xzj" = (
/turf/open/floor/carpet,
/area/fiorina/tumor/civres)
+"xzp" = (
+/obj/item/clothing/suit/storage/labcoat,
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"xzs" = (
/obj/structure/machinery/space_heater,
/turf/open/organic/grass/astroturf,
@@ -30413,22 +30335,23 @@
},
/turf/open/space,
/area/fiorina/oob)
-"xAn" = (
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/showers_laundry)
"xAo" = (
/obj/item/trash/cigbutt/bcigbutt,
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/station/medbay)
-"xAq" = (
-/obj/effect/spawner/random/tool,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"xAs" = (
/obj/item/device/reagent_scanner,
/turf/open/organic/grass/astroturf,
/area/fiorina/tumor/fiberbush)
+"xAL" = (
+/obj/item/stack/rods,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
+"xAV" = (
+/obj/structure/bedsheetbin,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"xAY" = (
/obj/effect/landmark{
icon_state = "hive_spawn";
@@ -30437,10 +30360,6 @@
/obj/effect/landmark/ert_spawns/groundside_xeno,
/turf/open/floor/prison/whitegreencorner/north,
/area/fiorina/tumor/ice_lab)
-"xBc" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/west)
"xBl" = (
/obj/structure/surface/table/woodentable,
/obj/item/circuitboard/apc,
@@ -30455,32 +30374,25 @@
},
/turf/open/floor/carpet,
/area/fiorina/station/civres_blue)
-"xBF" = (
-/turf/open/floor/prison/yellow/northwest,
-/area/fiorina/station/lowsec/east)
-"xBN" = (
-/obj/item/prop/helmetgarb/spacejam_tickets{
- desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
- name = "\improper arcade tickets";
- pixel_x = 1;
- pixel_y = -1
+"xBn" = (
+/obj/structure/bed/roller,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor/prison,
+/area/fiorina/station/lowsec/showers_laundry)
+"xBL" = (
+/obj/structure/bed{
+ icon_state = "abed"
},
-/turf/open/floor/prison/darkpurplefull2,
+/obj/item/reagent_container/food/drinks/flask/marine,
+/turf/open/floor/prison/whitepurple/southwest,
/area/fiorina/station/research_cells/west)
+"xBS" = (
+/turf/open/floor/prison/blue,
+/area/fiorina/station/power_ring/reactor)
"xCa" = (
/obj/item/toy/crayon/rainbow,
/turf/open/floor/plating/prison,
/area/fiorina/station/power_ring)
-"xCg" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
-"xCh" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/east)
"xCp" = (
/obj/structure/inflatable/popped,
/turf/open/floor/prison/whitegreen,
@@ -30489,10 +30401,9 @@
/obj/structure/curtain/shower,
/turf/open/floor/prison/kitchen/southwest,
/area/fiorina/tumor/civres)
-"xCR" = (
-/obj/structure/machinery/light/double/blue,
-/turf/open/floor/prison/whitepurple,
-/area/fiorina/station/research_cells/east)
+"xCE" = (
+/turf/open/floor/prison/damaged1/southwest,
+/area/fiorina/station/disco/east_disco)
"xCV" = (
/obj/item/reagent_container/food/drinks/bottle/orangejuice,
/turf/open/floor/prison,
@@ -30509,6 +30420,21 @@
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
+"xDz" = (
+/obj/structure/machinery/light/double/blue{
+ pixel_y = -1
+ },
+/obj/structure/platform_decoration/metal/almayer,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
+"xDD" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/yellow/north,
+/area/fiorina/station/lowsec/showers_laundry)
+"xDY" = (
+/obj/item/stool,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"xEi" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_29";
@@ -30516,6 +30442,18 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"xEl" = (
+/obj/structure/platform_decoration/metal/almayer,
+/obj/structure/barricade/handrail/type_b{
+ dir = 4;
+ layer = 3.5
+ },
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
+"xEu" = (
+/obj/item/weapon/baton/cattleprod,
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/east)
"xEy" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
@@ -30542,10 +30480,6 @@
"xFg" = (
/turf/open/floor/prison/yellow/northwest,
/area/fiorina/station/central_ring)
-"xFJ" = (
-/obj/item/tool/soap,
-/turf/open/floor/prison/kitchen,
-/area/fiorina/station/lowsec/showers_laundry)
"xFL" = (
/obj/effect/decal{
icon = 'icons/obj/items/policetape.dmi';
@@ -30564,13 +30498,6 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
-"xGd" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/clothing/mask/cigarette/weed{
- icon_state = "ucigoff"
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/lowsec/east)
"xGi" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -30594,10 +30521,18 @@
/obj/structure/machinery/light/double/blue,
/turf/open/floor/prison,
/area/fiorina/station/security)
+"xHg" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/floor/prison/yellow/east,
+/area/fiorina/station/lowsec/east)
"xHi" = (
/obj/item/trash/candle,
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/station/telecomm/lz1_cargo)
+"xHA" = (
+/obj/effect/landmark/static_comms/net_one,
+/turf/open/floor/prison,
+/area/fiorina/station/power_ring/reactor)
"xHV" = (
/turf/closed/wall/mineral/bone_resin,
/area/fiorina/tumor/civres)
@@ -30614,14 +30549,17 @@
/obj/structure/largecrate/random,
/turf/open/floor/plating/prison,
/area/fiorina/station/chapel)
-"xID" = (
-/obj/structure/platform_decoration/metal/almayer/east,
-/turf/open/floor/prison/chapel_carpet/doubleside/north,
-/area/fiorina/station/chapel)
-"xJn" = (
-/obj/structure/surface/table/reinforced/prison,
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/disco/east_disco)
+"xIL" = (
+/obj/structure/bed{
+ icon_state = "abed"
+ },
+/obj/effect/spawner/random/goggles/lowchance,
+/turf/open/floor/prison/whitepurple/southeast,
+/area/fiorina/station/research_cells/west)
+"xJv" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/power_ring)
"xJw" = (
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/civres_blue)
@@ -30636,18 +30574,6 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"xKE" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/device/taperecorder{
- pixel_x = 8;
- pixel_y = 8
- },
-/turf/open/floor/prison/darkredfull2,
-/area/fiorina/station/lowsec/east)
-"xKP" = (
-/obj/structure/barricade/handrail,
-/turf/open/floor/prison/darkpurplefull2,
-/area/fiorina/station/research_cells/east)
"xKX" = (
/turf/open/floor/plating/prison,
/area/fiorina/station/disco)
@@ -30657,6 +30583,10 @@
},
/turf/open/floor/prison/redfull,
/area/fiorina/station/security)
+"xLe" = (
+/obj/structure/platform/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/tumor/ice_lab)
"xLf" = (
/obj/effect/decal/cleanable/blood/splatter{
icon_state = "gibmid1"
@@ -30676,10 +30606,6 @@
},
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"xLx" = (
-/obj/item/bedsheet,
-/turf/open/floor/prison/floor_plate,
-/area/fiorina/station/lowsec/showers_laundry)
"xLD" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -30696,6 +30622,9 @@
/obj/effect/spawner/random/toolbox,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
+"xMg" = (
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"xMp" = (
/obj/item/trash/c_tube,
/turf/open/floor/prison/whitegreenfull/southwest,
@@ -30704,6 +30633,18 @@
/obj/item/stack/sandbags_empty/half,
/turf/open/floor/prison,
/area/fiorina/station/flight_deck)
+"xMQ" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison/floor_plate/southwest,
+/area/fiorina/station/disco/east_disco)
"xMX" = (
/obj/structure/inflatable/door,
/turf/open/floor/prison/whitegreen/west,
@@ -30718,30 +30659,46 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison,
/area/fiorina/station/security)
+"xNA" = (
+/obj/item/ammo_magazine/smg/mp5,
+/turf/open/floor/prison/whitepurple/southwest,
+/area/fiorina/station/research_cells/west)
"xNG" = (
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security)
-"xNJ" = (
-/obj/structure/barricade/handrail/type_b{
- dir = 1
- },
-/obj/item/frame/rack,
-/turf/open/floor/prison/yellow/southeast,
-/area/fiorina/station/disco/east_disco)
"xNU" = (
/obj/structure/bed/chair/comfy{
dir = 4
},
/turf/open/floor/prison/darkyellow2/northeast,
/area/fiorina/station/flight_deck)
+"xNV" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/prison/sterile_white/southwest,
+/area/fiorina/station/research_cells/east)
+"xNZ" = (
+/obj/structure/platform/metal/almayer,
+/obj/structure/platform/metal/almayer/west,
+/obj/structure/platform_decoration/metal/almayer/southwest,
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/station/medbay)
"xOm" = (
/obj/structure/bed/chair{
dir = 8
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/power_ring)
+"xOp" = (
+/obj/structure/barricade/handrail{
+ dir = 8
+ },
+/turf/open/organic/grass/astroturf,
+/area/fiorina/station/research_cells/basketball)
"xOs" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -30759,26 +30716,38 @@
/obj/structure/largecrate/random/case/small,
/turf/open/floor/prison/darkyellow2/west,
/area/fiorina/station/telecomm/lz1_cargo)
+"xOZ" = (
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/barricade/handrail/type_b{
+ dir = 4;
+ layer = 3.5
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"xPk" = (
/turf/open/floor/prison/greencorner/west,
/area/fiorina/tumor/civres)
+"xPo" = (
+/obj/effect/spawner/random/gun/smg,
+/turf/open/floor/prison/yellow/northeast,
+/area/fiorina/station/lowsec/east)
+"xPF" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/east)
"xPG" = (
/obj/structure/bed/chair/comfy{
dir = 8
},
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
+"xQp" = (
+/obj/structure/inflatable,
+/turf/open/floor/prison/whitepurple,
+/area/fiorina/station/research_cells/west)
"xQx" = (
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security/wardens)
-"xRa" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/disco)
"xRl" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
@@ -30797,20 +30766,13 @@
"xRI" = (
/turf/open/floor/prison/yellow/east,
/area/fiorina/station/lowsec)
-"xRY" = (
-/obj/structure/bed{
- icon_state = "abed"
+"xSu" = (
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
},
-/obj/item/card/id/visa,
-/turf/open/floor/prison/whitepurple,
+/turf/open/floor/prison/whitepurple/northeast,
/area/fiorina/station/research_cells/west)
-"xSj" = (
-/obj/structure/platform_decoration/metal/almayer/west,
-/turf/open/floor/prison,
-/area/fiorina/station/transit_hub)
-"xSw" = (
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/east)
"xSz" = (
/obj/structure/barricade/metal/wired{
dir = 8
@@ -30828,6 +30790,9 @@
/obj/item/tool/kitchen/utensil/pspoon,
/turf/open/floor/prison/blue/east,
/area/fiorina/station/power_ring)
+"xTw" = (
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/lowsec/east)
"xTD" = (
/obj/structure/inflatable/popped/door,
/obj/effect/decal/medical_decals{
@@ -30859,21 +30824,25 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/station/park)
-"xVw" = (
+"xUP" = (
+/obj/structure/platform/metal/almayer/east,
/obj/structure/machinery/light/double/blue{
- dir = 1;
- pixel_y = 21
- },
-/turf/open/floor/prison/whitepurple/north,
-/area/fiorina/station/research_cells/west)
-"xVC" = (
-/obj/structure/stairs/perspective{
dir = 4;
- icon_state = "p_stair_full"
+ pixel_x = 10;
+ pixel_y = 13
},
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/disco/east_disco)
+/turf/open/floor/plating/prison,
+/area/fiorina/lz/near_lzI)
+"xVn" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/platform/metal/almayer/east,
+/obj/structure/platform_decoration/metal/almayer/northwest,
+/turf/open/gm/river/desert/deep,
+/area/fiorina/lz/near_lzII)
+"xVF" = (
+/obj/structure/platform_decoration/metal/almayer/west,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/civres_blue)
"xVJ" = (
/obj/structure/surface/rack,
/obj/item/storage/toolbox/mechanical/green,
@@ -30888,6 +30857,10 @@
},
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
+"xVL" = (
+/obj/item/bodybag,
+/turf/open/floor/prison/yellow/west,
+/area/fiorina/station/lowsec/showers_laundry)
"xVW" = (
/turf/open/floor/prison/darkbrown2/northwest,
/area/fiorina/station/park)
@@ -30895,6 +30868,14 @@
/obj/item/clothing/shoes/dress,
/turf/open/space,
/area/fiorina/oob)
+"xWh" = (
+/obj/structure/ice/thin/indestructible{
+ dir = 4;
+ icon_state = "Corner"
+ },
+/obj/structure/blocker/invisible_wall,
+/turf/open/ice/noweed,
+/area/fiorina/station/research_cells/basketball)
"xWE" = (
/obj/item/reagent_container/food/condiment/peppermill{
pixel_x = -5;
@@ -30902,10 +30883,6 @@
},
/turf/open/floor/prison/bluefull,
/area/fiorina/station/civres_blue)
-"xWG" = (
-/obj/item/weapon/twohanded/spear,
-/turf/open/floor/prison/sterile_white/southwest,
-/area/fiorina/station/research_cells/west)
"xWV" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/window/reinforced{
@@ -30946,14 +30923,10 @@
},
/turf/open/floor/prison,
/area/fiorina/station/power_ring)
-"xXP" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
- },
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/plating/prison,
-/area/fiorina/station/telecomm/lz1_tram)
+"xXw" = (
+/obj/item/stack/sheet/wood,
+/turf/open/floor/prison/whitepurple/west,
+/area/fiorina/station/research_cells/west)
"xXY" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/prison/floor_plate,
@@ -30970,17 +30943,6 @@
/obj/structure/machinery/power/apc/power/west,
/turf/open/floor/prison/darkbrownfull2,
/area/fiorina/tumor/aux_engi)
-"xYJ" = (
-/obj/structure/bed{
- icon_state = "abed"
- },
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/west)
-"xYM" = (
-/obj/structure/platform_decoration/metal/almayer,
-/obj/effect/spawner/random/toolbox,
-/turf/open/floor/prison,
-/area/fiorina/station/power_ring)
"xYN" = (
/obj/item/device/t_scanner,
/turf/open/floor/prison/floor_plate,
@@ -31021,6 +30983,17 @@
},
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/security/wardens)
+"xZL" = (
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/item/fuel_cell,
+/obj/structure/surface/rack,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring/reactor)
"xZM" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/green/west,
@@ -31060,17 +31033,22 @@
/obj/structure/surface/rack,
/turf/open/floor/prison,
/area/fiorina/lz/near_lzI)
+"yaB" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/machinery/computer/cameras{
+ dir = 4
+ },
+/turf/open/floor/prison/darkredfull2,
+/area/fiorina/station/research_cells/west)
"yaJ" = (
/obj/structure/machinery/vending/sovietsoda,
/turf/open/floor/plating/prison,
/area/fiorina/station/medbay)
-"yaS" = (
-/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
- dir = 1;
- req_one_access = null
- },
-/turf/open/floor/plating/prison,
-/area/fiorina/station/lowsec/showers_laundry)
+"yaQ" = (
+/obj/effect/decal/cleanable/blood/oil,
+/obj/structure/platform_decoration/metal/almayer/north,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/disco)
"yaY" = (
/obj/item/stack/sheet/metal,
/turf/open/space,
@@ -31091,10 +31069,23 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/lz/near_lzII)
+"ybk" = (
+/obj/structure/window/framed/prison/cell,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/research_cells/east)
"ybm" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/fiberbush)
+"ybE" = (
+/obj/structure/closet{
+ density = 0;
+ pixel_y = 18
+ },
+/obj/effect/spawner/random/tool,
+/obj/item/clothing/gloves/combat,
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"ybU" = (
/obj/structure/prop/resin_prop{
icon_state = "sheater0"
@@ -31136,6 +31127,11 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkbrown2,
/area/fiorina/station/park)
+"ydw" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/tool/surgery/surgicaldrill,
+/turf/open/floor/prison/yellowcorner,
+/area/fiorina/station/lowsec/showers_laundry)
"ydK" = (
/turf/open/floor/prison/blue/east,
/area/fiorina/station/power_ring)
@@ -31153,10 +31149,6 @@
/obj/item/reagent_container/food/drinks/cans/waterbottle,
/turf/open/floor/prison,
/area/fiorina/station/medbay)
-"yeI" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison/greenblue/east,
-/area/fiorina/station/botany)
"yeX" = (
/obj/structure/bed/sofa/vert/grey/top,
/turf/open/floor/prison,
@@ -31188,12 +31180,6 @@
/obj/effect/spawner/random/technology_scanner,
/turf/open/organic/grass/astroturf,
/area/fiorina/station/park)
-"ygk" = (
-/obj/item/ammo_magazine/rifle/m16{
- current_rounds = 0
- },
-/turf/open/floor/prison/yellowcorner,
-/area/fiorina/station/lowsec/showers_laundry)
"ygw" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer{
@@ -31208,36 +31194,45 @@
},
/turf/open/floor/plating/prison,
/area/fiorina/oob)
-"ygL" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/prison/floor_plate,
+"ygC" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/turf/open/floor/prison/yellow/east,
/area/fiorina/station/lowsec/east)
"ygS" = (
-/turf/open/floor/prison/yellow/east,
-/area/fiorina/station/disco/east_disco)
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison,
+/area/fiorina/tumor/servers)
+"yhe" = (
+/obj/structure/stairs/perspective{
+ icon_state = "p_stair_ew_full_cap"
+ },
+/obj/structure/platform/metal/stair_cut/platform_right,
+/turf/open/floor/plating/prison,
+/area/fiorina/station/telecomm/lz1_tram)
"yhs" = (
/obj/structure/surface/rack,
/obj/item/storage/firstaid/regular,
/obj/item/storage/pill_bottle/dexalin/skillless,
/turf/open/floor/prison/floor_plate,
/area/fiorina/station/medbay)
+"yht" = (
+/obj/structure/stairs/perspective{
+ dir = 4;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/platform/metal/almayer,
+/turf/open/floor/prison/darkbrown2,
+/area/fiorina/station/park)
"yhu" = (
/obj/structure/window/framed/prison,
/turf/open/floor/plating/prison,
/area/fiorina/tumor/aux_engi)
-"yhJ" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/obj/item/prop/helmetgarb/spacejam_tickets{
- desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in.";
- name = "\improper arcade tickets";
- pixel_x = 1;
- pixel_y = -1
- },
-/turf/open/floor/prison/whitepurple/southeast,
-/area/fiorina/station/research_cells/west)
"yhR" = (
/obj/structure/sign/prop3{
desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though."
@@ -31248,10 +31243,6 @@
/obj/structure/machinery/disposal,
/turf/open/floor/prison,
/area/fiorina/tumor/aux_engi)
-"yin" = (
-/obj/structure/platform/metal/almayer/east,
-/turf/open/floor/prison,
-/area/fiorina/station/medbay)
"yio" = (
/turf/closed/shuttle/ert,
/area/fiorina/tumor/aux_engi)
@@ -31262,13 +31253,11 @@
/turf/open/floor/plating/prison,
/area/fiorina/tumor/civres)
"yiG" = (
-/obj/structure/stairs/perspective{
- dir = 8;
- icon_state = "p_stair_full"
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi'
},
-/obj/structure/platform/metal/almayer,
-/turf/open/floor/prison,
-/area/fiorina/station/disco)
+/turf/open/floor/plating/prison,
+/area/fiorina/station/lowsec/showers_laundry)
"yiL" = (
/obj/item/trash/cigbutt/bcigbutt,
/turf/open/floor/prison/darkredfull2,
@@ -31283,11 +31272,10 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/fiorina/lz/near_lzI)
-"yjV" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"yjy" = (
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor/prison/whitepurple/northwest,
+/area/fiorina/station/research_cells/west)
"yjW" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/floor/prison/floor_plate,
@@ -31303,6 +31291,14 @@
/obj/structure/blocker/invisible_wall,
/turf/open/ice/noweed,
/area/fiorina/tumor/ice_lab)
+"ykU" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/box/wy_mre{
+ pixel_x = 5;
+ pixel_y = 2
+ },
+/turf/open/floor/prison/darkpurplefull2,
+/area/fiorina/station/research_cells/west)
"ykX" = (
/obj/structure/machinery/constructable_frame{
icon_state = "box_1"
@@ -31315,22 +31311,21 @@
},
/turf/closed/wall/r_wall/prison_unmeltable,
/area/fiorina/station/central_ring)
-"ylr" = (
-/obj/structure/machinery/light/double/blue{
- dir = 4;
- pixel_x = 10;
- pixel_y = 13
- },
-/turf/open/floor/prison/whitepurple/east,
-/area/fiorina/station/research_cells/east)
"ylu" = (
/obj/item/tool/wrench,
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
-"ylU" = (
-/obj/structure/platform/metal/kutjevo_smooth/east,
-/turf/open/space/basic,
-/area/fiorina/oob)
+"ylI" = (
+/turf/open/floor/prison/yellowfull,
+/area/fiorina/station/lowsec/east)
+"ylL" = (
+/obj/structure/platform/metal/almayer/north,
+/obj/structure/machinery/light/double/blue{
+ dir = 1;
+ pixel_y = 21
+ },
+/turf/open/floor/prison,
+/area/fiorina/station/medbay)
"ylW" = (
/obj/effect/decal/medical_decals{
icon_state = "cryomid"
@@ -37456,7 +37451,7 @@ baC
baC
baC
pcu
-hfJ
+lLi
bQM
bQM
bQM
@@ -37666,9 +37661,9 @@ baC
baC
baC
baC
-gjm
+gbs
pcu
-hfJ
+lLi
bQM
bQM
bQM
@@ -37878,9 +37873,9 @@ baC
baC
baC
bQM
-gjm
+gbs
pcu
-hfJ
+lLi
bQM
bQM
bQM
@@ -38087,15 +38082,15 @@ bfF
rGq
rZP
baC
-rfI
-rQt
-rQt
-eyB
-pFE
-ocW
-rQt
-rQt
-grn
+uBH
+xkO
+xkO
+eId
+itY
+bVb
+xkO
+xkO
+urj
bQM
bQM
bQM
@@ -38299,7 +38294,7 @@ bfF
rGq
lHx
bQM
-gjm
+gbs
afk
afk
afk
@@ -38307,7 +38302,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -38511,7 +38506,7 @@ vsT
rGq
lHx
bQM
-gjm
+gbs
afk
afk
afk
@@ -38519,7 +38514,7 @@ pcu
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -38723,7 +38718,7 @@ rGq
rGq
lHx
bQM
-gjm
+gbs
afk
afk
afk
@@ -38731,7 +38726,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -38935,15 +38930,15 @@ osX
rGq
rZP
baC
-rcy
-rhR
-rhR
-dfw
-lJb
-ngo
-rhR
-rhR
-mtM
+rji
+qUn
+qUn
+vrC
+eQy
+ciH
+qUn
+qUn
+oZv
bQM
bQM
bQM
@@ -39150,9 +39145,9 @@ baC
baC
baC
bQM
-gjm
+gbs
pcu
-hfJ
+lLi
bQM
bQM
bQM
@@ -39364,7 +39359,7 @@ baC
baC
baC
pcu
-hfJ
+lLi
bQM
bQM
bQM
@@ -43442,7 +43437,7 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
aaa
bQM
cAW
@@ -43654,9 +43649,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
cAW
@@ -43811,10 +43806,10 @@ irB
irB
irB
tkj
-eGT
-qMk
-qMk
-amg
+cSg
+jOF
+jOF
+sCU
oPU
oPU
oPU
@@ -44017,21 +44012,21 @@ oer
oPU
uKE
oPU
-oCH
-bKO
+iIF
+afQ
irB
jgu
jgu
-ebx
-byn
+rFj
+dWI
jgu
jgu
-dGF
+wse
wgO
-rEG
-qMk
-qMk
-amg
+cmq
+jOF
+jOF
+sCU
tkj
oer
vLH
@@ -44227,9 +44222,9 @@ jgu
tkj
oer
oPU
-oCH
-bKO
-rBh
+iIF
+afQ
+qTP
jgu
kXD
jgu
@@ -44238,12 +44233,12 @@ mWs
dCK
chT
jgu
-ebx
+rFj
sTm
-byn
+dWI
jgu
jgu
-dGF
+wse
tkj
oer
xVW
@@ -44290,9 +44285,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
cAW
@@ -44439,7 +44434,7 @@ jgu
bxm
oer
oPU
-gXa
+qjP
jgu
kXD
jgu
@@ -44455,7 +44450,7 @@ wnu
dqE
tNV
kXD
-dGF
+wse
tkj
oer
lzJ
@@ -44502,9 +44497,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
cAW
@@ -44650,8 +44645,8 @@ vhB
wgO
tkj
oer
-oCH
-rBh
+iIF
+qTP
kXD
oRR
dLq
@@ -44667,7 +44662,7 @@ wbI
wbI
lzJ
kXD
-dGF
+wse
tkj
lzJ
irB
@@ -44714,9 +44709,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
cAW
@@ -44734,17 +44729,17 @@ agi
agi
aWV
aWV
-cDO
+jIa
fUz
-oxR
+ygS
aWV
jXz
jXz
jXz
aWV
-cDO
+jIa
fUz
-lIN
+tDF
jXz
otg
dLL
@@ -44862,7 +44857,7 @@ vhB
wgO
tkj
oer
-gXa
+qjP
jgu
jgu
wbI
@@ -44879,7 +44874,7 @@ wbI
wbI
wbI
kXD
-dGF
+wse
mPX
tiZ
irB
@@ -44946,17 +44941,17 @@ aWV
aWV
jXz
jXz
-bDf
+uGb
lLQ
-hlx
+pAu
jXz
pgx
pgx
pgx
jXz
-bDf
+uGb
lLQ
-hlx
+pAu
gKi
lLQ
oiV
@@ -45073,26 +45068,26 @@ jgu
jgu
jgu
bxm
-eGT
-rBh
+cSg
+qTP
kXD
wbI
jcv
djf
tkj
oer
-pKV
+dLO
jUG
jUG
-ixU
+fwS
lxT
alP
wbI
jcv
wbI
kXD
-vQK
-oHe
+gVV
+oYu
wbI
irB
irB
@@ -45140,7 +45135,7 @@ bQM
cAW
bQM
aaa
-hfJ
+lLi
cAW
cAW
cAW
@@ -45285,7 +45280,7 @@ jgu
itN
jgu
tkj
-udd
+eIl
jgu
jgu
jBQ
@@ -45293,10 +45288,10 @@ bvK
dLq
tkj
oer
-gLC
+weh
jfd
hRX
-qZp
+kzC
tkj
oer
jBQ
@@ -45304,7 +45299,7 @@ oRR
dLq
jgu
jgu
-dGF
+wse
wbI
tkj
oer
@@ -45350,9 +45345,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
cAW
@@ -45497,7 +45492,7 @@ jgu
itN
jgu
tkj
-cRk
+dIx
jgu
anu
wbI
@@ -45505,10 +45500,10 @@ rBz
wbI
tkj
oer
-gLC
+weh
hRX
pzh
-ttU
+clF
nez
oer
wbI
@@ -45516,7 +45511,7 @@ rBz
wbI
qkg
jgu
-kMA
+sxe
wbI
tkj
oer
@@ -45562,9 +45557,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
cAW
@@ -45709,26 +45704,26 @@ jgu
jgu
jgu
tkj
-ecz
-iUR
+duK
+dxa
oyT
oyT
oyT
oyT
oWw
oer
-gLC
-mxs
+weh
+maR
vhI
-gAs
+xvJ
tkj
lzP
oyT
oyT
oyT
eNn
-rov
-mwi
+vmc
+uMy
oyT
oWw
oer
@@ -45774,9 +45769,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
agi
@@ -45921,26 +45916,26 @@ itN
itN
oPU
tkj
-scb
-juL
+dsY
+tKH
tiZ
tiZ
tiZ
tiZ
wCI
lAn
-pFB
+mBI
sbf
vhI
-ttU
+clF
oWG
mtG
tiZ
tiZ
tiZ
uVO
-sxY
-lcO
+ufP
+tez
tiZ
tiZ
qhk
@@ -45986,9 +45981,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
agi
@@ -46133,7 +46128,7 @@ itN
itN
oPU
tkj
-cRk
+dIx
jgu
anu
wbI
@@ -46141,10 +46136,10 @@ jcv
wbI
tkj
oer
-gLC
+weh
uxN
-gTc
-ttU
+maR
+clF
nWk
oer
wbI
@@ -46152,7 +46147,7 @@ jcv
wbI
qkg
jgu
-iGh
+sMO
wbI
wbI
wbI
@@ -46198,9 +46193,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
cAW
cAW
agi
@@ -46345,7 +46340,7 @@ itN
sIz
oPU
tkj
-udd
+eIl
jgu
jgu
jBQ
@@ -46353,10 +46348,10 @@ nAf
dLq
tkj
oer
-gLC
+weh
hRX
sbf
-ttU
+clF
tkj
oer
jBQ
@@ -46410,9 +46405,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-hfJ
+lLi
agi
aWV
aWV
@@ -46557,18 +46552,18 @@ itN
kMC
oPU
tkj
-aOp
-foR
+mRz
+fJC
kXD
wbI
rBz
wbI
qUC
oer
-ebx
+rFj
sTm
sTm
-byn
+dWI
tkj
oer
wbI
@@ -46622,9 +46617,9 @@ bQM
bQM
bQM
cAW
-gjm
+gbs
pcu
-toG
+dof
agi
aWV
aPD
@@ -46770,7 +46765,7 @@ wgO
oPU
tkj
oer
-gXa
+qjP
kXD
wbI
wbI
@@ -46834,7 +46829,7 @@ bQM
cAW
cAW
cAW
-gjm
+gbs
pcu
pcu
agi
@@ -46982,7 +46977,7 @@ vhB
oPU
gyt
oer
-pRM
+gkr
kXD
aBJ
wKb
@@ -47046,9 +47041,9 @@ bQM
cAW
cAW
cAW
-gjm
+gbs
pcu
-jAw
+eiW
agi
aWV
aPD
@@ -47194,7 +47189,7 @@ vhB
oPU
tkj
oer
-pRM
+gkr
kXD
lvt
tas
@@ -47258,7 +47253,7 @@ cAW
cAW
cAW
cAW
-gjm
+gbs
pcu
agi
agi
@@ -47406,12 +47401,12 @@ vhB
oPU
tkj
oer
-pRM
+gkr
jgu
jgu
-pKV
+dLO
jUG
-ixU
+fwS
jgu
wuC
roi
@@ -47470,7 +47465,7 @@ bQM
cAW
cAW
cAW
-gjm
+gbs
pcu
agi
agi
@@ -47618,16 +47613,16 @@ wgO
dmT
tkj
oer
-sce
-lLk
-lLk
-qVb
+kxr
+kvN
+kvN
+bNZ
wgO
-gXa
+qjP
jgu
jgu
-pKV
-lMJ
+dLO
+yht
jgu
itN
jBQ
@@ -47835,12 +47830,12 @@ oPU
oPU
gAn
oPU
-sce
-dOI
-dOI
-roC
-wXY
-dOI
+kxr
+icy
+icy
+tye
+cqI
+icy
itN
wbI
qJL
@@ -48216,7 +48211,7 @@ frM
bnA
wSU
wSU
-xxW
+hjU
guz
iiw
awL
@@ -48428,7 +48423,7 @@ vBX
wAn
wSU
wSU
-xxW
+hjU
guz
gcx
okv
@@ -48640,7 +48635,7 @@ vBX
bnA
wSU
wSU
-xxW
+hjU
guz
gcx
okv
@@ -48852,7 +48847,7 @@ guz
bnA
vDf
wSU
-xxW
+hjU
guz
gcx
pLQ
@@ -48861,7 +48856,7 @@ guz
guz
guz
guz
-eaH
+tFi
cEw
cEw
cEw
@@ -49064,7 +49059,7 @@ bgc
bnA
wSU
kok
-xxW
+hjU
guz
gcx
okv
@@ -49073,7 +49068,7 @@ guz
wSU
uSA
uSA
-vej
+vVv
bnA
wps
guz
@@ -49082,17 +49077,17 @@ wrR
mpE
vOm
vOm
-dHE
+mVV
ipd
soj
iTJ
kbo
tSm
tSm
-xdz
-tWo
-low
-jXr
+lkU
+uFv
+bWb
+mgU
nkF
nkF
nkF
@@ -49275,8 +49270,8 @@ fXI
guz
xvB
aAA
-pxu
-enn
+uUJ
+fFe
guz
gcx
pLQ
@@ -49285,7 +49280,7 @@ guz
wSU
yeX
pen
-xkg
+wdy
bnA
mSo
guz
@@ -49294,7 +49289,7 @@ wrR
xvv
xvv
xvv
-qAO
+hQV
ipd
soj
rKy
@@ -49497,26 +49492,26 @@ guz
wSU
uSA
uSA
-cQB
-wXo
-iNs
+mil
+kHC
+mCQ
vBX
guz
eMG
xvv
xvv
xvv
-qAO
+hQV
ipd
spb
rKy
xiL
mAt
nMp
-atb
-yeI
-owz
-qhL
+aFj
+hLH
+qgt
+lKV
wgO
wgO
wgO
@@ -49718,7 +49713,7 @@ bPG
xvv
xvv
xvv
-qAO
+hQV
ipd
spb
rKy
@@ -49728,7 +49723,7 @@ wrR
ipd
ipd
nvD
-dGF
+wse
vhB
vhB
wgO
@@ -49930,17 +49925,17 @@ bPG
xvv
xvv
xvv
-qAO
+hQV
ipd
kdq
rKy
xiL
mdS
tSm
-xdz
-tWo
-low
-qVb
+lkU
+uFv
+bWb
+bNZ
wgO
wgO
bRs
@@ -50133,16 +50128,16 @@ guz
wSU
uSA
uSA
-luR
-vJw
-hEW
+ufh
+sYA
+lVB
vBX
guz
bPG
xvv
xvv
xvv
-qAO
+hQV
ipd
vMs
sFd
@@ -50345,26 +50340,26 @@ guz
wSU
yeX
pen
-xkg
+wdy
bnA
jHp
myH
jHp
wrR
-qlC
+dth
pYL
pYL
-fKE
+fFI
wrR
wrR
wrR
wrR
rKy
mAt
-atb
-yeI
-owz
-qhL
+aFj
+hLH
+qgt
+lKV
wgO
lAN
wgO
@@ -50554,10 +50549,10 @@ gcx
okv
gcx
guz
-sMq
-rPj
-rPj
-qeq
+lOg
+nkL
+nkL
+arP
bnA
kzL
guz
@@ -50766,7 +50761,7 @@ gcx
okv
gcx
guz
-wws
+gGN
wrR
ipd
ipd
@@ -50978,7 +50973,7 @@ gcx
okv
gcx
guz
-xkg
+wdy
pVD
mKx
iTJ
@@ -51183,14 +51178,14 @@ fXI
guz
okv
aAA
-alk
-vCM
+pds
+rKY
guz
gcx
okv
gcx
ffA
-wws
+gGN
pVD
mKx
iBM
@@ -51396,22 +51391,22 @@ tSY
bnA
vDf
kok
-xxW
+hjU
guz
gcx
okv
gcx
vrS
-wws
+gGN
wrR
wrR
tql
xiL
iOX
-gsx
+lWH
eYN
eYN
-uHv
+wBe
jqM
xiL
rKy
@@ -51608,23 +51603,23 @@ vBX
bnA
vBX
wSU
-xxW
+hjU
guz
gcx
okv
gcx
ffA
-wws
+gGN
wrR
nhX
anT
vcq
-vuq
-eyT
+pQy
+cdc
kat
jVM
-cgo
-hoz
+mQU
+nAG
vAX
rKy
rft
@@ -51820,23 +51815,23 @@ guz
vBX
vBX
kok
-jtW
+vOT
guz
gcx
okv
gcx
guz
-xkg
+wdy
wrR
nzf
dpZ
vAX
-uyA
+jIp
bSM
bSM
bSM
bSM
-tcd
+jtI
pAl
rKy
rft
@@ -52032,23 +52027,23 @@ guz
vBX
vBX
wSU
-jtW
+vOT
rdi
gcx
tER
gcx
guz
-xkg
+wdy
wrR
eQz
ixK
rKG
-xpd
-hjA
-hjA
-hjA
-hjA
-nte
+nig
+lkb
+lkb
+lkb
+lkb
+szk
vAX
rKy
oEX
@@ -52187,13 +52182,13 @@ rty
cui
mzn
eXp
-eDU
-iXn
+eUe
+xVF
raL
raL
raL
-tDO
-dzs
+iRO
+bJw
eXp
raL
rty
@@ -52244,13 +52239,13 @@ guz
vBX
vBX
wSU
-xxW
+hjU
rhh
kJf
okv
gcx
guz
-wws
+gGN
wrR
wrR
iFg
@@ -52400,11 +52395,11 @@ bxg
jlB
xrZ
xGc
-iGI
+ewj
uzy
uzy
uzy
-imH
+uwn
xGc
bNE
rKA
@@ -52456,13 +52451,13 @@ wSX
iuz
vBX
wSU
-xxW
+hjU
rhh
uEj
okv
gcx
guz
-wws
+gGN
pVD
mKx
iTJ
@@ -52668,13 +52663,13 @@ wSU
oVk
vBX
wSU
-jtW
+vOT
rhh
jji
vjG
gcx
guz
-xkg
+wdy
pVD
mKx
dBt
@@ -52880,13 +52875,13 @@ wSU
oVk
vBX
kok
-jtW
+vOT
guz
gcx
okv
gcx
guz
-xkg
+wdy
wrR
vdH
eyv
@@ -52902,10 +52897,10 @@ qjX
wDe
xiL
iOX
-gsx
+lWH
eYN
eYN
-uHv
+wBe
iOX
xiL
rKy
@@ -53092,13 +53087,13 @@ wSU
eys
vBX
wSU
-xxW
+hjU
guz
gcx
kEj
gcx
guz
-wws
+gGN
pVD
iQH
mKx
@@ -53113,12 +53108,12 @@ ipd
rKy
rft
vAX
-vuq
-dJc
+pQy
+vqH
kat
jVM
-cgo
-hoz
+mQU
+nAG
vAX
rKy
rft
@@ -53275,13 +53270,13 @@ bis
nOz
mCp
gTi
-hFX
+axX
lqq
lqq
lqq
lqq
lqq
-iLE
+mwY
mCp
gTi
nOz
@@ -53304,13 +53299,13 @@ wSU
wSU
vBX
kok
-xxW
+hjU
guz
gcx
okv
gcx
guz
-wws
+gGN
pVD
mKx
mKx
@@ -53325,12 +53320,12 @@ ipd
rKy
iEA
vAX
-uyA
+jIp
bSM
bSM
bSM
bSM
-tcd
+jtI
vAX
rKy
rft
@@ -53447,17 +53442,17 @@ tel
ioM
ioM
ioM
-sSv
-kll
+ree
+hNi
ioM
ioM
ioM
ioM
ioM
-sSv
+ree
chx
chx
-kll
+hNi
ioM
ioM
ioM
@@ -53467,10 +53462,10 @@ ioM
ioM
ioM
ioM
-sSv
+ree
chx
chx
-kll
+hNi
ioM
ioM
hVI
@@ -53487,13 +53482,13 @@ sJu
lqq
mCp
gTi
-rOV
-mcy
+lJc
+hwV
nOz
pVR
nOz
-owI
-xID
+bPj
+wVj
mCp
gTi
lqq
@@ -53515,14 +53510,14 @@ wSU
wSU
wSU
vBX
-pxu
-enn
+uUJ
+fFe
guz
gcx
okv
gcx
guz
-wws
+gGN
pVD
mKx
mKx
@@ -53537,12 +53532,12 @@ ipd
rKy
rft
vAX
-xpd
-hjA
-hjA
-hjA
-hjA
-nte
+nig
+lkb
+lkb
+lkb
+lkb
+szk
vAX
rKy
mdS
@@ -53700,11 +53695,11 @@ nOz
mCp
gTi
eTc
-mrP
-pbo
-pbo
-pbo
-fcH
+smQ
+hzt
+hzt
+hzt
+jdj
eTc
mCp
gTi
@@ -53734,7 +53729,7 @@ gcx
okv
gcx
guz
-wws
+gGN
wrR
vdH
eyv
@@ -53871,8 +53866,8 @@ ioM
ioM
ioM
ioM
-sSv
-kll
+ree
+hNi
ioM
hVI
fCr
@@ -53946,8 +53941,8 @@ gcx
okv
gcx
guz
-eYW
-hBK
+cAP
+rrk
xiL
iTJ
tSm
@@ -54151,8 +54146,8 @@ ppS
hGn
lit
vBX
-alk
-vCM
+pds
+rKY
guz
gcx
okv
@@ -54364,14 +54359,14 @@ wSU
wSU
vBX
kok
-xxW
+hjU
guz
gcx
okv
gcx
guz
-sMq
-qqm
+lOg
+dVm
xiL
sFd
nMp
@@ -54576,32 +54571,32 @@ wSU
wSU
vBX
bnA
-jtW
+vOT
guz
pCH
awL
wSt
guz
-wws
+gGN
wrR
mKx
rft
xiL
iOX
-gsx
+lWH
eYN
eYN
-uHv
+wBe
iOX
xiL
gmx
rft
kgY
mxm
-gsx
+lWH
eYN
eYN
-uHv
+wBe
jqM
xiL
rKy
@@ -54788,33 +54783,33 @@ hGn
lit
tSY
bnA
-xxW
+hjU
guz
guz
guz
guz
guz
-wws
+gGN
wrR
mKx
rft
aYf
-vuq
-dJc
+pQy
+vqH
kat
jVM
-cgo
-hoz
+mQU
+nAG
vAX
rKy
rft
oeV
-vuq
-dJc
+pQy
+vqH
kat
jVM
-cgo
-hoz
+mQU
+nAG
vAX
rKy
mAt
@@ -55000,33 +54995,33 @@ wSU
wSU
vBX
bnA
-aIT
-dzh
-xSj
+wtd
+lai
+iMU
vBX
-luR
-dzh
-qZz
+ufh
+lai
+fdK
wrR
vdH
rft
vAX
-uyA
+jIp
bSM
bSM
bSM
bSM
-sQv
+buS
vAX
rKy
rft
lIH
-uyA
+jIp
bSM
bSM
bSM
bSM
-tcd
+jtI
vAX
rKy
rft
@@ -55214,31 +55209,31 @@ lNP
bnA
bnA
eOI
-osu
+wPt
fpN
-kab
+tgi
oxU
wrR
wrR
mKx
rft
vAX
-xpd
-hjA
-hjA
-hjA
-hjA
-nte
+nig
+lkb
+lkb
+lkb
+lkb
+szk
vAX
rKy
rft
iiz
-xpd
-hjA
-hjA
-hjA
-vce
-nte
+nig
+lkb
+lkb
+lkb
+tdI
+szk
vAX
rKy
rft
@@ -55262,18 +55257,18 @@ voi
voi
xUr
itN
-rfI
-rQt
-rQt
-eyB
-pFE
-ocW
-eyB
-pFE
-ocW
-rQt
-rQt
-grn
+uBH
+xkO
+xkO
+eId
+itY
+bVb
+eId
+itY
+bVb
+xkO
+xkO
+urj
twb
chE
kMU
@@ -55474,7 +55469,7 @@ voi
voi
lwA
uGT
-gjm
+gbs
afk
afk
afk
@@ -55485,7 +55480,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
tPN
rMo
kTs
@@ -55686,7 +55681,7 @@ hpd
fXB
fXB
dCM
-gjm
+gbs
afk
afk
afk
@@ -55697,7 +55692,7 @@ pcu
afk
afk
afk
-hfJ
+lLi
tPN
fmE
dKX
@@ -55789,8 +55784,8 @@ bFA
rYY
ePq
mzS
-vgK
-rPM
+msx
+eUl
xXh
xuQ
gjz
@@ -55898,7 +55893,7 @@ ubP
ubP
ubP
dCM
-gjm
+gbs
afk
afk
afk
@@ -55909,7 +55904,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
tPN
mKo
kTs
@@ -56008,8 +56003,8 @@ xuQ
tja
tja
hVI
-dUm
-dUm
+eRy
+eRy
hVI
hVI
qEl
@@ -56110,18 +56105,18 @@ ubP
ubP
ubP
nqN
-rcy
-rhR
-rhR
-dfw
-lJb
-ngo
-dfw
-lJb
-ngo
-rhR
-rhR
-mtM
+rji
+qUn
+qUn
+vrC
+eQy
+ciH
+vrC
+eQy
+ciH
+qUn
+qUn
+oZv
twb
ifP
gfo
@@ -56420,9 +56415,9 @@ xUn
xUn
xUn
aFZ
-rQt
-rQt
-rQt
+xkO
+xkO
+xkO
aFZ
tQB
tQB
@@ -56825,7 +56820,7 @@ xLi
cGa
cer
kpq
-bpH
+aKd
qkt
nEW
ddL
@@ -56844,9 +56839,9 @@ tja
bLM
jMh
tQB
-rhR
-rhR
-rhR
+qUn
+qUn
+qUn
tQB
qrn
qrn
@@ -57037,7 +57032,7 @@ hae
hae
iRI
kpq
-tKh
+sye
rHX
tvi
ddL
@@ -57102,10 +57097,10 @@ tyj
dtS
bFr
bis
-kOM
+bdg
hXX
hXX
-aYX
+rNt
bFr
bFr
bFr
@@ -57563,7 +57558,7 @@ ngn
wWs
wWs
gag
-vor
+tCc
wWs
wWs
ihB
@@ -57705,7 +57700,7 @@ tja
yhs
hVI
kYi
-elr
+aVO
xxX
iAA
aRt
@@ -57876,11 +57871,11 @@ cer
kpq
wou
xLi
-qfK
-ndC
-piV
-hJV
-kKh
+tLZ
+mkk
+gOM
+uOw
+roh
nmy
luZ
cer
@@ -58088,12 +58083,12 @@ cer
kpq
mvp
ddL
-dMT
+hOs
nId
ykO
pCc
-isI
-tim
+nJw
+rsN
mvp
cer
wun
@@ -58126,8 +58121,8 @@ bLM
gbv
bLM
fYa
-kRl
-mOc
+oas
+uLK
bLM
hOG
jQs
@@ -58186,8 +58181,8 @@ uGY
uGY
uGY
nqN
-kuQ
-nKZ
+sxg
+pzl
gpG
ihB
ohx
@@ -58300,8 +58295,8 @@ cer
kpq
mvp
ddL
-rEr
-nMZ
+qJU
+iBB
oHX
pFP
iUr
@@ -58398,8 +58393,8 @@ fdf
rQd
rOu
twb
-vJR
-oNn
+rWx
+jYu
gpG
lkP
ihB
@@ -58512,12 +58507,12 @@ cer
kpq
aUA
ddL
-kPG
+pBg
nOw
oXR
pHh
-tnx
-rBE
+qLg
+mwa
mvp
cer
kpq
@@ -58610,8 +58605,8 @@ cME
cME
cME
liA
-uWk
-qGW
+djq
+qdM
ceC
bQW
fiG
@@ -58724,11 +58719,11 @@ cer
kpq
wou
xLi
-oYX
-eor
-mYz
-tHp
-emo
+vmS
+mxu
+jgA
+tmf
+ixU
swJ
mvp
cer
@@ -58762,8 +58757,8 @@ bLM
tja
bLM
fYa
-pud
-bCv
+knH
+vLr
bLM
dOO
uRF
@@ -58975,7 +58970,7 @@ tja
bLM
fYa
kCN
-xig
+aRQ
hko
eUN
pae
@@ -58998,16 +58993,16 @@ fIq
mEO
oou
aFZ
-blI
-ifB
-pFE
-uFx
-lud
-mvt
-axW
-pFE
-wOq
-biz
+pfk
+uYj
+itY
+bko
+gTB
+cDd
+iPi
+itY
+kwf
+dgX
bQM
tPN
ecL
@@ -59031,15 +59026,15 @@ mCp
rHu
rJu
uzw
-rjw
-kXT
-wat
-wat
-iHi
-abJ
-iBI
-iBI
-abJ
+qjT
+dRU
+byh
+byh
+rzY
+yiG
+sag
+sag
+yiG
ubP
ubP
ubP
@@ -59187,7 +59182,7 @@ tja
dTg
qCE
eYr
-raJ
+gZU
bLM
dOO
oTi
@@ -59210,17 +59205,17 @@ lyJ
nBt
kwT
tQB
-jZF
+iip
afk
afk
afk
-xpF
-gJv
+vud
+nGv
afk
afk
afk
-pom
-rQt
+anY
+xkO
tPN
ecL
cME
@@ -59243,15 +59238,15 @@ eLu
eLu
kfW
cME
-rjw
-btJ
-lkb
-oLE
-oMW
-vRA
-iBI
-iBI
-vRA
+qjT
+wUL
+bRP
+fOl
+mXC
+bIV
+sag
+sag
+bIV
ubP
nXX
ubP
@@ -59399,7 +59394,7 @@ tja
dTg
slh
eYr
-raJ
+gZU
bLM
dOO
oTi
@@ -59422,16 +59417,16 @@ mEO
lLE
xoi
tQB
-whc
+hAp
afk
hkh
afk
-deC
-whc
+bZr
+hAp
afk
hkh
afk
-deC
+bZr
pcu
tPN
jSE
@@ -59455,15 +59450,15 @@ eLu
cME
cME
cME
-wHu
-btJ
-qRa
-oLE
-blt
-rjw
-pGS
-cas
-rjw
+aXF
+wUL
+rKi
+fOl
+jso
+qjT
+dmi
+rJH
+qjT
sOj
uye
ubP
@@ -59611,7 +59606,7 @@ bLM
dTg
slh
eYr
-raJ
+gZU
oeN
dOO
oTi
@@ -59634,17 +59629,17 @@ mNB
byY
fUX
tQB
-pNp
+fzv
afk
afk
afk
-aWY
-hyR
+ptd
+eta
afk
afk
afk
-mxN
-rhR
+tjT
+qUn
twb
twb
twb
@@ -59667,15 +59662,15 @@ uvF
cME
ljd
cME
-wHu
-btJ
-oLE
-oLE
-ger
-abJ
-iBI
-iBI
-abJ
+aXF
+wUL
+fOl
+fOl
+hgz
+yiG
+sag
+sag
+yiG
aUg
ubP
ubP
@@ -59823,7 +59818,7 @@ ueX
qjM
qjM
tis
-tFB
+gWD
xlk
nfu
kpH
@@ -59843,19 +59838,19 @@ fgY
vWe
hVI
hVI
-iDR
+sYv
wyl
aFZ
-lHJ
-uMt
-lJb
-mkr
-uEl
-atD
-lOX
-lJb
-bjA
-uEl
+tAq
+syF
+eQy
+aoU
+mdN
+ajl
+pWM
+eQy
+wmT
+mdN
bQM
bQM
kPz
@@ -59879,15 +59874,15 @@ cME
cME
cME
eLu
-rjw
-btJ
-oLE
-mlE
-vza
-vRA
-iBI
-iBI
-vRA
+qjT
+wUL
+fOl
+aXG
+fRT
+bIV
+sag
+sag
+bIV
ubP
ubP
ubP
@@ -60032,10 +60027,10 @@ tja
ltd
ueX
aSS
-wge
-czx
-czx
-jKJ
+cbG
+rIV
+rIV
+ttK
jQs
afq
uRF
@@ -60055,7 +60050,7 @@ svW
hVI
hVI
hVI
-eGF
+opb
hVI
aFZ
sKY
@@ -60091,11 +60086,11 @@ cME
cME
cME
eLu
-rjw
-btJ
-oLE
-skj
-rjw
+qjT
+wUL
+fOl
+qnu
+qjT
ceC
xGt
xGt
@@ -60208,11 +60203,11 @@ cer
kpq
wou
xLi
-qfK
-hJV
-aQA
-qrN
-kKh
+tLZ
+uOw
+gdN
+nUH
+roh
bzU
mvp
cer
@@ -60243,8 +60238,8 @@ otz
tja
tja
fYa
-kRl
-jDl
+oas
+sGi
bLM
hkM
dOO
@@ -60303,11 +60298,11 @@ uvF
cME
cME
cME
-rjw
-btJ
-oLE
-oMW
-rjw
+qjT
+wUL
+fOl
+mXC
+qjT
jIw
cRl
sQC
@@ -60420,12 +60415,12 @@ cer
kpq
mvp
ddL
-dMT
+hOs
nId
ykO
pCc
-ioN
-tim
+ixR
+rsN
mvp
cer
kpq
@@ -60456,7 +60451,7 @@ tja
mMh
gFp
ikL
-gwt
+fDv
vBH
bLM
dOO
@@ -60515,11 +60510,11 @@ eLu
cYP
qso
gsN
-rjw
-btJ
-oLE
-oMW
-yaS
+qjT
+wUL
+fOl
+mXC
+isk
yiL
cZV
wNG
@@ -60632,8 +60627,8 @@ cer
kpq
mvp
ddL
-rEr
-nUr
+qJU
+sty
oHX
pFP
blA
@@ -60727,11 +60722,11 @@ kqC
kqC
kqC
kqC
-rjw
-oSn
-hwN
-eJy
-rjw
+qjT
+rVt
+pRh
+aIH
+qjT
lEF
tsN
tsN
@@ -60844,12 +60839,12 @@ cer
kpq
ajw
ddL
-kPG
+pBg
nOw
oXR
pHh
-fgT
-rBE
+pdb
+mwa
mvp
cer
pvF
@@ -60939,11 +60934,11 @@ bjt
kqC
sfu
jyF
-rjw
-iBI
-iBI
-iBI
-rjw
+qjT
+sag
+sag
+sag
+qjT
xGt
xGt
xGt
@@ -60968,7 +60963,7 @@ tir
sCH
ceC
kIA
-qWe
+uid
ubP
pTj
ubP
@@ -61056,11 +61051,11 @@ cer
kpq
azZ
xLi
-oYX
-rGB
-mYz
-tHp
-emo
+vmS
+tjR
+jgA
+tmf
+ixU
nmy
luZ
cer
@@ -61091,8 +61086,8 @@ eCy
cTE
njm
fYa
-pud
-tfy
+knH
+ien
bLM
ddB
rcI
@@ -61151,16 +61146,16 @@ bjt
kqC
qNF
ctW
-rjw
-kXT
-wat
-wat
-wat
-car
-gOU
-gOU
-gOU
-vFV
+qjT
+dRU
+byh
+byh
+byh
+eSX
+xVL
+xVL
+xVL
+ngX
xGt
ucu
ihB
@@ -61304,7 +61299,7 @@ hVI
hVI
hVI
yhR
-rfy
+aDO
jQs
afq
tja
@@ -61315,8 +61310,8 @@ aWI
jQs
jQs
jQs
-dul
-wNo
+diR
+xNZ
hVI
vlK
oWY
@@ -61363,16 +61358,16 @@ kgN
kqC
ryJ
end
-rjw
-btJ
-wbW
-oLE
-ufE
-ugg
-oLE
-oLE
-gmG
-ksE
+qjT
+wUL
+sdw
+fOl
+oPK
+ius
+fOl
+fOl
+jzC
+iUL
xGt
roF
xWV
@@ -61496,7 +61491,7 @@ mgh
azZ
azZ
azZ
-piC
+rwH
pcu
tQB
kZu
@@ -61516,7 +61511,7 @@ kZV
bLM
hVI
hVI
-oaD
+ngD
tja
tja
wCJ
@@ -61527,8 +61522,8 @@ gjz
tja
tja
tja
-ovb
-aFH
+vPh
+fxF
hVI
wNB
oTi
@@ -61575,16 +61570,16 @@ vds
vds
vds
elO
-nAs
-btJ
-oLE
-oLE
-hMj
-oLE
-dQe
-oLE
-ygk
-rnE
+hmp
+wUL
+fOl
+fOl
+hSc
+fOl
+sZG
+fOl
+srA
+pMZ
xGt
cLC
pjR
@@ -61708,7 +61703,7 @@ uQT
azZ
azZ
azZ
-gjm
+gbs
pcu
aFZ
hUL
@@ -61727,8 +61722,8 @@ bsR
hGu
bLM
aif
-uNh
-oMI
+oGF
+tyQ
pWX
bDJ
rtP
@@ -61739,7 +61734,7 @@ tja
tja
nMi
tja
-sAg
+jhR
hVI
hVI
mMa
@@ -61787,16 +61782,16 @@ xRI
xRI
xRI
efW
-nAs
-fcB
-oLE
-hlB
-oLE
-oLE
-vYX
-ugg
-ksE
-jTJ
+hmp
+eYa
+fOl
+anB
+fOl
+fOl
+lyc
+ius
+iUL
+cef
ceC
sIh
ihB
@@ -61829,7 +61824,7 @@ uGY
sEO
sEO
sEO
-ctj
+aUr
sXt
sXt
sXt
@@ -61920,7 +61915,7 @@ mvp
azZ
bQM
bQM
-gjm
+gbs
pcu
aFZ
wDK
@@ -61940,7 +61935,7 @@ bLM
njm
hVI
hVI
-oaD
+ngD
hYl
tja
tja
@@ -61951,7 +61946,7 @@ ltd
tja
set
tja
-gvs
+bDR
bLJ
bLJ
bLJ
@@ -61989,7 +61984,7 @@ sKY
sKY
iYw
iYw
-uNB
+luH
dHD
xbM
voO
@@ -61999,15 +61994,15 @@ end
kqC
ryJ
end
-rjw
-lNf
-oLE
-oLE
-elc
-oLE
-oLE
-eNr
-ksE
+qjT
+ecX
+fOl
+fOl
+xBn
+fOl
+fOl
+kns
+iUL
xGt
ucu
ihB
@@ -62021,7 +62016,7 @@ gag
hCk
tCH
wBK
-vQD
+ckC
ceC
dBO
dBO
@@ -62132,7 +62127,7 @@ azZ
azZ
bQM
bQM
-gjm
+gbs
pcu
aFZ
hVI
@@ -62152,7 +62147,7 @@ hVI
hVI
hVI
hVI
-oaD
+ngD
tja
tja
tja
@@ -62163,14 +62158,14 @@ cgx
tja
tja
tja
-dgg
-wQF
+lkN
+hkw
nQu
wRz
fqg
fqg
-ivA
-tMr
+aua
+paK
nQu
nQu
suX
@@ -62194,14 +62189,14 @@ aeI
aeI
nQu
nQu
-pYl
-gTI
+iJG
+kYj
fqg
fqg
fqg
nQu
-pYl
-shC
+iJG
+dAI
cAJ
xbM
hTN
@@ -62211,15 +62206,15 @@ tKk
kqC
rzp
osQ
-rjw
-btJ
-oLE
-oLE
-oLE
-ufE
-wbW
-fxS
-ksE
+qjT
+wUL
+fOl
+fOl
+fOl
+oPK
+sdw
+hmz
+iUL
xGt
roF
oDg
@@ -62233,7 +62228,7 @@ gKg
dFB
hrB
sYP
-vQD
+ckC
uGY
xLd
ihB
@@ -62344,7 +62339,7 @@ azZ
azZ
bQM
bQM
-gjm
+gbs
pcu
aFZ
chZ
@@ -62362,9 +62357,9 @@ mEO
mEO
ddD
hVI
-qlz
-bnW
-hoa
+xkB
+aWS
+uJM
tpZ
jAF
tpZ
@@ -62423,15 +62418,15 @@ dpe
kqC
qLi
dpe
-rjw
-btJ
-oLE
-sRv
-oLE
-wam
-oLE
-mom
-rnE
+qjT
+wUL
+fOl
+lSf
+fOl
+uXV
+fOl
+ydw
+pMZ
xGt
cLC
mwK
@@ -62445,7 +62440,7 @@ aIm
aIm
gag
gag
-vQD
+ckC
cCB
ihB
ubP
@@ -62556,7 +62551,7 @@ azZ
azZ
azZ
bQM
-gjm
+gbs
pcu
aFZ
bRo
@@ -62635,14 +62630,14 @@ kqC
kqC
kqC
kqC
-mCF
-sAF
-oLE
-oLE
-vRA
-oLE
-oLE
-ksE
+imx
+cVI
+fOl
+fOl
+bIV
+fOl
+fOl
+iUL
ceC
ceC
sIh
@@ -62657,7 +62652,7 @@ ltQ
ltQ
uGY
ltQ
-eKa
+mQe
uGY
eZQ
kyZ
@@ -62768,7 +62763,7 @@ azZ
azZ
azZ
tuf
-gjm
+gbs
pcu
tQB
kSd
@@ -62847,14 +62842,14 @@ ioc
kqC
sfu
iEG
-rjw
-btJ
-oLE
-oLE
-vRA
-cKH
-joJ
-ksE
+qjT
+wUL
+fOl
+fOl
+bIV
+cLI
+fYI
+iUL
xGt
bjo
ihB
@@ -62869,7 +62864,7 @@ fRq
fRq
uGY
fRq
-sWR
+pFK
xGt
ihB
ubP
@@ -63011,14 +63006,14 @@ cgx
tja
tja
tja
-aJm
-dar
+tgE
+fty
nQu
pzL
vDL
eWf
-lur
-tok
+pQr
+xpc
nQu
nQu
aeI
@@ -63042,14 +63037,14 @@ aeI
aeI
nQu
nQu
-dYB
-eZK
+fck
+iBW
eWf
eWf
eWf
nQu
-dYB
-bVm
+fck
+nvM
dHD
xbM
fHo
@@ -63058,15 +63053,15 @@ ioc
ioc
kqC
qNF
-fKO
-rjw
-btJ
-oLE
-vRA
-vZL
-oLE
-oLE
-ksE
+fNM
+qjT
+wUL
+fOl
+bIV
+pdR
+fOl
+fOl
+iUL
xGt
mEJ
ihB
@@ -63081,7 +63076,7 @@ gag
gag
gag
gag
-vQD
+ckC
xGt
ihB
ubP
@@ -63172,9 +63167,9 @@ xLi
dqX
fEn
fEn
-mDC
-mDC
-gtD
+wzU
+wzU
+gjc
rHX
dqX
rHX
@@ -63223,7 +63218,7 @@ tja
hYl
tja
tja
-jxS
+eEB
iYw
egk
sKY
@@ -63261,7 +63256,7 @@ sKY
sKY
iYw
iYw
-uNB
+luH
dHD
xbM
fHo
@@ -63271,14 +63266,14 @@ kgN
kqC
ryJ
end
-rjw
-oTL
-oLE
-vRA
-oLE
-oLE
-ejf
-ksE
+qjT
+lMf
+fOl
+bIV
+fOl
+fOl
+gyr
+iUL
xGt
izN
mDS
@@ -63293,7 +63288,7 @@ gag
gag
gag
gag
-vQD
+ckC
xGt
gwm
ubP
@@ -63386,7 +63381,7 @@ dqX
dqX
xLi
xLi
-joB
+vxp
rHX
dqX
rHX
@@ -63435,7 +63430,7 @@ tja
tja
tja
tja
-rzZ
+mLq
aFZ
aFZ
fPB
@@ -63483,14 +63478,14 @@ vds
vds
msH
elO
-nAs
-fcB
-gQc
-oLE
-oLE
-oLE
-oLE
-ksE
+hmp
+eYa
+dDr
+fOl
+fOl
+fOl
+fOl
+iUL
ceC
ceC
nqN
@@ -63503,9 +63498,9 @@ uGY
uxv
ceC
ceC
-wFs
+kye
jyv
-osS
+nwm
uGY
ilr
ubP
@@ -63598,7 +63593,7 @@ mvp
irD
iMN
oNu
-pak
+cIj
rHX
dqX
rHX
@@ -63647,7 +63642,7 @@ fCf
jTo
jbq
tja
-aoG
+cEr
aFZ
aFZ
fPB
@@ -63695,17 +63690,17 @@ xRI
xRI
xRI
efW
-nAs
-fcB
-oLE
-oLE
-vRA
-osN
-xdb
-pZn
-kIb
-vFV
-ipy
+hmp
+eYa
+fOl
+fOl
+bIV
+nfi
+ouP
+sCo
+vrs
+ngX
+xoJ
kPz
kPz
kPz
@@ -63810,7 +63805,7 @@ mvp
sVS
dwZ
wsM
-pak
+cIj
rHX
dqX
rHX
@@ -63828,13 +63823,13 @@ dqX
fEn
mvp
mvp
-bCM
-huZ
-yin
-yin
-yin
-fvn
-tZE
+sMo
+ahF
+hnl
+hnl
+hnl
+uPE
+xbX
fbc
bLM
bLM
@@ -63845,30 +63840,30 @@ aFZ
aFZ
bmE
aFZ
-sta
-sta
-sta
-jmG
-jmG
-tOp
-tOp
-tOp
-tOp
-tOp
-jmG
-sta
-sta
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-cKa
-cKa
+bKt
+bKt
+bKt
+idu
+idu
+lSo
+lSo
+lSo
+lSo
+lSo
+idu
+bKt
+bKt
+idu
+idu
+idu
+idu
+idu
+idu
+idu
+idu
+idu
+fsj
+fsj
rMT
aeI
aeI
@@ -63907,17 +63902,17 @@ kgN
kqC
ryJ
end
-rjw
-oTL
-oLE
-oLE
-oLE
-oLE
-siW
-bEm
-oLE
-ksE
-ipy
+qjT
+lMf
+fOl
+fOl
+fOl
+fOl
+cRO
+ted
+fOl
+iUL
+xoJ
kPz
bQM
kPz
@@ -64022,7 +64017,7 @@ mvp
mvp
bgD
wsM
-pak
+cIj
pjW
dqX
rHX
@@ -64040,47 +64035,47 @@ beW
fEn
maA
mvp
-dOf
-jmG
-mvl
-mvl
-mvl
-jmG
-utm
+wLe
+idu
+aTt
+aTt
+aTt
+idu
+ylL
byY
byY
byY
byY
-tOp
-ezd
-jjp
-hVA
-lFB
-tOp
-jWI
-amZ
-bsO
-cKa
-cKa
-vUP
-dVA
-vUP
-dVA
-vUP
-hqD
-jWI
-eow
-lFB
-aLX
-cKa
-bqu
-rwm
-cKa
-fZc
-dVA
-rhf
-nss
-jYs
+lSo
+sBH
+lUc
+jBC
+wGa
+lSo
+xMg
+pYA
+aPa
+fsj
+fsj
+nmZ
+xDY
+nmZ
+xDY
+nmZ
+cvT
+xMg
+wJs
+wGa
+gRs
+fsj
+rkg
+nPn
+fsj
+fhJ
+xDY
+pJG
+sDw
+tVb
cMD
aeI
aeI
@@ -64119,17 +64114,17 @@ ioc
kqC
rzp
ldz
-rjw
-hDF
-fBA
-fBA
-fBA
-fBA
-fBA
-fBA
-fBA
-rnE
-ipy
+qjT
+mSF
+bqp
+bqp
+bqp
+bqp
+bqp
+bqp
+bqp
+pMZ
+xoJ
kPz
kPz
kPz
@@ -64234,7 +64229,7 @@ mvp
mvp
twR
oNu
-pak
+cIj
rHX
nDI
rHX
@@ -64252,47 +64247,47 @@ dqX
fEn
mvp
mvp
-dOf
-lIG
-spR
-kzR
-qBI
-mvl
-guH
+wLe
+mjt
+jQt
+yaB
+aKK
+aTt
+eVT
byY
-eni
-rRd
-rRd
-jmG
-wUz
-jWI
-lFB
-lFB
-tOp
-uqV
-tVI
-hBc
-cKa
-bRc
-dVA
-fZc
-dVA
-akM
-dVA
-hqD
-uKK
-mgz
-rLG
-aLX
-hqD
-kXk
-gnY
-cKa
-ejM
-dVA
-rhf
-sWX
-jYs
+son
+xOZ
+xOZ
+idu
+kFn
+xMg
+wGa
+wGa
+lSo
+wiO
+rtC
+xQp
+fsj
+mof
+xDY
+fhJ
+xDY
+dvF
+xDY
+cvT
+bwF
+gfP
+vfA
+gRs
+cvT
+hRo
+mNX
+fsj
+ykU
+xDY
+pJG
+nnD
+tVb
cMD
jpW
aeI
@@ -64331,20 +64326,20 @@ ioc
kqC
qLi
dpe
-rjw
-okG
-iBI
-okG
-rjw
-rjw
-dbI
-dbI
-dbI
-rjw
-hjg
-ipy
-ipy
-ipy
+qjT
+lTg
+sag
+lTg
+qjT
+qjT
+dxe
+dxe
+dxe
+qjT
+suR
+xoJ
+xoJ
+xoJ
nqN
xGt
xGt
@@ -64446,7 +64441,7 @@ xLi
dqX
xLi
xLi
-joB
+vxp
rHX
dqX
rHX
@@ -64464,47 +64459,47 @@ dqX
dqX
mvp
mvp
-kMf
-cKa
-lUZ
-xlp
-poC
-mvl
-sSv
+cdj
+fsj
+nJF
+uin
+kXX
+aTt
+ree
chx
-nwA
-wdv
+kRp
+nRW
hXN
-jmG
-xVw
-bwk
-rLG
-dlj
-tOp
-kXk
-amn
-pxX
-cKa
-bRc
-dVA
-cYi
-dVA
-wqs
-dVA
-cKa
-awU
-jqN
-rLG
-aLX
-cKa
-kzh
-tOp
-cKa
-sGX
-dVA
-rhf
-avc
-cKa
+idu
+poR
+xjF
+vfA
+ppr
+lSo
+hRo
+csF
+wdQ
+fsj
+mof
+xDY
+gNu
+xDY
+sji
+xDY
+fsj
+ebh
+hwJ
+vfA
+gRs
+fsj
+nDu
+lSo
+fsj
+thB
+xDY
+pJG
+gOC
+fsj
xbc
suX
nQu
@@ -64543,24 +64538,24 @@ ioc
kqC
kqC
kqC
-mCF
-uJp
-kIb
-vFV
-rjw
-lsR
-lZp
-lZp
-lZp
-svN
-rjw
-kXT
-wat
-iHi
-abJ
-iBI
-iBI
-abJ
+imx
+wKa
+vrs
+ngX
+qjT
+ltC
+aPw
+aPw
+aPw
+wHN
+qjT
+dRU
+byh
+rzY
+yiG
+sag
+sag
+yiG
goo
goo
goo
@@ -64658,7 +64653,7 @@ phz
kEZ
phz
xLi
-cHi
+dHG
rHX
dqX
rHX
@@ -64677,46 +64672,46 @@ mvp
mvp
hDm
mvp
-rSr
-cOF
-cOF
-cOF
-mvl
+wha
+cIu
+cIu
+cIu
+aTt
byY
byY
byY
byY
nFc
-jmG
-kjt
-kjt
-rLG
-djF
-jmG
-sta
-sta
-sta
-jmG
-cKa
-vUP
-dVA
-vUP
-dVA
-vUP
-cKa
-tYz
-hjB
-rLG
-vUP
-lEd
-eow
-ulc
-eow
-eow
-lFB
-vUP
-vUP
-jmG
+idu
+mhe
+mhe
+vfA
+bnT
+idu
+bKt
+bKt
+bKt
+idu
+fsj
+nmZ
+xDY
+nmZ
+xDY
+nmZ
+fsj
+cTc
+vQn
+vfA
+nmZ
+kwQ
+wJs
+hqI
+wJs
+wJs
+wGa
+nmZ
+nmZ
+idu
egk
iYw
suX
@@ -64755,24 +64750,24 @@ ioc
kqC
sfu
jyF
-rjw
-btJ
-xLx
-blt
-rjw
-ubh
-xFJ
-eao
-lZp
-qXj
-rjw
-oTL
-xAn
-oMW
-vRA
-iBI
-iBI
-vRA
+qjT
+wUL
+sFG
+jso
+qjT
+mwh
+mpj
+nbD
+aPw
+nhi
+qjT
+lMf
+wat
+mXC
+bIV
+sag
+sag
+bIV
fAf
fAf
nZB
@@ -64889,46 +64884,46 @@ mvp
mvp
mvp
mvp
-jmG
-mvl
-mvl
-mvl
-jmG
+idu
+aTt
+aTt
+aTt
+idu
wfu
byY
byY
byY
hVI
-jmG
-kjt
-kjt
-rLG
-gYD
-fSq
-jWI
-eow
-lFB
-fSq
-vUP
-jWI
-eow
-eow
-eow
-lFB
-oNC
-wyb
-tIN
-rLG
-vUP
-lcE
-amn
-amn
-amn
-amn
-tPB
-vUP
-vUP
-jmG
+idu
+mhe
+mhe
+vfA
+hWt
+wpq
+xMg
+wJs
+wGa
+wpq
+nmZ
+xMg
+wJs
+wJs
+wJs
+wGa
+uOb
+wxP
+aEI
+vfA
+nmZ
+qqr
+csF
+csF
+csF
+csF
+caf
+nmZ
+nmZ
+idu
bQM
iYw
sKY
@@ -64967,24 +64962,24 @@ ioc
kqC
qNF
eub
-rjw
-btJ
-xAn
-oMW
-rjw
-sIk
-dzE
-rjw
-sIk
-dzE
-rjw
-btJ
-xAn
-oMW
-rjw
-iBI
-iBI
-rjw
+qjT
+wUL
+wat
+mXC
+qjT
+jpB
+nDg
+qjT
+jpB
+nDg
+qjT
+wUL
+wat
+mXC
+qjT
+sag
+sag
+qjT
nAm
nAm
fAf
@@ -65093,66 +65088,66 @@ mvp
xxU
kpq
jNi
-lLN
-lLN
-qhh
+nsg
+nsg
+ghr
dqX
loE
eIx
mvp
mvp
-rjD
-vUP
-vUP
-vUP
-rjD
+tKm
+nmZ
+nmZ
+nmZ
+tKm
byY
byY
byY
byY
byY
-rjD
-kjt
-kjt
-rLG
-rLG
-fSq
-kjt
-oZU
-rLG
-fSq
-vUP
-hFW
-mgz
-mgz
-mgz
-rLG
-jHV
-kjt
-lpZ
-rLG
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-jWI
-lFB
-jmG
+tKm
+mhe
+mhe
+vfA
+vfA
+wpq
+mhe
+aDR
+vfA
+wpq
+nmZ
+wRx
+gfP
+gfP
+gfP
+vfA
+lPz
+mhe
+rEe
+vfA
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+xMg
+wGa
+idu
kPz
-sYX
+gMa
pcu
iYw
sKY
sKY
iYw
-nGf
+uYr
oEH
oEH
oEH
-rPs
+vix
bLJ
rcg
xZN
@@ -65179,37 +65174,37 @@ kgN
kqC
ryJ
end
-rjw
-rgc
-xAn
-oMW
-vfO
-lZp
-lZp
-jmv
-uLV
-lZp
-vfO
-btJ
-xAn
-oMW
-abJ
-iBI
-iBI
-abJ
+qjT
+xfG
+wat
+mXC
+mvh
+aPw
+aPw
+vVg
+lRe
+aPw
+mvh
+wUL
+wat
+mXC
+yiG
+sag
+sag
+yiG
fAf
fAf
nZB
nZB
nZB
owp
-oEE
-fII
+hpr
+xxL
nZB
ghz
nZB
-oEE
-fII
+hpr
+xxL
nZB
nZB
fAf
@@ -65307,64 +65302,64 @@ kpq
mvp
lIC
kxl
-dKO
+xLe
fEn
gDI
agh
mvp
mvp
-wef
-vUP
-vUP
-vUP
-wef
+oHl
+nmZ
+nmZ
+nmZ
+oHl
byY
byY
byY
byY
byY
-wef
-kXk
-kXk
-tPB
-tPB
-fSq
-kXk
-amn
-tPB
-fSq
-vUP
-kXk
-amn
-amn
-amn
-tPB
-oNC
-kjt
-mgz
-rLG
-cKa
-jWI
-oyy
-cKa
-drZ
-oyy
-cKa
-kjt
-rLG
-uwk
-rfI
-eyB
-pFE
-mjW
-grn
+oHl
+hRo
+hRo
+caf
+caf
+wpq
+hRo
+csF
+caf
+wpq
+nmZ
+hRo
+csF
+csF
+csF
+caf
+uOb
+mhe
+gfP
+vfA
+fsj
+xMg
+pjn
+fsj
+jAx
+pjn
+fsj
+mhe
+vfA
+tyk
+uBH
+eId
+itY
+afA
+urj
kPz
iYw
-iES
+cBU
wfw
jRF
bvp
-tDK
+wWi
bLJ
bLJ
frv
@@ -65391,37 +65386,37 @@ lvV
vds
vds
elO
-iBI
-btJ
-xAn
-oMW
-vfO
-lZp
-lZp
-eao
-lZp
-lZp
-vfO
-btJ
-xAn
-oMW
-vRA
-iBI
-iBI
-vRA
+sag
+wUL
+wat
+mXC
+mvh
+aPw
+aPw
+nbD
+aPw
+aPw
+mvh
+wUL
+wat
+mXC
+bIV
+sag
+sag
+bIV
fAf
fAf
nZB
nZB
nZB
nZB
-hgF
-cNU
+xVn
+cJd
nZB
fAf
nZB
-hgF
-cNU
+xVn
+cJd
nZB
nZB
nZB
@@ -65519,58 +65514,58 @@ kpq
mvp
mMP
wsM
-dKO
+xLe
fEn
fEn
ciM
mvp
mvp
-cKa
-mgz
-mgz
-mgz
-cKa
-tOp
-tOp
-cKa
-tOp
-cKa
-cKa
-kXk
-kXk
-tPB
-tPB
-jmG
-jmG
-jmG
-jmG
-jmG
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-cIJ
-lfX
-rLG
-cKa
-iFB
-dUx
-cKa
-iFB
-trR
-cKa
-kjt
-rLG
-uwk
-ryp
+fsj
+gfP
+gfP
+gfP
+fsj
+lSo
+lSo
+fsj
+lSo
+fsj
+fsj
+hRo
+hRo
+caf
+caf
+idu
+idu
+idu
+idu
+idu
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+cWn
+gRY
+vfA
+fsj
+aCP
+nhm
+fsj
+aCP
+cvg
+fsj
+mhe
+vfA
+tyk
+xwg
afk
afk
afk
-xrw
-rEk
+pzR
+epz
sKY
qTe
red
@@ -65603,24 +65598,24 @@ eNa
xRI
xRI
efW
-iBI
-btJ
-xAn
-oMW
-rjw
-hAP
-dzE
-rjw
-sIk
-dzE
-rjw
-btJ
-xAn
-oMW
-rjw
-iBI
-iBI
-rjw
+sag
+wUL
+wat
+mXC
+qjT
+fPW
+nDg
+qjT
+jpB
+nDg
+qjT
+wUL
+wat
+mXC
+qjT
+sag
+sag
+qjT
goo
goo
fAf
@@ -65731,57 +65726,57 @@ kpq
hjp
dsS
dXN
-dKO
+xLe
fEn
gDI
agh
mvp
mvp
-rjD
-vUP
-vUP
-vUP
-rjD
-jWI
-eow
-eow
-eow
-eow
-owS
-eow
-eow
-eow
-eow
-vqW
-eow
-owS
-eow
-lFB
-cKa
-jWI
-oyy
-cKa
-siB
-jSc
-cKa
-qya
-mgz
-rLG
-hEs
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-kjt
-rLG
-uwk
-whc
+tKm
+nmZ
+nmZ
+nmZ
+tKm
+xMg
+wJs
+wJs
+wJs
+wJs
+myC
+wJs
+wJs
+wJs
+wJs
+tnU
+wJs
+myC
+wJs
+wGa
+fsj
+xMg
+pjn
+fsj
+hHb
+xBL
+fsj
+oEY
+gfP
+vfA
+mYA
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+mhe
+vfA
+tyk
+hAp
afk
hkh
afk
-deC
+bZr
pcu
sKY
aso
@@ -65791,11 +65786,11 @@ aso
aso
rtc
idS
-nGf
-rPs
+uYr
+vix
hys
-nGf
-rPs
+uYr
+vix
sKY
bce
bce
@@ -65805,7 +65800,7 @@ wzE
dHD
voV
sxc
-vMR
+qZp
xbM
xbM
xbM
@@ -65815,24 +65810,24 @@ jlq
kqC
ryJ
end
-rjw
-oTL
-xAn
-blt
-rjw
-ubh
-lZp
-jmv
-lZp
-qXj
-rjw
-oTL
-xAn
-oMW
-abJ
-iBI
-iBI
-abJ
+qjT
+lMf
+wat
+jso
+qjT
+mwh
+aPw
+vVg
+aPw
+nhi
+qjT
+lMf
+wat
+mXC
+yiG
+sag
+sag
+yiG
fAf
fAf
nZB
@@ -65941,60 +65936,60 @@ mvp
cer
kpq
mvp
-cia
-cia
-olB
+nEL
+nEL
+nRa
dqX
pHi
eFX
mvp
mvp
-wef
-vUP
-vUP
-vUP
-wef
-kjt
-mgz
-mgz
-xAq
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-xAq
-rLG
-cKa
-iFB
-dUx
-cKa
-iFB
-dUx
-cKa
-xnt
-mgz
-rLG
-cKa
-bqu
-rwm
-cKa
-bqu
-rwm
-cKa
-kjt
-rLG
-uwk
-gbg
+oHl
+nmZ
+nmZ
+nmZ
+oHl
+mhe
+gfP
+gfP
+bvl
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+bvl
+vfA
+fsj
+aCP
+nhm
+fsj
+aCP
+nhm
+fsj
+dcD
+gfP
+vfA
+fsj
+rkg
+nPn
+fsj
+rkg
+nPn
+fsj
+mhe
+vfA
+tyk
+kjL
afk
afk
afk
-sJX
-sLF
+muU
+pbJ
sKY
cvc
gPk
@@ -66003,11 +65998,11 @@ sFY
neY
rtc
fOi
-qEp
-tdY
+lrB
+rXw
hys
-mke
-tdY
+tNo
+rXw
sKY
cAW
bce
@@ -66027,24 +66022,24 @@ rzp
kqC
rzp
jln
-rjw
-eQb
-xAn
-kgp
-rjw
-erU
-lZp
-lZp
-xFJ
-hrL
-rjw
-btJ
-xAn
-oMW
-vRA
-iBI
-iBI
-vRA
+qjT
+kfn
+wat
+gRR
+qjT
+bgi
+aPw
+aPw
+mpj
+dgJ
+qjT
+wUL
+wat
+mXC
+bIV
+sag
+sag
+bIV
nAm
nAm
nAm
@@ -66161,51 +66156,51 @@ mvp
mvp
mvp
mvp
-cKa
-mvl
-mvl
-mvl
-cKa
-kXk
-amn
-amn
-rTZ
-mgz
-cCe
-amn
-amn
-amn
-amn
-amn
-amn
-rTZ
-mgz
-bOx
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-nGV
-amn
-tPB
-cKa
-jnX
-rhH
-cKa
-kXk
-rhH
-cKa
-kXk
-tPB
-uwk
-rcy
-dfw
-lJb
-ozB
-mtM
+fsj
+aTt
+aTt
+aTt
+fsj
+hRo
+csF
+csF
+hvA
+gfP
+cJh
+csF
+csF
+csF
+csF
+csF
+csF
+hvA
+gfP
+fUb
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+xSu
+csF
+caf
+fsj
+rMQ
+qKM
+fsj
+hRo
+qKM
+fsj
+hRo
+caf
+tyk
+rji
+vrC
+eQy
+foE
+oZv
kPz
iYw
nQu
@@ -66239,20 +66234,20 @@ dHD
kqC
qLi
jhN
-rjw
-rYy
-xAn
-oMW
-rjw
-rjw
-vfO
-vfO
-vfO
-rjw
-rjw
-btJ
-xAn
-oMW
+qjT
+fLj
+wat
+mXC
+qjT
+qjT
+mvh
+mvh
+mvh
+qjT
+qjT
+wUL
+wat
+mXC
vMK
goG
goG
@@ -66373,60 +66368,60 @@ mvp
mvp
mvp
mvp
-mvl
-wSN
-kzR
-wSC
-mvl
-eSI
-vUP
-vUP
-kjt
-mgz
-bOx
-aSz
-uwk
-uwk
-uwk
-uwk
-aSz
-xVw
-mgz
-rLG
-cKa
-bqu
-hJo
-cKa
-bqu
-rwm
-cKa
-jGz
-vUP
-vUP
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-vUP
-vUP
-jmG
-jmG
+aTt
+eXO
+yaB
+klD
+aTt
+nDx
+nmZ
+nmZ
+mhe
+gfP
+fUb
+jlE
+tyk
+tyk
+tyk
+tyk
+jlE
+poR
+gfP
+vfA
+fsj
+rkg
+uPw
+fsj
+rkg
+nPn
+fsj
+ybE
+nmZ
+nmZ
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+nmZ
+nmZ
+idu
+idu
mlC
mlC
mlC
mlC
ecM
iYw
-nGf
+uYr
oEH
oEH
oEH
-rPs
+vix
bLJ
-vgG
+vCp
iaa
iaa
tZO
@@ -66434,37 +66429,37 @@ iaa
iaa
ecM
mlC
-xxg
-xxg
-xxg
-xxg
-rzF
-qJY
-fBK
-fBK
-xel
-fBK
-fBK
-fBK
-wKi
-jbg
-umN
-umN
-umN
-umN
-rKd
-xAn
-pZn
-atY
-atY
-wat
+eHX
+eHX
+eHX
+eHX
+gvb
+bWX
+xTw
+xTw
+hKI
+xTw
+xTw
+xTw
+hri
+vpv
+iZl
+iZl
+iZl
+iZl
+tSv
wat
+sCo
+hkr
+hkr
+byh
+byh
+byh
+qPl
+hkr
+ehq
wat
-qJl
-atY
-jXU
-xAn
-oMW
+mXC
goG
dYq
chg
@@ -66585,47 +66580,47 @@ dqX
rYw
mvp
dqX
-mvl
-fqI
-xlp
-cOF
-cKa
-cKa
-cKa
-cKa
-kjt
-mgz
-qrU
-uwk
-bQM
-bQM
-bQM
-bQM
-uwk
-kXk
-amn
-tPB
-cKa
-kXk
-rhH
-cKa
-kXk
-rhH
-cKa
-wqz
-eow
-eow
-eow
-eow
-eow
-tkZ
-eow
-eow
-eow
-eow
-eow
-rIr
-nmi
+aTt
+iIY
+uin
+cIu
+fsj
+fsj
+fsj
+fsj
+mhe
+gfP
+fIy
+tyk
+bQM
+bQM
+bQM
+bQM
+tyk
+hRo
+csF
+caf
+fsj
+hRo
+qKM
+fsj
+hRo
+qKM
+fsj
+qqH
+wJs
+wJs
+wJs
+wJs
+wJs
+uPC
+wJs
+wJs
+wJs
+wJs
+wJs
+czv
+aDX
scS
scS
oPR
@@ -66646,37 +66641,37 @@ oPR
oPR
jnQ
oPR
-umN
-lmC
-lmC
-lmC
-lmC
-lmC
-fBK
-fBK
-fBK
-fBK
-bkQ
-fBK
-eVD
-wKi
-umN
-rkp
-iKy
-umN
-gqo
-xAn
-jbm
-xAn
-xLx
-xAn
-jbm
-xAn
-xAn
-xAn
-xAn
-xAn
-oMW
+iZl
+ylI
+ylI
+ylI
+ylI
+ylI
+xTw
+xTw
+xTw
+xTw
+kbp
+xTw
+ceX
+hri
+iZl
+gqV
+jAp
+iZl
+xDD
+wat
+wVD
+wat
+sFG
+wat
+wVD
+wat
+wat
+wat
+wat
+wat
+mXC
goG
xoR
ioW
@@ -66797,47 +66792,47 @@ fEn
mvp
mvp
fEn
-cKa
-oOU
-fyi
-cOF
-mvl
-vUP
-vUP
-vUP
-kjt
-mgz
-bOx
-aSz
-uwk
-uwk
-uwk
-uwk
-aSz
-uBX
-vUP
-vUP
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-xVw
-mgz
-mgz
-xAq
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-lFg
-rLG
-fSq
+fsj
+eBI
+xoE
+cIu
+aTt
+nmZ
+nmZ
+nmZ
+mhe
+gfP
+fUb
+jlE
+tyk
+tyk
+tyk
+tyk
+jlE
+qgR
+nmZ
+nmZ
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+poR
+gfP
+gfP
+bvl
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+dRW
+vfA
+wpq
oPR
qBe
exl
@@ -66858,37 +66853,37 @@ qBe
qBe
qBe
eFQ
-wpO
-lmC
-lmC
-lmC
-duL
-fBK
-ygL
-rZF
-fBK
-ogc
-eja
-fBK
-fBK
-eVD
-umN
-eVD
-duL
-umN
-hDF
-fBA
-iXq
-fBA
-fBA
-fBA
-fBA
-fBA
-mKd
-fBA
-fBA
-fBA
-vza
+iTR
+ylI
+ylI
+ylI
+omS
+xTw
+tmz
+dJc
+xTw
+kFN
+duE
+xTw
+xTw
+ceX
+iZl
+ceX
+omS
+iZl
+mSF
+bqp
+pex
+bqp
+bqp
+bqp
+bqp
+bqp
+gUl
+bqp
+bqp
+bqp
+fRT
goG
egd
pYB
@@ -67009,47 +67004,47 @@ fEn
mvp
mvp
fEn
-rSr
-cOF
-cOF
-cOF
-rSr
-jWI
-eow
-eow
-ufR
-mgz
-rLG
-vUP
-jWI
-eow
-eow
-eow
-lFB
-xBN
-jWI
-eow
-eow
-eow
-eow
-eow
-eow
-eow
-eow
-ufR
-mgz
-wef
-mgz
-cbY
-amn
-amn
-amn
-amn
-amn
-amn
-amn
-tPB
-fSq
+wha
+cIu
+cIu
+cIu
+wha
+xMg
+wJs
+wJs
+aiH
+gfP
+vfA
+nmZ
+xMg
+wJs
+wJs
+wJs
+wGa
+uZo
+xMg
+wJs
+wJs
+wJs
+wJs
+wJs
+wJs
+wJs
+wJs
+aiH
+gfP
+oHl
+gfP
+sZh
+csF
+csF
+csF
+csF
+csF
+csF
+csF
+caf
+wpq
wdl
nOe
qBe
@@ -67070,34 +67065,34 @@ qBe
qBe
lFv
eFQ
-wpO
-lmC
-lmC
-lmC
-wKi
-kbh
-fBK
-fBK
-ygL
-jET
-fBK
-rZF
-fYY
-ffx
-umN
-qRi
-elm
-xxg
-hjg
-hjg
-rjw
-iBI
-iBI
-iBI
-iBI
-pvE
-rjw
-jTJ
+iTR
+ylI
+ylI
+ylI
+hri
+hax
+xTw
+xTw
+tmz
+nZk
+xTw
+dJc
+fcJ
+iwl
+iZl
+kNj
+exF
+eHX
+suR
+suR
+qjT
+sag
+sag
+sag
+sag
+fTE
+qjT
+cef
goG
goG
goG
@@ -67221,47 +67216,47 @@ fEn
mvp
mvp
fEn
-cKa
-cKa
-cKa
-cKa
-cKa
-kjt
-mgz
-cCe
-amn
-amn
-tPB
-vUP
-kXk
-amn
-amn
-amn
-tPB
-vUP
-kjt
-mgz
-xAq
-mgz
-mgz
-mgz
-mgz
-mgz
-mgz
-wef
-mgz
-mgz
-mgz
-bOx
-jpN
-uwk
-uwk
-uwk
-lIG
-vUP
-sHj
-vUP
-cKa
+fsj
+fsj
+fsj
+fsj
+fsj
+mhe
+gfP
+cJh
+csF
+csF
+caf
+nmZ
+hRo
+csF
+csF
+csF
+caf
+nmZ
+mhe
+gfP
+bvl
+gfP
+gfP
+gfP
+gfP
+gfP
+gfP
+oHl
+gfP
+gfP
+gfP
+fUb
+gbm
+tyk
+tyk
+tyk
+mjt
+nmZ
+ksg
+nmZ
+fsj
oPR
qBe
qBe
@@ -67282,34 +67277,34 @@ qBe
qBe
qBe
oPR
-wpO
-lmC
-lmC
-lmC
-eVD
-wWm
-fBK
-fBK
-fBK
-fBK
-jET
-fBK
-fBK
-xiZ
-nUh
-nUh
-bhC
-uTv
-bQM
-ipy
-iCf
-kXT
-wat
-wat
-wat
-rLJ
-jvi
-duF
+iTR
+ylI
+ylI
+ylI
+ceX
+pik
+xTw
+xTw
+xTw
+xTw
+nZk
+xTw
+xTw
+hzf
+rtL
+rtL
+lbU
+lcb
+bQM
+xoJ
+ljM
+dRU
+byh
+byh
+byh
+tHC
+ocA
+rfW
jTN
xro
fGW
@@ -67426,54 +67421,54 @@ bQM
lAh
cAW
cAW
-jmG
-jmG
-jmG
-wef
-lSj
-wef
-lSj
-cKa
-cKa
-pRa
-lFB
-lpX
-mgz
-mgz
-bOx
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-arn
-xVw
-mgz
-cCe
-amn
-amn
-amn
-amn
-amn
-amn
-rTZ
-mgz
-mgz
-mgz
-rLG
-uwk
+idu
+idu
+idu
+oHl
+cil
+oHl
+cil
+fsj
+fsj
+wEc
+wGa
+caK
+gfP
+gfP
+fUb
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+vvo
+poR
+gfP
+cJh
+csF
+csF
+csF
+csF
+csF
+csF
+hvA
+gfP
+gfP
+gfP
+vfA
+tyk
bQM
kPz
bQM
-jmG
-hul
-cKa
-cKa
-cKa
+idu
+phM
+fsj
+fsj
+fsj
hrz
qBe
qBe
@@ -67490,38 +67485,38 @@ qBe
qBe
oPR
oPR
-uRh
-mlG
-pUD
-dIu
-umN
-umN
-nIU
-umN
-umN
-wKi
-fBK
-fBK
-pHx
-fBK
-lNC
-gos
-gos
-gos
-gos
-gos
-duL
-uTv
+pYv
+hoc
+xwI
+unv
+iZl
+iZl
+lYv
+iZl
+iZl
+hri
+xTw
+xTw
+nyG
+xTw
+fTc
+dHf
+dHf
+dHf
+dHf
+dHf
+omS
+lcb
kPz
-ipy
-auS
-btJ
-jbm
-xAn
-xAn
-oMW
-jvi
-duF
+xoJ
+gTe
+wUL
+wVD
+wat
+wat
+mXC
+ocA
+rfW
fEH
xsS
tOM
@@ -67638,54 +67633,54 @@ cAW
cAW
cAW
cAW
-jmG
-bQM
-jmG
-vUP
-jWI
-eow
-lFB
-mgz
-cKa
-dJh
-rLG
-uwk
-kjt
-mgz
-rLG
-cKa
-jWI
-oyy
-cKa
-bTr
-oyy
-cKa
-kyU
-oyy
-cKa
-kjt
-mgz
-bOx
-cKa
-cKa
-wZt
-jEY
-cKa
-jmG
-gHh
-mgz
-mgz
-mgz
-rLG
-uwk
+idu
+bQM
+idu
+nmZ
+xMg
+wJs
+wGa
+gfP
+fsj
+smn
+vfA
+tyk
+mhe
+gfP
+vfA
+fsj
+xMg
+pjn
+fsj
+yjy
+pjn
+fsj
+lqp
+pjn
+fsj
+mhe
+gfP
+fUb
+fsj
+fsj
+bcG
+kuK
+fsj
+idu
+eDq
+gfP
+gfP
+gfP
+vfA
+tyk
kPz
kPz
kPz
-uwk
-cOF
-cOF
-utw
-lzm
+tyk
+cIu
+cIu
+jcr
+fpX
qBe
qBe
qBe
@@ -67701,39 +67696,39 @@ qBe
eXz
qBe
oPR
-umN
-umN
-cee
-yiG
-umN
-umN
-rCq
-xSw
-xSw
-umN
-fLb
-ayW
-fBK
-fBK
-fBK
-rYK
-umN
-cRB
-elm
-umN
-cRB
-elm
-xxg
-bQM
-ipy
-qSz
-btJ
-mlE
-rwK
-nAK
-oMW
-kpu
-duF
+iZl
+iZl
+imh
+jhW
+iZl
+iZl
+nEE
+taF
+taF
+iZl
+mFt
+eBV
+xTw
+xTw
+xTw
+rEN
+iZl
+tQi
+exF
+iZl
+tQi
+exF
+eHX
+bQM
+xoJ
+aeV
+wUL
+aXG
+tuT
+naU
+mXC
+hSt
+rfW
fAU
tOM
tOM
@@ -67850,54 +67845,54 @@ cAW
cAW
cAW
cAW
-jmG
-jmG
-jmG
-vUP
-kjt
-mgz
-rLG
-vUP
-cKa
-iFB
-dUx
-uwk
-kjt
-mgz
-rLG
-cKa
-iFB
-dUx
-cKa
-iFB
-dUx
-cKa
-oMw
-yhJ
-cKa
-uFW
-mgz
-rLG
-cKa
-uyC
-dzB
-wUv
-aYg
-cKa
-kjt
-mgz
-mgz
-kWx
-rLG
-uwk
+idu
+idu
+idu
+nmZ
+mhe
+gfP
+vfA
+nmZ
+fsj
+aCP
+nhm
+tyk
+mhe
+gfP
+vfA
+fsj
+aCP
+nhm
+fsj
+aCP
+nhm
+fsj
+rUV
+ibZ
+fsj
+xax
+gfP
+vfA
+fsj
+wCY
+rTs
+dOQ
+sbb
+fsj
+mhe
+gfP
+gfP
+aLG
+vfA
+tyk
bQM
kPz
bQM
-uwk
-cOF
-fyi
-dXS
-qva
+tyk
+cIu
+xoE
+vLB
+jiP
xbm
smj
qBe
@@ -67912,40 +67907,40 @@ ccZ
qBe
qBe
qBe
-pUD
-umN
-umN
-xSw
-blG
-umN
-umN
-umN
-tVV
-arl
-eQs
-kCT
-opj
-gos
-wWm
-fBK
-qJY
-umN
-xBF
-bIP
-umN
-xBF
-mwP
-xxg
+xwI
+iZl
+iZl
+taF
+nbY
+iZl
+iZl
+iZl
+oEC
+jaR
+vpD
+xPo
+xHg
+dHf
+pik
+xTw
+bWX
+iZl
+prc
+dHO
+iZl
+prc
+cgf
+eHX
kPz
-jTJ
-vUl
-btJ
-oMW
-pLE
-btJ
-oMW
-uuG
-jTJ
+cef
+sSS
+wUL
+mXC
+fko
+wUL
+mXC
+gST
+cef
gHn
tOM
tOM
@@ -67987,12 +67982,12 @@ ckm
wly
bQM
bQM
-gjm
+gbs
pcu
-hfJ
-gjm
+lLi
+gbs
pcu
-hfJ
+lLi
bQM
bQM
bQM
@@ -68064,52 +68059,52 @@ cAW
cAW
cAW
bQM
-uwk
-vUP
-kXk
-amn
-tPB
-vUP
-hEs
-cKa
-cKa
-cKa
-wdL
-vAU
-hCR
-hEs
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-xVw
-mgz
-rLG
-cKa
-onW
-pZp
-xts
-shh
-cKa
-kjt
-mgz
-wef
-mgz
-rLG
-jmG
+tyk
+nmZ
+hRo
+csF
+caf
+nmZ
+mYA
+fsj
+fsj
+fsj
+gPD
+pIy
+uon
+mYA
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+poR
+gfP
+vfA
+fsj
+trO
+xwh
+uLT
+pMD
+fsj
+mhe
+gfP
+oHl
+gfP
+vfA
+idu
bQM
kPz
bQM
-uwk
-jsu
-fyi
-haQ
-cKa
+tyk
+wsq
+xoE
+rDp
+fsj
ntE
smj
wrT
@@ -68124,40 +68119,40 @@ sQr
qBe
qBe
qBe
-spI
-ueD
-umu
-xBF
-nUh
-bhC
-sKt
-umN
-xSw
-tiX
-umN
-umN
-umN
-umN
-wKi
-fBK
-qJY
-umN
-xpy
-oeh
-umN
-xpy
-oeh
-xxg
-bQM
-ipy
-pLE
-btJ
-oMW
-pLE
-btJ
-oMW
-pLE
-duF
+uZS
+fuY
+wWT
+prc
+rtL
+lbU
+pPg
+iZl
+taF
+pNl
+iZl
+iZl
+iZl
+iZl
+hri
+xTw
+bWX
+iZl
+rrf
+vLY
+iZl
+rrf
+vLY
+eHX
+bQM
+xoJ
+fko
+wUL
+mXC
+fko
+wUL
+mXC
+fko
+rfW
mWR
tOM
tOM
@@ -68196,18 +68191,18 @@ bQM
kPz
bQM
bQM
-iIw
-ylU
-ylU
-eyB
-pFE
-toG
-eyB
-pFE
-toG
-ylU
-ylU
-lud
+sAe
+cfc
+cfc
+eId
+itY
+dof
+eId
+itY
+dof
+cfc
+cfc
+gTB
bQM
bQM
bQM
@@ -68276,52 +68271,52 @@ cAW
cAW
cAW
bQM
-uwk
-jWI
-eow
-lFB
-vUP
-vUP
-wef
-bqu
-rwm
-eDA
-vsM
-mgz
-xBc
-cKa
-bqu
-rwm
-cKa
-bqu
-rwm
-cKa
-bqu
-rwm
-cKa
-kjt
-mgz
-rLG
-cKa
-tjR
-cKa
-onW
-dzB
-wZt
-kjt
-mgz
-mgz
-wef
-rLG
-uwk
+tyk
+xMg
+wJs
+wGa
+nmZ
+nmZ
+oHl
+rkg
+nPn
+qmU
+knQ
+gfP
+qec
+fsj
+rkg
+nPn
+fsj
+rkg
+nPn
+fsj
+rkg
+nPn
+fsj
+mhe
+gfP
+vfA
+fsj
+iPA
+fsj
+trO
+rTs
+bcG
+mhe
+gfP
+gfP
+oHl
+vfA
+tyk
bQM
kPz
bQM
-jmG
-bZI
-fyi
-vqs
-mvl
+idu
+dGD
+xoE
+rOn
+aTt
ntE
smj
qof
@@ -68329,47 +68324,47 @@ qBe
qof
qBe
qof
-pUD
-dIu
-nvZ
+xwI
+unv
+aev
bno
bno
bno
bno
-uFr
-iRA
-xSw
-wKi
-bAM
-qJY
-sKt
-eQs
-xSw
-glD
-umN
-pVY
-mwP
-umN
-wKi
-fBK
-rYK
-hhX
-umN
-umN
-umN
-umN
-umN
-xxg
+xEl
+cUw
+taF
+hri
+flo
+bWX
+pPg
+vpD
+taF
+deY
+iZl
+tEU
+cgf
+iZl
+hri
+xTw
+rEN
+jGv
+iZl
+iZl
+iZl
+iZl
+iZl
+eHX
kPz
-ipy
-pLE
-btJ
-oMW
-pLE
-btJ
-naI
-pLE
-duF
+xoJ
+fko
+wUL
+mXC
+fko
+wUL
+oCf
+fko
+rfW
dLN
dPm
tOM
@@ -68408,7 +68403,7 @@ bQM
kPz
bQM
bQM
-gjm
+gbs
afk
afk
afk
@@ -68419,7 +68414,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -68487,53 +68482,53 @@ bce
bce
bce
bce
-uwk
-uwk
-kjt
-mgz
-rLG
-gBw
-vUP
-eDA
-kXk
-tPB
-wef
-kjt
-mgz
-xRY
-cKa
-kXk
-tPB
-cKa
-kXk
-tPB
-cKa
-kXk
-ctI
-cKa
-kjt
-gzu
-kGo
-cKa
-onW
-vBa
-cMP
-dzB
-wZt
-kjt
-mgz
-jMf
-wef
-rLG
-uwk
+tyk
+tyk
+mhe
+gfP
+vfA
+uFO
+nmZ
+qmU
+hRo
+caf
+oHl
+mhe
+gfP
+dan
+fsj
+hRo
+caf
+fsj
+hRo
+caf
+fsj
+hRo
+xIL
+fsj
+mhe
+qOT
+aVe
+fsj
+trO
+gTG
+pDJ
+rTs
+bcG
+mhe
+gfP
+cUT
+oHl
+vfA
+tyk
kPz
kPz
kPz
-jmG
-wxW
-jEK
-cOF
-jce
+idu
+cWB
+ppf
+cIu
+rwg
ntE
smj
qBe
@@ -68541,7 +68536,7 @@ qBe
qBe
qBe
qBe
-mRR
+koX
ecM
jVj
gqU
@@ -68549,39 +68544,39 @@ eac
dPe
mcJ
uIL
-umN
-umN
-hjI
-fBK
-qJY
-sKt
-umN
-umN
-umN
-umN
-hCX
-elm
-umN
-hjI
-fBK
-qJY
-umN
-nDu
-tjh
-umN
-hHX
-tjh
-xxg
-bQM
-ipy
-pLE
-hDF
-vza
-pLE
-hDF
-vza
-pLE
-duF
+iZl
+iZl
+mOr
+xTw
+bWX
+pPg
+iZl
+iZl
+iZl
+iZl
+qSW
+exF
+iZl
+mOr
+xTw
+bWX
+iZl
+aFX
+mgC
+iZl
+bDl
+mgC
+eHX
+bQM
+xoJ
+fko
+mSF
+fRT
+fko
+mSF
+fRT
+fko
+rfW
chg
tOM
tOM
@@ -68620,7 +68615,7 @@ bQM
kPz
bQM
bQM
-gjm
+gbs
afk
afk
afk
@@ -68631,7 +68626,7 @@ pcu
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -68694,58 +68689,58 @@ bQM
cAW
bQM
bce
-rfI
-rQt
-yjV
-rQt
-grn
-uwk
-wcC
-kXk
-amn
-tPB
-vUP
-dFI
-cKa
-eDA
-wef
-wef
-wlv
-xWG
-ngF
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-kzh
-tOp
-cKa
-xVw
-mgz
-rLG
-cKa
-onW
-shh
-cKa
-onW
-wZt
-kjt
-mgz
-bJn
-aTM
-rLG
-uwk
+uBH
+xkO
+gHc
+xkO
+urj
+tyk
+dKh
+hRo
+csF
+caf
+nmZ
+pBB
+fsj
+qmU
+oHl
+oHl
+mqS
+jnV
+exT
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+nDu
+lSo
+fsj
+poR
+gfP
+vfA
+fsj
+trO
+pMD
+fsj
+trO
+bcG
+mhe
+gfP
+gDY
+wHS
+vfA
+tyk
bQM
kPz
bQM
-jmG
-txf
-oZj
-sfZ
-uhm
+idu
+nmx
+kaq
+wZL
+aWu
wdl
iUS
qof
@@ -68753,7 +68748,7 @@ qBe
qof
qBe
qof
-oCf
+tkc
ecM
vNd
fWH
@@ -68761,39 +68756,39 @@ fWH
fWH
fWH
fWH
-umN
-mue
-bbI
-fBK
-rYK
-umN
-umN
-wyQ
-eTa
-nUh
-nUh
-nUh
-bhC
-wKi
-fBK
-qJY
-umN
-eVD
-qFW
-umN
-eVD
-qFW
-xxg
-hjg
-hjg
-rjw
-ecd
-ecd
-rjw
-ecd
-ecd
-rjw
-jTJ
+iZl
+ioK
+lqg
+xTw
+rEN
+iZl
+iZl
+pHA
+vCR
+rtL
+rtL
+rtL
+lbU
+hri
+xTw
+bWX
+iZl
+ceX
+gJy
+iZl
+ceX
+gJy
+eHX
+suR
+suR
+qjT
+mFi
+mFi
+qjT
+mFi
+mFi
+qjT
+cef
vMK
mGZ
tOM
@@ -68832,7 +68827,7 @@ bQM
kPz
bQM
bQM
-gjm
+gbs
afk
afk
afk
@@ -68843,7 +68838,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -68906,66 +68901,66 @@ bQM
cAW
bQM
bce
-gjm
+gbs
afk
afk
afk
-xrw
-uwk
-aoZ
-vUP
-jWI
-eow
-lFB
-vUP
-pDo
-jWI
-bXz
-tiP
-ufR
-sNi
-jna
-eow
-eow
-lFB
-vUP
-pRa
-tiP
-eow
-eow
-lFB
-vUP
-kjt
-jYM
-rLG
-cKa
-onW
-dzB
-vBa
-shh
-cKa
-kjt
-mgz
-wef
-mgz
-bOx
-jmG
-uwk
-uwk
-uwk
-jmG
-mvl
-mvl
-uhm
-cKa
-iGe
-mlG
+pzR
+tyk
+kPl
+nmZ
+xMg
+wJs
+wGa
+nmZ
+jPX
+xMg
+xXw
+rsO
+aiH
+dgF
+dKY
+wJs
+wJs
+wGa
+nmZ
+wEc
+rsO
+wJs
+wJs
+wGa
+nmZ
+mhe
+ikc
+vfA
+fsj
+trO
+rTs
+gTG
+pMD
+fsj
+mhe
+gfP
+oHl
+gfP
+fUb
+idu
+tyk
+tyk
+tyk
+idu
+aTt
+aTt
+aWu
+fsj
+qhQ
+hoc
qBe
qBe
qBe
qBe
oPR
-mRR
+koX
ecM
bEX
bEX
@@ -68973,39 +68968,39 @@ izZ
oPR
oPR
oPR
-umN
-pCQ
-wKi
-fBK
-qJY
-umu
-lmC
-xBF
-nUh
-nUh
-nUh
-bhC
-duL
-wKi
-fBK
-rYK
-umN
-hCX
-elm
-umN
-hCX
-elm
-umN
-hjg
-aWR
-hnq
-xAn
-iCN
-qOq
-xAn
-xAn
-aWR
-tVp
+iZl
+pnC
+hri
+xTw
+bWX
+wWT
+ylI
+prc
+rtL
+rtL
+rtL
+lbU
+omS
+hri
+xTw
+rEN
+iZl
+qSW
+exF
+iZl
+qSW
+exF
+iZl
+suR
+aiB
+nng
+wat
+lkR
+glZ
+wat
+wat
+aiB
+uAB
goG
tOM
tOM
@@ -69044,18 +69039,18 @@ bzO
bzO
bzO
bQM
-rcy
-rhR
-rhR
-dfw
-lJb
-ngo
-dfw
-lJb
-ngo
-rhR
-rhR
-mtM
+rji
+qUn
+qUn
+vrC
+eQy
+ciH
+vrC
+eQy
+ciH
+qUn
+qUn
+oZv
bQM
bQM
bQM
@@ -69118,50 +69113,50 @@ bQM
cAW
bQM
bce
-jGK
+imr
afk
hkh
afk
-deC
-uwk
-rce
-vUP
-kjt
-mgz
-rLG
-mgz
-mgz
-kXk
-qGB
-amn
-amn
-amn
-amn
-amn
-amn
-tPB
-baM
-kXk
-xYJ
-qGB
-amn
-tPB
-vUP
-kjt
-mgz
-rLG
-cKa
-okJ
-cMP
-dzB
-lsZ
-hEs
-kjt
-mgz
-mgz
-wef
-rLG
-jYs
+bZr
+tyk
+eUd
+nmZ
+mhe
+gfP
+vfA
+gfP
+gfP
+hRo
+lzx
+csF
+csF
+csF
+csF
+csF
+csF
+caf
+wuY
+hRo
+tKI
+lzx
+csF
+caf
+nmZ
+mhe
+gfP
+vfA
+fsj
+gsv
+pDJ
+rTs
+hmX
+mYA
+mhe
+gfP
+gfP
+oHl
+vfA
+tVb
uJi
fWH
hdR
@@ -69171,13 +69166,13 @@ fWH
mBG
sue
wBB
-cee
+imh
ode
ode
ode
ode
ode
-xRa
+qWe
qBe
qBe
qBe
@@ -69185,39 +69180,39 @@ wKm
qBe
qBe
oPR
-umN
-cRI
-wKi
-fBK
-qJY
-xSw
-lmC
-eVD
-gos
-gos
-gos
-duL
-bhC
-cHC
-fBK
-qJY
-lmC
-xBF
-nUh
-nUh
-nUh
-bhC
-lmC
-duF
-kHx
-rqd
-mOI
-xAn
-qOq
-xAn
-xAn
-xwc
-csW
+iZl
+rcs
+hri
+xTw
+bWX
+taF
+ylI
+ceX
+dHf
+dHf
+dHf
+omS
+lbU
+gTs
+xTw
+bWX
+ylI
+prc
+rtL
+rtL
+rtL
+lbU
+ylI
+rfW
+tUF
+oeD
+fnH
+wat
+glZ
+wat
+wat
+imC
+qwf
goG
tOM
tOM
@@ -69243,13 +69238,13 @@ gbf
vEK
mxQ
mxQ
-enU
-rDf
-rDf
-rDf
-rDf
-rDf
-rDf
+hbx
+gpx
+gpx
+gpx
+gpx
+gpx
+gpx
bzO
bzO
bzO
@@ -69259,12 +69254,12 @@ bQM
bQM
bQM
bQM
-rcy
-rhR
-mtM
-rcy
-rhR
-mtM
+rji
+qUn
+oZv
+rji
+qUn
+oZv
bQM
bQM
bQM
@@ -69330,50 +69325,50 @@ bQM
cAW
bQM
bce
-gjm
+gbs
afk
afk
afk
-sJX
-uwk
-rce
-vUP
-kXk
-amn
-tPB
-qqC
-eov
+muU
+tyk
+eUd
+nmZ
+hRo
+csF
+caf
+uvg
+cLH
efl
fDQ
-eov
-tzy
-wef
-wef
-xgH
-vUP
-eSI
-wef
-wef
-tOp
-cKa
-kzh
-tOp
-cKa
-xVw
-mgz
-bOx
-aSz
-aSz
-aSz
-hul
-aSz
-aSz
-nGV
-amn
-amn
-amn
-tPB
-jYs
+cLH
+gUT
+oHl
+oHl
+kjQ
+nmZ
+nDx
+oHl
+oHl
+lSo
+fsj
+nDu
+lSo
+fsj
+poR
+gfP
+fUb
+jlE
+jlE
+jlE
+phM
+jlE
+jlE
+xSu
+csF
+csF
+csF
+caf
+tVb
fWH
mEU
aZL
@@ -69397,39 +69392,39 @@ qBe
qBe
qBe
oPR
-umN
-mue
-gIa
-fBK
-rYK
-umN
-umN
-lmC
-eVD
-gos
-gos
-gos
-duL
-wKi
-fBK
-qJY
-lmC
-eVD
-gos
-gos
-gos
-duL
-sDR
-hBF
-vcv
-iLl
-xAn
-xAn
-qOq
-huG
-xAn
-aWR
-fhS
+iZl
+ioK
+fnM
+xTw
+rEN
+iZl
+iZl
+ylI
+ceX
+dHf
+dHf
+dHf
+omS
+hri
+xTw
+bWX
+ylI
+ceX
+dHf
+dHf
+dHf
+omS
+xgY
+hZY
+beC
+myS
+wat
+wat
+glZ
+ajC
+wat
+aiB
+bHs
goG
tOM
tOM
@@ -69454,8 +69449,8 @@ apu
gbf
vEK
fFw
-enU
-naj
+hbx
+dwg
pYB
eBS
pYB
@@ -69542,50 +69537,50 @@ bQM
cAW
bQM
bce
-rcy
-rhR
-sGS
-rhR
-mtM
-uwk
-iTr
-jWI
-eow
-lFB
-vUP
-mgz
-eov
+rji
+qUn
+mxi
+qUn
+oZv
+tyk
+dQB
+xMg
+wJs
+wGa
+nmZ
+gfP
+cLH
ihV
uvS
-eov
-gXI
-qxx
-jAW
-vUP
-tWs
-vUP
-wef
-jWI
-lFB
-cKa
-jWI
-oyy
-cKa
-kjt
-mgz
-apg
-qBw
-cIa
-sXe
-wHV
-sXe
-aSz
-jmG
-jmG
-uwk
-uwk
-jmG
-jmG
+cLH
+esh
+xNA
+vCr
+nmZ
+bCV
+nmZ
+oHl
+xMg
+wGa
+fsj
+xMg
+pjn
+fsj
+mhe
+gfP
+ngq
+qwo
+gMH
+gVK
+hgy
+gVK
+jlE
+idu
+idu
+tyk
+tyk
+idu
+idu
mEU
bbn
oPR
@@ -69608,40 +69603,40 @@ qBe
qBe
qBe
qBe
-lmJ
-umN
-umN
-hjI
-fBK
-qJY
-sKt
-umN
-hCX
-elm
-umN
-hCX
-elm
-umN
-wKi
-fBK
-rYK
-umN
-hCX
-elm
-umN
-hCX
-elm
-umN
-hjg
-rjw
-rjw
-ecd
-ecd
-rjw
-ecd
-ecd
-rjw
-jTJ
+xDz
+iZl
+iZl
+mOr
+xTw
+bWX
+pPg
+iZl
+qSW
+exF
+iZl
+qSW
+exF
+iZl
+hri
+xTw
+rEN
+iZl
+qSW
+exF
+iZl
+qSW
+exF
+iZl
+suR
+qjT
+qjT
+mFi
+mFi
+qjT
+mFi
+mFi
+qjT
+cef
vMK
pFW
tOM
@@ -69666,15 +69661,15 @@ epB
gbf
gbf
fWy
-gMl
-dOc
-vft
-vft
-vft
-vft
-vft
+xJv
+jiW
+nRj
+nRj
+nRj
+nRj
+nRj
qRW
-mbU
+hBM
bzO
tan
tan
@@ -69759,45 +69754,45 @@ bce
bce
bce
bce
-uwk
-uwk
-kjt
-mgz
-rLG
-vUP
-cEg
-eov
+tyk
+tyk
+mhe
+gfP
+vfA
+nmZ
+nuf
+cLH
jGs
vRu
-eov
-iFB
-nVu
-hqD
-jiz
-vUP
-cfU
-hqD
-iFB
-dUx
-cKa
-iFB
-qBT
-cKa
-kjt
-jii
-apg
-qBw
-glj
-sXe
-wHV
-sXe
-odQ
-nLO
-bQM
-bQM
-bQM
-bQM
-uwk
+cLH
+aCP
+jQE
+cvT
+nNy
+nmZ
+jTa
+cvT
+aCP
+nhm
+fsj
+aCP
+gMD
+fsj
+mhe
+iiK
+ngq
+qwo
+qXA
+gVK
+hgy
+gVK
+kDh
+pXF
+bQM
+bQM
+bQM
+bQM
+tyk
aZL
oPR
ldj
@@ -69820,30 +69815,30 @@ mlC
ecM
okE
qBe
-spI
-ueD
-umu
-wKi
-fBK
-qJY
-sKt
-umN
-eVD
-qFW
-umN
-eVD
-qFW
-umN
-hjI
-fBK
-qJY
-umN
-xBF
-mwP
-umN
-xBF
-mwP
-umN
+uZS
+fuY
+wWT
+hri
+xTw
+bWX
+pPg
+iZl
+ceX
+gJy
+iZl
+ceX
+gJy
+iZl
+mOr
+xTw
+bWX
+iZl
+prc
+cgf
+iZl
+prc
+cgf
+iZl
rKs
tOM
wGA
@@ -69877,9 +69872,9 @@ fOT
nBw
nvX
nvX
-qHl
-naj
-rQi
+hdC
+dwg
+hjD
fIW
htt
htt
@@ -69972,44 +69967,44 @@ cAW
cAW
cAW
bQM
-uwk
-kXk
-amn
-tPB
-vUP
-kIO
-eov
+tyk
+hRo
+csF
+caf
+nmZ
+kPM
+cLH
dRO
pvD
-eov
-cKa
-cKa
-cKa
-mZy
-vUP
-dFI
-hEs
-cKa
-cKa
-cKa
-cKa
-cKa
-cKa
-apm
-jii
-apg
-qBw
-glj
-sXe
-wHV
-sXe
-vJh
-nLO
+cLH
+fsj
+fsj
+fsj
+bMw
+nmZ
+pBB
+mYA
+fsj
+fsj
+fsj
+fsj
+fsj
+fsj
+sEw
+iiK
+ngq
+qwo
+qXA
+gVK
+hgy
+gVK
+aki
+pXF
kPz
kPz
kPz
kPz
-uwk
+tyk
qBe
rpt
oPR
@@ -70032,30 +70027,30 @@ kPz
mlC
qBe
eUP
-pUD
-iRA
-xSw
-eVD
-eux
-duL
-lmC
-umN
-umN
-umN
-hhX
-umN
-umN
-umN
-wKi
-fBK
-qJY
-umN
-xpy
-oeh
-umN
-xpy
-oeh
-umN
+xwI
+cUw
+taF
+ceX
+ygC
+omS
+ylI
+iZl
+iZl
+iZl
+jGv
+iZl
+iZl
+iZl
+hri
+xTw
+bWX
+iZl
+rrf
+vLY
+iZl
+rrf
+vLY
+iZl
lbz
gLk
gbf
@@ -70091,7 +70086,7 @@ gbf
gbf
arT
tOM
-rQi
+hjD
vfM
oEK
lEy
@@ -70184,44 +70179,44 @@ cAW
cAW
cAW
bQM
-uwk
-vUP
-jWI
-eow
-lFB
-dbh
-eov
+tyk
+nmZ
+xMg
+wJs
+wGa
+tPf
+cLH
doe
cAW
-gGn
-fna
-uTq
-cIa
-gzN
-qBw
-qBw
-cIa
-fna
-uTq
-cIa
-fna
-uTq
-cIa
-nVK
-lTs
-apg
-qBw
-cIa
-dcv
-wHV
-sXe
-lMi
-nLO
-bQM
-bQM
-bQM
-bQM
-uwk
+cBv
+xvr
+cNJ
+gMH
+ahb
+qwo
+qwo
+gMH
+xvr
+cNJ
+gMH
+xvr
+cNJ
+gMH
+lyq
+pvm
+ngq
+qwo
+gMH
+xas
+hgy
+gVK
+iDc
+pXF
+bQM
+bQM
+bQM
+bQM
+tyk
roQ
vdW
oPR
@@ -70244,30 +70239,30 @@ bQM
mlC
eUP
qBe
-uFL
-umN
-umN
-xSw
-blG
-umN
-umN
-umN
-mKa
-fBK
-fBK
-kgQ
-fBK
-fBK
-wKi
-fBK
-rYK
-umN
-umN
-umN
-umN
-umN
-umN
-umN
+yaQ
+iZl
+iZl
+taF
+nbY
+iZl
+iZl
+iZl
+sIi
+xTw
+xTw
+qRz
+xTw
+xTw
+hri
+xTw
+rEN
+iZl
+iZl
+iZl
+iZl
+iZl
+iZl
+iZl
mxQ
tOM
gbf
@@ -70301,9 +70296,9 @@ fOT
jzP
ydK
ydK
-ope
-dzq
-rQi
+rrU
+qSh
+hjD
ucj
bBA
bBA
@@ -70394,41 +70389,41 @@ cAW
cAW
cAW
cAW
-jmG
-jmG
-jmG
-lSq
-kjt
-hjB
-rLG
-taI
-eov
+idu
+idu
+idu
+rBh
+mhe
+vQn
+vfA
+ueE
+cLH
ivb
cAW
-gGn
-mVE
-sJH
-cIa
-fLH
-gCK
-qBw
-cIa
-mVE
-sEK
-cIa
-mVE
-sEK
-cIa
-nVK
-jii
-apg
-cIa
-cIa
-cIa
-aNY
-cIa
-cIa
-hCG
+cBv
+qvR
+bbt
+gMH
+loX
+aff
+qwo
+gMH
+qvR
+vdR
+gMH
+qvR
+vdR
+gMH
+lyq
+iiK
+ngq
+gMH
+gMH
+gMH
+anx
+gMH
+gMH
+cbC
vnr
hxq
hxq
@@ -70449,37 +70444,37 @@ oPR
qBe
vtX
dYo
-uDF
+gxS
kPz
kPz
kPz
-uDF
-aCw
-aCw
-aCw
-umN
-umN
-nkw
-xVC
-xxg
-umN
-pai
-kgQ
-tSl
-diJ
-ddt
-lmC
-kgQ
-diF
-fBK
-qJY
-umN
-nDu
-tjh
-umN
-nDu
-tjh
-umN
+gxS
+jLz
+jLz
+jLz
+iZl
+iZl
+dJS
+vfV
+eHX
+iZl
+jSx
+qRz
+cJN
+pre
+cVx
+ylI
+qRz
+hgi
+xTw
+bWX
+iZl
+aFX
+mgC
+iZl
+aFX
+mgC
+iZl
hNj
ijd
gbf
@@ -70514,15 +70509,15 @@ apu
gbf
gbf
fFw
-gMl
-sdG
-cZv
-cZv
-cZv
-cZv
-cZv
+xJv
+ulj
+rtM
+rtM
+rtM
+rtM
+rtM
faD
-okQ
+ncE
bzO
tan
tan
@@ -70606,39 +70601,39 @@ cAW
cAW
cAW
cAW
-jmG
+idu
cAW
-jmG
-vUP
-kXk
-amn
-tPB
-mpR
-eov
+idu
+nmZ
+hRo
+csF
+caf
+jnp
+cLH
hxJ
qgd
-gGn
-hZU
-dZM
-cIa
-oDH
-qBw
-psG
-cIa
-hZU
-dZM
-cIa
-hZU
-dZM
-cIa
-apm
-jii
-xCR
-cIa
-qBw
-qBw
-qBw
-cIa
+cBv
+nUP
+ybk
+gMH
+kyl
+qwo
+fdg
+gMH
+nUP
+ybk
+gMH
+nUP
+ybk
+gMH
+sEw
+iiK
+xps
+gMH
+qwo
+qwo
+qwo
+gMH
xRl
cPz
ixl
@@ -70646,7 +70641,7 @@ kJz
ixl
bjf
vNq
-hsz
+wAb
oPR
oPR
qBe
@@ -70654,44 +70649,44 @@ mlC
kPz
kPz
kPz
-uDF
+gxS
hdR
oPR
oPR
qBe
aZL
-nGB
-jjx
-uDF
-uDF
-uDF
-jjx
-eLU
-aCw
-aCw
-aCw
-hNt
-bNW
-lny
-bNW
-umN
-pai
-kgQ
-nkg
-diJ
-iuC
-lmC
-pnP
-wKi
-fBK
-qJY
-umN
-eVD
-qFW
-umN
-eVD
-qFW
-umN
+wNb
+eAh
+gxS
+gxS
+gxS
+eAh
+kTk
+jLz
+jLz
+jLz
+fyX
+msB
+uCc
+msB
+iZl
+jSx
+qRz
+aHv
+pre
+aBa
+ylI
+eEK
+hri
+xTw
+bWX
+iZl
+ceX
+gJy
+iZl
+ceX
+gJy
+iZl
lbz
hnh
gbf
@@ -70726,7 +70721,7 @@ apu
gbf
vEK
fWy
-xhV
+fSi
gbf
pYB
eBS
@@ -70818,99 +70813,99 @@ cAW
cAW
cAW
cAW
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-hCG
-gGn
-gGn
-gGn
-gGn
-qBw
-wHV
-qBw
-ika
-qBw
-qBw
-bjZ
-fvx
-aYR
-aiv
-kGd
-meE
-qBw
-nVK
-jii
-apg
-lZA
-fvx
-aYR
-meE
-lZA
+idu
+idu
+idu
+idu
+idu
+idu
+idu
+cbC
+cBv
+cBv
+cBv
+cBv
+qwo
+hgy
+qwo
+qZH
+qwo
+qwo
+ikg
+bIf
+nFa
+rMa
+ezj
+oka
+qwo
+lyq
+iiK
+ngq
+uEx
+bIf
+nFa
+oka
+uEx
ixl
ixl
ghS
hHH
hHH
ixl
-qfR
-aCw
-gvy
-gvy
-isw
-uDF
+cnR
+jLz
+cLp
+cLp
+lYf
+gxS
bQM
kPz
bQM
-uDF
-flG
-gvy
-gvy
-aCw
-aCw
-gbk
-aCw
-iCC
-aCw
-aCw
-aCw
-aCw
-aCw
-svS
-isw
-aCw
-aCw
-aCw
-fjg
-umN
-pai
-kgQ
-tTm
-diJ
-aga
-diJ
-fBK
-wKi
-fBK
-rYK
-umN
-hCX
-elm
-umN
-hCX
-elm
-umN
-umN
+gxS
+wsA
+cLp
+cLp
+jLz
+jLz
+jkl
+jLz
+kKp
+jLz
+jLz
+jLz
+jLz
+jLz
+vob
+lYf
+jLz
+jLz
+jLz
+lCe
+iZl
+jSx
+qRz
+fdB
+pre
+hYT
+pre
+xTw
+hri
+xTw
+rEN
+iZl
+qSW
+exF
+iZl
+qSW
+exF
+iZl
+iZl
pFW
cTy
fOT
-fse
-esY
-kJg
+cjq
+gOQ
+bYj
nBw
nvX
nvX
@@ -70938,15 +70933,15 @@ apu
gbf
gbf
fFw
-gMl
-dOc
-vft
-vft
-vft
-vft
-vft
+xJv
+jiW
+nRj
+nRj
+nRj
+nRj
+nRj
qRW
-mbU
+hBM
bzO
tan
tan
@@ -71030,93 +71025,93 @@ cAW
cAW
cAW
cAW
-jmG
+idu
cAW
-jmG
+idu
cAW
cAW
cAW
cAW
-hCG
-cIa
-cIa
-cIa
-rpf
-qBw
-qBw
-qBw
-qBw
-mIr
-qBw
-knb
-mVE
-bVO
-gJM
-gAD
-hkH
-qBw
-nVK
-jii
-apg
-wHV
-nVK
-jii
-apg
-wHV
+cbC
+gMH
+gMH
+gMH
+aRy
+qwo
+qwo
+qwo
+qwo
+sJb
+qwo
+rHM
+qvR
+sgB
+cwT
+nAc
+wJC
+qwo
+lyq
+iiK
+ngq
+hgy
+lyq
+iiK
+ngq
+hgy
ixl
ixl
ixl
ixl
ixl
gpr
-nnr
-gvy
-gvy
-gvy
-lFK
-jjx
-uDF
-uDF
-uDF
-jjx
-cYY
-gvy
-gvy
-aCw
-aCw
-aCw
-aCw
-aCw
-aCw
-aCw
-aCw
-aCw
-aCw
-rMw
-tkh
-aCw
-aCw
-aCw
-jLe
-umN
-umN
-sRJ
-iuC
-coj
-lmC
-lmC
-fBK
-wKi
-fBK
-qJY
-lmC
-xBF
-nUh
-nUh
-nUh
-bhC
-lmC
-ntv
+oah
+cLp
+cLp
+cLp
+ali
+eAh
+gxS
+gxS
+gxS
+eAh
+jSY
+cLp
+cLp
+jLz
+jLz
+jLz
+jLz
+jLz
+jLz
+jLz
+jLz
+jLz
+jLz
+qvJ
+oSU
+jLz
+jLz
+jLz
+rIP
+iZl
+iZl
+wuf
+aBa
+pei
+ylI
+ylI
+xTw
+hri
+xTw
+bWX
+ylI
+prc
+rtL
+rtL
+rtL
+lbU
+ylI
+fHv
tOM
gbf
fOT
@@ -71149,9 +71144,9 @@ fOT
nBw
nvX
nvX
-qHl
-naj
-rQi
+hdC
+dwg
+hjD
fIW
htt
htt
@@ -71242,93 +71237,93 @@ cAW
cAW
cAW
cAW
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-jmG
-hCG
-cIa
-cIa
-cIa
-cIa
-qBw
-qBw
-qBw
-jfc
-wHV
-wHV
-wHV
-wHV
-wHV
-rPS
-wHV
-wHV
-jfc
-nVK
-jii
-apg
-lZA
-nVK
-jii
-apg
-lZA
+idu
+idu
+idu
+idu
+idu
+idu
+idu
+cbC
+gMH
+gMH
+gMH
+gMH
+qwo
+qwo
+qwo
+xAL
+hgy
+hgy
+hgy
+hgy
+hgy
+duu
+hgy
+hgy
+xAL
+lyq
+iiK
+ngq
+uEx
+lyq
+iiK
+ngq
+uEx
ixl
ixl
ixl
ixl
ixl
ixl
-nnr
-gvy
-gvy
-gvy
-flG
-eLy
-isw
-aCw
-flG
-eLy
-isw
-gvy
-gvy
-svS
-isw
-aCw
-aCw
-svS
-isw
-aCw
-aCw
-aCw
-aCw
-hYs
-uou
-aCw
-mrW
-aCw
-fWV
-tHl
-qCK
-lIJ
-qCK
-lmC
-idj
-lmC
-fBK
-eVD
-gos
-duL
-lmC
-eVD
-gos
-gos
-gos
-duL
-lmC
-ntv
+oah
+cLp
+cLp
+cLp
+wsA
+rES
+lYf
+jLz
+wsA
+rES
+lYf
+cLp
+cLp
+vob
+lYf
+jLz
+jLz
+vob
+lYf
+jLz
+jLz
+jLz
+jLz
+tNQ
+dGv
+jLz
+hyU
+jLz
+xCE
+cGO
+lUR
+iml
+lUR
+ylI
+wtf
+ylI
+xTw
+ceX
+dHf
+omS
+ylI
+ceX
+dHf
+dHf
+dHf
+omS
+ylI
+fHv
tOM
gbf
rsR
@@ -71363,7 +71358,7 @@ gbf
gbf
arT
tOM
-rQi
+hjD
vfM
oEK
lEy
@@ -71461,86 +71456,86 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-cIa
-cIa
-rpf
-fvx
-aYR
-meE
-juV
-fvx
-clA
-wHV
-fvx
-meE
-jfc
-fvx
-meE
-rPS
-nVK
-jii
-apg
-wHV
-mVE
-gAD
-sJH
-wHV
+cbC
+gMH
+gMH
+gMH
+aRy
+bIf
+nFa
+oka
+ckX
+bIf
+xEu
+hgy
+bIf
+oka
+xAL
+bIf
+oka
+duu
+lyq
+iiK
+ngq
+hgy
+qvR
+nAc
+bbt
+hgy
ixl
ixl
ixl
ixl
ghS
ixl
-jAP
-aBX
-gvy
-gvy
-gvy
-gvy
-gvy
-gvy
-gvy
-gvy
-gvy
-gvy
-gvy
-flG
-tkh
-aCw
-iCC
-flG
-tkh
-aCw
-aCw
-aCw
-aCw
-hYs
-aCw
-aCw
-aCw
-oHi
-qfh
-sgt
-xSw
-sDw
-xSw
-xSw
-lmC
-diJ
-fBK
-xSw
-fBK
-fBK
-umN
-hCX
-elm
-umN
-umN
-nIU
-umN
-umN
+fWZ
+vaX
+cLp
+cLp
+cLp
+cLp
+cLp
+cLp
+cLp
+cLp
+cLp
+cLp
+cLp
+wsA
+oSU
+jLz
+kKp
+wsA
+oSU
+jLz
+jLz
+jLz
+jLz
+tNQ
+jLz
+jLz
+jLz
+hHk
+jBX
+rqi
+taF
+mhp
+taF
+taF
+ylI
+pre
+xTw
+taF
+xTw
+xTw
+iZl
+qSW
+exF
+iZl
+iZl
+lYv
+iZl
+iZl
pFW
gbf
gbf
@@ -71573,9 +71568,9 @@ fOT
jzP
ydK
ydK
-ope
-dzq
-rQi
+rrU
+qSh
+hjD
ucj
bBA
bBA
@@ -71673,32 +71668,32 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-cIa
-cIa
-cIa
-nVK
-jii
-apg
-juV
-fRc
-keb
-juV
-iXB
-keb
-jfc
-iXB
-keb
-wHV
-nVK
-jii
-apg
-cIa
-qBw
-qBw
-qBw
-cIa
+cbC
+gMH
+gMH
+gMH
+gMH
+lyq
+iiK
+ngq
+ckX
+fRt
+ejZ
+ckX
+aSU
+ejZ
+xAL
+aSU
+ejZ
+hgy
+lyq
+iiK
+ngq
+gMH
+qwo
+qwo
+qwo
+gMH
xRl
ixl
ixl
@@ -71706,48 +71701,48 @@ ixl
ixl
bjf
vNq
-kgu
-aBX
-tkh
-isw
-wRS
-oCM
-qpF
-sqL
-kjs
-oPH
-qpF
-sUd
-aCw
-aCw
-wRS
-kjs
-kjs
-xql
-svS
-isw
-aCw
-kHH
-fFv
-uoH
-aCw
-aCw
-aCw
-aCw
-oPN
-xSw
-aXC
-xSw
-qCK
-lIJ
-xSw
-sDw
-sDw
-sDw
-tZe
-umN
-xBF
-mwP
+aCS
+vaX
+oSU
+lYf
+kpA
+qIW
+ijk
+xyv
+ihq
+mfW
+ijk
+pCz
+jLz
+jLz
+kpA
+ihq
+ihq
+wWN
+vob
+lYf
+jLz
+mwX
+ohd
+dHF
+jLz
+jLz
+jLz
+jLz
+xeL
+taF
+dzM
+taF
+lUR
+iml
+taF
+mhp
+mhp
+mhp
+vnj
+iZl
+prc
+cgf
mxQ
fCZ
nZQ
@@ -71786,15 +71781,15 @@ apu
tOM
tOM
fFw
-gMl
-sdG
-cZv
-cZv
-cZv
-cZv
-cZv
+xJv
+ulj
+rtM
+rtM
+rtM
+rtM
+rtM
faD
-okQ
+ncE
bzO
tan
tan
@@ -71885,32 +71880,32 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-cIa
-cIa
-cIa
-iWX
-jii
-apg
-asF
-cIa
-cIa
-cIa
-cIa
-cIa
-cIa
-cIa
-cIa
-cIa
-apm
-jii
-apg
-hCG
-nLO
-nLO
-nLO
-hCG
+cbC
+gMH
+gMH
+gMH
+gMH
+stx
+iiK
+ngq
+ujx
+gMH
+gMH
+gMH
+gMH
+gMH
+gMH
+gMH
+gMH
+gMH
+sEw
+iiK
+ngq
+cbC
+pXF
+pXF
+pXF
+cbC
vnr
ixl
ixl
@@ -71919,47 +71914,47 @@ ixl
ixl
vNq
vNq
-iUz
-hXJ
-hXJ
-hJd
+luF
+vXr
+vXr
+iLo
vNq
vNq
vnr
-uDF
-uDF
-jjx
-pBj
-hEv
-hEv
-qnL
-jjx
-nSx
-gVc
-xbo
-qzZ
-aCw
-aCw
-flG
-tkh
-aCw
-aCw
-ooO
-faw
-lux
-wjH
-cqW
-ckS
-voh
-dtg
-lmC
-sDw
-sDw
-sDw
-tZe
-umN
-xpy
-oeh
+gxS
+gxS
+eAh
+xMQ
+vUJ
+vUJ
+hUB
+eAh
+nXL
+fYg
+dby
+vMl
+jLz
+jLz
+wsA
+oSU
+jLz
+jLz
+lUM
+gKk
+kHT
+qRC
+szv
+aVn
+gnm
+pKC
+ylI
+mhp
+mhp
+mhp
+vnj
+iZl
+rrf
+vLY
mxQ
gRW
ssO
@@ -71998,7 +71993,7 @@ apu
tOM
aRk
fFw
-xhV
+fSi
gbf
pYB
eBS
@@ -72097,28 +72092,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-fna
-moQ
-cIa
-urw
-jii
-vwX
-cIa
-fna
-uTq
-cIa
-fna
-uTq
-cIa
-fna
-aLC
-cIa
-nVK
-jii
-apg
-nLO
+cbC
+gMH
+xvr
+jkM
+gMH
+hyL
+iiK
+mzm
+gMH
+xvr
+cNJ
+gMH
+xvr
+cNJ
+gMH
+xvr
+hgC
+gMH
+lyq
+iiK
+ngq
+pXF
bQM
kPz
kPz
@@ -72145,33 +72140,33 @@ ovq
vyw
bix
uTb
-jjx
-nSx
-gux
-eio
-aCw
-aCw
-aCw
-aCw
-aCw
-lfx
-aCw
-aCw
-faw
-tHl
-jYm
-fBK
-thz
-suq
-fBK
-wFB
-fBK
-fBK
-xdZ
-fBK
-umN
-umN
-umN
+eAh
+nXL
+wxt
+wuD
+jLz
+jLz
+jLz
+jLz
+jLz
+nLv
+jLz
+jLz
+gKk
+cGO
+fdn
+xTw
+hAu
+cWh
+xTw
+oRL
+xTw
+xTw
+rFo
+xTw
+iZl
+iZl
+iZl
mxQ
tUs
tUs
@@ -72202,23 +72197,23 @@ hvF
mxQ
mxQ
mxQ
-sDp
-met
+iQC
+nHC
gbf
fOT
apu
tOM
rbW
voP
-gMl
-dOc
-vft
-vft
-vft
-vft
-vft
+xJv
+jiW
+nRj
+nRj
+nRj
+nRj
+nRj
qRW
-mbU
+hBM
bzO
tan
tan
@@ -72309,28 +72304,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-mVE
-qRf
-cIa
-nVK
-jii
-apg
-cIa
-mVE
-jWY
-cIa
-mVE
-lzz
-cIa
-mVE
-nlX
-cIa
-mVE
-gAD
-sJH
-nLO
+cbC
+gMH
+qvR
+uxh
+gMH
+lyq
+iiK
+ngq
+gMH
+qvR
+gEg
+gMH
+qvR
+bGE
+gMH
+qvR
+sFQ
+gMH
+qvR
+nAc
+bbt
+pXF
bQM
kPz
kPz
@@ -72357,33 +72352,33 @@ lOx
oRg
ixl
uvn
-jjx
-nSx
-ayG
-laK
-gRA
-aCw
-svS
-isw
-gRA
-aCw
-aCw
-aCw
-hQT
-axz
-axz
-umN
-umN
-umN
-axz
-axz
-xSw
-blG
-axz
-axz
-axz
-bMG
-anl
+eAh
+nXL
+iuf
+sjA
+sUW
+jLz
+vob
+lYf
+sUW
+jLz
+jLz
+jLz
+tiw
+wAP
+wAP
+iZl
+iZl
+iZl
+wAP
+wAP
+taF
+nbY
+wAP
+wAP
+wAP
+gbS
+jcI
ffZ
tUs
fgU
@@ -72415,15 +72410,15 @@ mxQ
pRx
tOM
xbp
-xhV
+fSi
gbf
fOT
nBw
nvX
nvX
-qHl
-naj
-rQi
+hdC
+dwg
+hjD
fIW
htt
htt
@@ -72521,28 +72516,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-hZU
-dZM
-cIa
-nVK
-jii
-apg
-cIa
-hZU
-dZM
-cIa
-hZU
-dZM
-cIa
-hZU
-dZM
-cIa
-cIt
-qBw
-qBw
-nLO
+cbC
+gMH
+nUP
+ybk
+gMH
+lyq
+iiK
+ngq
+gMH
+nUP
+ybk
+gMH
+nUP
+ybk
+gMH
+nUP
+ybk
+gMH
+aQp
+qwo
+qwo
+pXF
bQM
kPz
kPz
@@ -72569,33 +72564,33 @@ bix
uPl
dIh
kGc
-nSx
-cVV
-oWC
-ubx
-qTt
-gRA
-flG
-svS
-isw
-gRA
-aCw
-aCw
-uud
-wXQ
-ntv
-hqX
-nUh
-nUh
-rQB
-gdS
-lmC
-lmC
-qxZ
-lHH
-sFH
-rCt
-xGd
+nXL
+jFw
+bPZ
+nRl
+jFb
+sUW
+wsA
+vob
+lYf
+sUW
+jLz
+jLz
+kiU
+vhX
+fHv
+dgM
+rtL
+rtL
+nFP
+tOK
+ylI
+ylI
+kKI
+nem
+poT
+uAE
+aTZ
mxQ
tUs
kZy
@@ -72624,10 +72619,10 @@ mxQ
mxQ
mxQ
mxQ
-pdq
+qBA
tUs
-nIJ
-jSx
+bMd
+vIP
gbf
fOT
gbf
@@ -72635,7 +72630,7 @@ gbf
gbf
arT
tOM
-rQi
+hjD
vfM
oEK
lEy
@@ -72733,28 +72728,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-fvx
-aYR
-aYR
-rEx
-jii
-deg
-aYR
-aYR
-kGd
-wHV
-aYR
-aYR
-aYR
-aYR
-meE
-qBw
-fvx
-aYR
-meE
-nLO
+cbC
+gMH
+bIf
+nFa
+nFa
+nqg
+iiK
+pco
+nFa
+nFa
+ezj
+hgy
+nFa
+nFa
+nFa
+nFa
+oka
+qwo
+bIf
+nFa
+oka
+pXF
bQM
kPz
kPz
@@ -72781,33 +72776,33 @@ ovq
ovq
ovq
uvn
-nSx
-nSx
-ubx
-rGf
-ubx
-qUw
-gRA
-flG
-tkh
-isw
-aCw
-aCw
-aCw
-umN
-umN
-umN
-fKX
-sDw
-rQB
-eMN
-lmC
-lmC
-sjZ
-umN
-huJ
-caF
-xKE
+nXL
+nXL
+nRl
+pEK
+nRl
+ckD
+sUW
+wsA
+oSU
+lYf
+jLz
+jLz
+jLz
+iZl
+iZl
+iZl
+dJY
+mhp
+nFP
+kAB
+ylI
+ylI
+frQ
+iZl
+mTH
+keo
+cvW
mxQ
cLu
wBX
@@ -72845,9 +72840,9 @@ fOT
jzP
ydK
ydK
-ope
-dzq
-rQi
+rrU
+qSh
+hjD
ucj
bBA
bBA
@@ -72945,28 +72940,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-nVK
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-wHV
-jii
-jii
-jii
-jii
-apg
-qBw
-nVK
-jii
-apg
-nLO
+cbC
+gMH
+lyq
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+hgy
+iiK
+iiK
+iiK
+iiK
+ngq
+qwo
+lyq
+iiK
+ngq
+pXF
bQM
kPz
kPz
@@ -72993,33 +72988,33 @@ kgG
ujb
ovq
uvn
-cVV
-nSx
-nVE
-ubx
-uGL
-tkh
-aCw
-gRA
-flG
-tkh
-aCw
-aCw
-uud
-mwu
-ntv
-hqX
-nUh
-nUh
-axz
-axz
-xSw
-blG
-axz
-axz
-umN
-pim
-umN
+jFw
+nXL
+uIi
+nRl
+vDS
+oSU
+jLz
+sUW
+wsA
+oSU
+jLz
+jLz
+kiU
+enm
+fHv
+dgM
+rtL
+rtL
+wAP
+wAP
+taF
+nbY
+wAP
+wAP
+iZl
+eed
+iZl
mxQ
tUs
mxQ
@@ -73031,14 +73026,14 @@ gbf
ekx
tOM
tOM
-xYM
-cfX
-mKh
-wMp
-dRF
-wsR
-cfX
-qUb
+sQu
+snB
+vnt
+wFe
+gdH
+tAN
+snB
+lBK
tOM
tOM
beB
@@ -73048,25 +73043,25 @@ tOM
pYB
mxQ
mxQ
-lbg
+qpS
tUs
-ope
-met
+rrU
+nHC
uMN
fOT
apu
gbf
gbf
fWy
-gMl
-sdG
-cZv
-cZv
-cZv
-cZv
-cZv
+xJv
+ulj
+rtM
+rtM
+rtM
+rtM
+rtM
faD
-okQ
+ncE
bzO
tan
tan
@@ -73157,28 +73152,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-ndQ
-gAD
-gAD
-gAD
-gAD
-gAD
-gAD
-gAD
-gAD
-ljc
-gAD
-gAD
-gAD
-gAD
-sJH
-qBw
-mVE
-ylr
-sJH
-nLO
+cbC
+gMH
+fry
+nAc
+nAc
+nAc
+nAc
+nAc
+nAc
+nAc
+nAc
+kVK
+nAc
+nAc
+nAc
+nAc
+bbt
+qwo
+qvR
+kCV
+bbt
+pXF
bQM
kPz
kPz
@@ -73205,29 +73200,29 @@ oUg
yfA
ovq
peP
-nSx
-nSx
-xgC
-isw
-gRA
-aCw
-svS
-dVu
-nSx
-nvx
-aCw
-aCw
-aCw
-umN
-umN
-umN
-fBK
-sDw
-sqC
-ghe
+nXL
+nXL
+qRv
+lYf
+sUW
+jLz
+vob
+atV
+nXL
+hbO
+jLz
+jLz
+jLz
+iZl
+iZl
+iZl
+xTw
+mhp
+iHd
+ppF
qQb
qQb
-kBW
+wvF
hfT
ecU
iSg
@@ -73241,18 +73236,18 @@ gbf
tOM
tOM
tOM
-szn
-cfX
-vSn
-fbn
-fbn
-cqZ
-ckl
-fbn
-fbn
-mqF
-cfX
-mDG
+nbr
+snB
+rdX
+ndo
+ndo
+cNg
+rWU
+ndo
+ndo
+mPz
+snB
+jRE
tOM
tOM
tOM
@@ -73263,14 +73258,14 @@ mxQ
rQN
tOM
rTD
-xhV
+fSi
gbf
fOT
apu
gbf
vEK
fWy
-xhV
+fSi
gbf
pYB
eBS
@@ -73369,28 +73364,28 @@ cAW
cAW
cAW
cAW
-hCG
-cIa
-cIa
-cIa
-cIa
-wsw
-doc
-qBw
-doc
-qBw
-jii
-jii
-jii
-qBw
-doc
-gtr
-gtr
-gtr
-cIa
-cIa
-cIa
-hCG
+cbC
+gMH
+gMH
+gMH
+gMH
+gWv
+rdS
+qwo
+rdS
+qwo
+iiK
+iiK
+iiK
+qwo
+rdS
+xAV
+xAV
+xAV
+gMH
+gMH
+gMH
+cbC
bQM
kPz
kPz
@@ -73418,29 +73413,29 @@ oRg
vdN
uvn
uFC
-qyM
-flG
-svS
-isw
-gRA
-flG
-svS
-dhc
-nSx
-nvx
-aCw
-uud
-wXQ
-ntv
-hqX
-nUh
-nUh
-ntv
-bcO
+cTm
+wsA
+vob
+lYf
+sUW
+wsA
+vob
+dgw
+nXL
+hbO
+jLz
+kiU
+vhX
+fHv
+dgM
+rtL
+rtL
+fHv
+fOh
sIj
hkA
-tCm
-syM
+fMT
+cHs
fOK
iSg
vTA
@@ -73451,22 +73446,22 @@ pYB
tOM
gbf
tOM
-pnn
-cfX
-vSn
-fbn
-qtp
-fbn
-inv
-tEU
-tEU
-uow
-fbn
-qtp
-fbn
-nlT
-cfX
-bKT
+brS
+snB
+rdX
+ndo
+qTp
+ndo
+dki
+suD
+suD
+edG
+ndo
+qTp
+ndo
+ehn
+snB
+aKz
tOM
gbf
tOM
@@ -73474,8 +73469,8 @@ pYB
mxQ
mxQ
mxQ
-rDf
-jSx
+gpx
+vIP
gbf
fOT
apu
@@ -73580,27 +73575,27 @@ cAW
cAW
cAW
cAW
-hCG
-hCG
-cIa
-cIa
-cIa
-pQc
-jii
-jii
-jii
-jii
-qBw
-jii
-jii
-jii
-qBw
-jii
-jii
-mns
-qBw
-qBw
-tBP
+cbC
+cbC
+gMH
+gMH
+gMH
+jQQ
+iiK
+iiK
+iiK
+iiK
+qwo
+iiK
+iiK
+iiK
+qwo
+iiK
+iiK
+jkE
+qwo
+qwo
+scK
vNq
vnr
bQM
@@ -73630,25 +73625,25 @@ oRg
ovq
uvn
ovq
-qyM
-gRA
-flG
-tkh
-isw
-gRA
-flG
-qEC
-isw
-gRA
-aCw
-aCw
-umN
-umN
-umN
-sKr
-sDw
-ntv
-bcO
+cTm
+sUW
+wsA
+oSU
+lYf
+sUW
+wsA
+tfn
+lYf
+sUW
+jLz
+jLz
+iZl
+iZl
+iZl
+qBz
+mhp
+fHv
+fOh
sIj
hkA
nZI
@@ -73663,22 +73658,22 @@ eTr
gbf
ekx
tOM
-nYQ
-fbn
-qtp
-fbn
-tVY
-rTY
-sgI
-tEU
-tEU
-sgI
-blf
-fDW
-fbn
-qtp
-fbn
-gMl
+vlE
+ndo
+qTp
+ndo
+bpL
+hot
+tYX
+suD
+suD
+tYX
+qnf
+dMb
+ndo
+qTp
+ndo
+xJv
tOM
beB
jMv
@@ -73792,27 +73787,27 @@ cAW
cAW
cAW
cAW
-hCG
-hCG
-cIa
-cIa
-cIa
-cIa
-jii
-rAw
-rAw
-xKP
-niw
-niw
-oKn
-niw
-jfp
-pho
-jii
-jii
-qBw
-qBw
-tBP
+cbC
+cbC
+gMH
+gMH
+gMH
+gMH
+iiK
+onY
+onY
+mjG
+xOp
+xOp
+gRl
+xOp
+wMN
+kei
+iiK
+iiK
+qwo
+qwo
+scK
vNq
vnr
bQM
@@ -73842,29 +73837,29 @@ oRg
jUP
uvn
ovq
-qyM
-isw
-gRA
-flG
-svS
-dVu
-nSx
-asf
-svS
-isw
-gRA
-uud
-iIG
-ntv
-hqX
-nUh
-nUh
-ntv
-bcO
+cTm
+lYf
+sUW
+wsA
+vob
+atV
+nXL
+tpn
+vob
+lYf
+sUW
+kiU
+wKh
+fHv
+dgM
+rtL
+rtL
+fHv
+fOh
sIj
hkA
-fEt
-eBH
+shs
+ato
drd
hEk
myJ
@@ -73874,24 +73869,24 @@ pYB
tOM
gbf
tOM
-szn
-vSn
-qtp
-vRk
-gWA
-bTC
-aZA
-sgI
-tEU
-voI
-sgI
-xct
-emE
-fXW
-ldF
-qtp
-nlT
-mDG
+nbr
+rdX
+qTp
+kbO
+mXM
+aQm
+xBS
+tYX
+suD
+dDk
+tYX
+aHm
+biN
+wsK
+coL
+qTp
+ehn
+jRE
tOM
gbf
tOM
@@ -74004,27 +73999,27 @@ cAW
cAW
cAW
cAW
-hCG
-hCG
-hCG
-hCG
-pcN
-qBw
-jii
-rAw
-rAw
-vsr
-nmm
-fXV
-nmm
-nmm
-wJd
-meE
-mns
-jii
-qBw
-qBw
-tBP
+cbC
+cbC
+cbC
+cbC
+iNh
+qwo
+iiK
+onY
+onY
+fXj
+ijE
+fAW
+ijE
+ijE
+gJP
+oka
+jkE
+iiK
+qwo
+qwo
+scK
vNq
vnr
bQM
@@ -74054,28 +74049,28 @@ oRg
xHi
uvn
ovq
-qyM
-tkh
-isw
-gRA
-flG
-tkh
-nGO
-nSx
-hsz
-tkh
-isw
-gRA
-umN
-umN
-umN
-fBK
-sDw
-axz
-qsV
+cTm
+oSU
+lYf
+sUW
+wsA
+oSU
+nnf
+nXL
+wAb
+oSU
+lYf
+sUW
+iZl
+iZl
+iZl
+xTw
+mhp
+wAP
+nJM
vVN
vVN
-jQF
+wyG
rBF
rBF
nhY
@@ -74086,24 +74081,24 @@ tOM
gbf
tOM
tOM
-nYQ
-fbn
-fbn
-gWA
-sgI
-sgI
-rTY
-sgI
-tEU
-tEU
-sgI
-iYe
-mqL
-siy
-nAV
-fbn
-fbn
-gMl
+vlE
+ndo
+ndo
+mXM
+tYX
+tYX
+hot
+tYX
+suD
+suD
+tYX
+vYK
+pzK
+wPI
+mIn
+ndo
+ndo
+xJv
tOM
tOM
gbf
@@ -74219,23 +74214,23 @@ cAW
cAW
bQM
fwn
-hCG
-dVC
-qBw
-jii
-rAw
-vrH
-tAE
-nmm
-pqz
-nmm
-nmm
-wJd
-apg
-jii
-jii
-rkF
-qfi
+cbC
+hbh
+qwo
+iiK
+onY
+hhZ
+hkb
+ijE
+xzp
+ijE
+ijE
+gJP
+ngq
+iiK
+iiK
+vnQ
+gno
vNq
vNq
vNq
@@ -74266,24 +74261,24 @@ yfA
ovq
uvn
vja
-nSx
-oQS
-flG
-isw
-gRA
-flG
-svS
-isw
-gRA
-flG
-svS
-isw
-cfa
-qwH
-qwH
-xBF
-bhC
-axz
+nXL
+gpW
+wsA
+lYf
+sUW
+wsA
+vob
+lYf
+sUW
+wsA
+vob
+lYf
+mbQ
+uox
+uox
+prc
+lbU
+wAP
lmu
sIj
hkA
@@ -74297,26 +74292,26 @@ gbf
tOM
gbf
tOM
-pnn
-vSn
-qtp
-tVY
-bxv
-sgI
-sgI
-oox
-lMV
-tEU
-tEU
-vjR
-doQ
-upM
-vjR
-emE
-fDW
-qtp
-nlT
-met
+brS
+rdX
+qTp
+bpL
+hXw
+tYX
+tYX
+tSI
+lHT
+suD
+suD
+ilx
+jPD
+jDr
+ilx
+biN
+dMb
+qTp
+ehn
+nHC
tOM
gbf
tOM
@@ -74431,21 +74426,21 @@ cAW
cAW
tan
geF
-hCG
-qPL
-qBw
-jii
-rAw
-rAw
-uLj
-nmm
-rru
-nmm
-djB
-wJd
-sJH
-jii
-uhA
+cbC
+msG
+qwo
+iiK
+onY
+onY
+okR
+ijE
+ntQ
+ijE
+ewi
+gJP
+bbt
+iiK
+oQy
oUg
oUg
oUg
@@ -74478,24 +74473,24 @@ uPl
kHS
iHB
reZ
-qyM
-gRA
-flG
-tkh
-dVu
-nSx
-hsz
-tkh
-isw
-gRA
-flG
-tkh
-cfa
-sDw
-qwH
-eVD
-duL
-axz
+cTm
+sUW
+wsA
+oSU
+atV
+nXL
+wAb
+oSU
+lYf
+sUW
+wsA
+oSU
+mbQ
+mhp
+uox
+ceX
+omS
+wAP
hcB
sIj
hkA
@@ -74509,26 +74504,26 @@ gbf
gbf
tOM
tOM
-nYQ
-fbn
-fbn
-vZe
-dIp
-rTY
-tlj
-tMW
-pMr
-ngg
-tEU
-mqL
-taS
-jEa
-hPu
-dIp
-blf
-fbn
-fbn
-vui
+vlE
+ndo
+ndo
+fvb
+rrY
+hot
+wjc
+esy
+dUI
+fml
+suD
+pzK
+oUF
+uPy
+uUU
+rrY
+qnf
+ndo
+ndo
+lus
tOM
tOM
gbf
@@ -74643,21 +74638,21 @@ cAW
cAW
kPz
cAW
-hCG
-nLO
-hCG
-jii
-xCg
-iFP
-kiT
-nmm
-nmm
-nmm
-nmm
-wJd
-qBw
-jii
-jii
+cbC
+pXF
+cbC
+iiK
+dCi
+mWj
+xPF
+ijE
+ijE
+ijE
+ijE
+gJP
+qwo
+iiK
+iiK
oUg
oUg
oUg
@@ -74690,24 +74685,24 @@ kvu
ovq
uvn
uFC
-qyM
-isw
-gRA
-flG
-svS
-dVu
-nSx
-hsz
-tad
-gLq
-oQS
-vao
-umN
-cYj
-qwH
-hhX
-umN
-axz
+cTm
+lYf
+sUW
+wsA
+vob
+atV
+nXL
+wAb
+fdl
+pes
+gpW
+uXa
+iZl
+aPf
+uox
+jGv
+iZl
+wAP
oaa
sIj
hkA
@@ -74721,26 +74716,26 @@ fWy
dxW
gbf
gbf
-vzu
-fbn
-qyq
-sgI
-sgI
-sgI
-eEC
-pMr
-saL
-qCx
-fEY
-nxC
-sgI
-drk
-sgI
-sgI
-sgI
-ulN
-fbn
-ecj
+csg
+ndo
+crI
+tYX
+tYX
+tYX
+ttc
+dUI
+veC
+dLy
+vOQ
+dTR
+tYX
+pxo
+tYX
+tYX
+tYX
+xjR
+ndo
+mlQ
gbf
gbf
dxW
@@ -74857,19 +74852,19 @@ bQM
cAW
cAW
cAW
-nLO
-jii
-jii
-jii
-jPM
-oBC
-jNl
-vrp
-mTa
-bsm
-wqY
-jii
-jii
+pXF
+iiK
+iiK
+iiK
+xNV
+xWh
+mJO
+uui
+ccl
+eAk
+sor
+iiK
+iiK
oUg
kSh
wPz
@@ -74902,18 +74897,18 @@ uTt
xZV
uvn
ovq
-qyM
-tkh
-isw
-gRA
-flG
-tkh
-isw
-gRA
-flG
-xNJ
-gRA
-gRA
+cTm
+oSU
+lYf
+sUW
+wsA
+oSU
+lYf
+sUW
+wsA
+jth
+sUW
+sUW
iBr
iBr
iBr
@@ -74933,26 +74928,26 @@ waQ
pYB
pYB
pYB
-cvf
-xoh
-tEU
-tEU
-tEU
-tEU
-qCx
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-hpX
-tEU
-tEU
-tEU
-oTx
-cnU
+mgJ
+nfc
+suD
+suD
+suD
+suD
+dLy
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+cgF
+suD
+suD
+suD
+vZI
+iwG
pYB
pYB
pYB
@@ -75069,19 +75064,19 @@ tan
cAW
cAW
cAW
-hCG
-jii
-jii
-jii
-mUd
-ubQ
-okF
-fis
-lUs
-pqz
-wqY
-jii
-jii
+cbC
+iiK
+iiK
+iiK
+jgo
+aQZ
+rmL
+ecE
+voT
+xzp
+sor
+iiK
+iiK
mPW
cpP
aFK
@@ -75114,18 +75109,18 @@ acO
xFL
pmC
xFL
-gRA
-flG
-tkh
-ygS
-tkh
-gRA
-gRA
-wOG
-gRA
-cum
-gRA
-eZW
+sUW
+wsA
+oSU
+iny
+oSU
+sUW
+sUW
+qcI
+sUW
+aID
+sUW
+oAH
iBr
iBr
iBr
@@ -75145,26 +75140,26 @@ mkn
pYB
pYB
pYB
-dRF
-qEt
-tEU
-tEU
-ngg
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-tEU
-aIG
-wMp
+gdH
+lhl
+suD
+suD
+fml
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+suD
+ehl
+wFe
pYB
pYB
pYB
@@ -75281,19 +75276,19 @@ eeI
cAW
cAW
cAW
-nLO
-jii
-xCh
-jii
-mUd
-hpz
-hxM
-fHK
-iwT
-nmm
-wqY
-pUG
-jii
+pXF
+iiK
+xlu
+iiK
+jgo
+sBU
+kcQ
+uKJ
+aXI
+ijE
+sor
+tGc
+iiK
puE
hTf
qGn
@@ -75326,18 +75321,18 @@ oRg
ovq
lAE
vja
-nSx
-hsz
-tkh
-gRA
-dJt
-gLq
-owc
-owc
-owc
-iCU
-gRA
-gRA
+nXL
+wAb
+oSU
+sUW
+nmq
+pes
+dGs
+dGs
+dGs
+oyA
+sUW
+sUW
iBr
qdf
iBr
@@ -75357,26 +75352,26 @@ fWy
gbf
dxW
gbf
-vzu
-fbn
-xcz
-sgI
-sgI
-sgI
-ubo
-ubo
-fbn
-hJu
-tEU
-tWz
-duV
-lAM
-sgI
-sgI
-sgI
-ulN
-fbn
-toN
+csg
+ndo
+whb
+tYX
+tYX
+tYX
+utB
+utB
+ndo
+iXB
+suD
+jCx
+dIv
+wtJ
+tYX
+tYX
+tYX
+xjR
+ndo
+lmJ
gbf
dxW
gbf
@@ -75493,19 +75488,19 @@ kPz
cAW
cAW
cAW
-hCG
-jii
-jii
-rAw
-kiT
-wyU
-ujs
-nmm
-nmm
-wJd
-qBw
-jii
-wHV
+cbC
+iiK
+iiK
+onY
+xPF
+gFF
+cTg
+ijE
+ijE
+gJP
+qwo
+iiK
+hgy
puE
cJv
eqQ
@@ -75538,18 +75533,18 @@ uVH
xFL
pmC
xFL
-svS
-ntx
-kSe
-leN
-tkh
-gLq
-fOe
-rez
-xJn
-owc
-cRM
-gRA
+vob
+cxp
+ibE
+uLo
+oSU
+pes
+lYd
+uhW
+xbf
+dGs
+oGZ
+sUW
bhX
iBr
xMO
@@ -75569,26 +75564,26 @@ gbf
gbf
tOM
tOM
-nYQ
-fbn
-fbn
-fEv
-uTw
-tEU
-tEU
-nKf
-sgI
-tEU
-tEU
-hWG
-qQy
-gWA
-gWA
-khw
-htT
-fbn
-fbn
-gMl
+vlE
+ndo
+ndo
+xZL
+qKr
+suD
+suD
+fcR
+tYX
+suD
+suD
+qyX
+pwb
+mXM
+mXM
+lrK
+cTo
+ndo
+ndo
+xJv
tOM
tOM
gbf
@@ -75705,19 +75700,19 @@ emC
cAW
cAW
cAW
-nLO
-jii
-rAw
-rAw
-vsr
-nmm
-nmm
-cYT
-nmm
-wJd
-meE
-wHV
-jii
+pXF
+iiK
+onY
+onY
+fXj
+ijE
+ijE
+fli
+ijE
+gJP
+oka
+hgy
+iiK
qrz
puE
lzn
@@ -75750,18 +75745,18 @@ oRg
ovq
uvn
uZP
-flG
-flG
-tkh
-gRA
-gRA
-gLq
-bIR
-gWq
-xJn
-owc
-lbL
-ubx
+wsA
+wsA
+oSU
+sUW
+sUW
+pes
+nUG
+eHx
+xbf
+dGs
+tKU
+nRl
iyc
bhX
iBr
@@ -75781,26 +75776,26 @@ gbf
tOM
gbf
tOM
-kWT
-xbG
-fbn
-lWy
-sgI
-sgI
-xqi
-tEU
-sgI
-tEU
-hyM
-hXF
-gWA
-rkX
-sgI
-rTY
-vGf
-qtp
-nhm
-jSx
+unJ
+nkw
+ndo
+eSb
+tYX
+tYX
+jvp
+suD
+tYX
+suD
+oAl
+pmf
+mXM
+vYJ
+tYX
+hot
+uVo
+qTp
+eup
+vIP
tOM
gbf
tOM
@@ -75917,19 +75912,19 @@ bQM
cAW
cAW
cAW
-hCG
-jii
-rAw
-rAw
-gFN
-nmm
-nmm
-nmm
-nmm
-wJd
-apg
-jii
-pUG
+cbC
+iiK
+onY
+onY
+kET
+ijE
+ijE
+ijE
+ijE
+gJP
+ngq
+iiK
+tGc
puE
eqQ
qGn
@@ -75962,18 +75957,18 @@ lBE
sNj
erh
ovq
-gRA
-ntx
-kSe
-gRA
-gRA
-gLq
-nyF
-tOc
-tOc
-bgd
-gRA
-gRA
+sUW
+cxp
+ibE
+sUW
+sUW
+pes
+dNd
+cAz
+cAz
+jdE
+sUW
+sUW
bhX
mhR
bhX
@@ -75994,24 +75989,24 @@ tOM
gbf
tOM
tOM
-nYQ
-fbn
-fbn
-xwm
-gjr
-sgI
-fgq
-drk
-tEU
-tEU
-sgI
-gWA
-sgI
-sgI
-oLX
-fbn
-fbn
-gMl
+vlE
+ndo
+ndo
+buY
+xHA
+tYX
+kby
+pxo
+suD
+suD
+tYX
+mXM
+tYX
+tYX
+vpm
+ndo
+ndo
+xJv
tOM
tOM
gbf
@@ -76129,19 +76124,19 @@ cAW
bQM
cAW
cAW
-nLO
-jii
-rAw
-rAw
-srQ
-nmm
-sUX
-nmm
-nmm
-nEN
-sJH
-jii
-jii
+pXF
+iiK
+onY
+onY
+nvZ
+ijE
+qkK
+ijE
+ijE
+bvO
+bbt
+iiK
+iiK
mPW
vvM
tet
@@ -76175,16 +76170,16 @@ ovq
uvn
ovq
ovq
-flG
-tkh
-gRA
-fXo
-gLq
-owc
-mrG
-owc
-gLq
-oQS
+wsA
+oSU
+sUW
+emT
+pes
+dGs
+tph
+dGs
+pes
+gpW
lco
oZx
bhX
@@ -76206,24 +76201,24 @@ pYB
tOM
gbf
tOM
-qrB
-xbG
-fbn
-xwm
-xwm
-sgI
-tEU
-sgI
-tEU
-tEU
-sgI
-xct
-rTY
-oLX
-wYT
-qtp
-nhm
-aFL
+tyo
+nkw
+ndo
+buY
+buY
+tYX
+suD
+tYX
+suD
+suD
+tYX
+aHm
+hot
+vpm
+vgT
+qTp
+eup
+rUc
tOM
gbf
tOM
@@ -76341,19 +76336,19 @@ bce
kPz
bce
cAW
-hCG
-jii
-rAw
-xCg
-xKP
-spl
-oNx
-uuJ
-oNx
-jWy
-qBw
-jii
-jii
+cbC
+iiK
+onY
+dCi
+mjG
+tZP
+gyF
+tcb
+gyF
+qGx
+qwo
+iiK
+iiK
jqt
pTU
wPz
@@ -76419,22 +76414,22 @@ eTr
gbf
rsR
tOM
-nYQ
-fbn
-fbn
-fbn
-sHe
-tEU
-xlC
-tEU
-tEU
-sgI
-wdo
-nEP
-fbn
-qtp
-fbn
-gMl
+vlE
+ndo
+ndo
+ndo
+ljO
+suD
+gND
+suD
+suD
+tYX
+uqF
+jBb
+ndo
+qTp
+ndo
+xJv
tOM
oEQ
gbf
@@ -76553,19 +76548,19 @@ cAW
fiq
cAW
cAW
-nLO
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-jii
-jii
+pXF
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
+iiK
oUg
oUg
oUg
@@ -76631,22 +76626,22 @@ pYB
tOM
gbf
tOM
-kWT
-oBc
-xbG
-fbn
-fbn
-fbn
-aLz
-tEU
-tEU
-vcn
-fbn
-qtp
-fbn
-nhm
-oBc
-jSx
+unJ
+lnk
+nkw
+ndo
+ndo
+ndo
+mcW
+suD
+suD
+hHP
+ndo
+qTp
+ndo
+eup
+lnk
+vIP
tOM
gbf
tOM
@@ -76765,19 +76760,19 @@ cAW
fiq
fiq
tan
-hCG
-jii
-jii
-jii
-jii
-jii
-qBw
-qBw
-qBw
-qBw
-jii
-jii
-jii
+cbC
+iiK
+iiK
+iiK
+iiK
+iiK
+qwo
+qwo
+qwo
+qwo
+iiK
+iiK
+iiK
oUg
oUg
oUg
@@ -76845,18 +76840,18 @@ gbf
tOM
tOM
tOM
-qrB
-oBc
-xbG
-fbn
-fbn
-oQp
-hXP
-fbn
-fbn
-nhm
-oBc
-aFL
+tyo
+lnk
+nkw
+ndo
+ndo
+huR
+snp
+ndo
+ndo
+eup
+lnk
+rUc
tOM
tOM
tOM
@@ -76977,19 +76972,19 @@ tan
tan
tan
tan
-hCG
-hCG
-nLO
-hCG
-nLO
-hCG
-wHV
-kmL
-wHV
-kmL
-hCG
-hCG
-hCG
+cbC
+cbC
+pXF
+cbC
+pXF
+cbC
+hgy
+aIN
+hgy
+aIN
+cbC
+cbC
+cbC
vnr
vnr
vnr
@@ -77059,14 +77054,14 @@ gbf
rsR
tOM
tOM
-kWT
-oBc
-qOZ
-cnU
-cvf
-qib
-oBc
-jSx
+unJ
+lnk
+qts
+iwG
+mgJ
+oaw
+lnk
+vIP
tOM
tOM
oEQ
@@ -77452,9 +77447,9 @@ uYi
xDw
cAW
bQM
-gjm
+gbs
pcu
-ihA
+rpE
bQM
rBF
dzl
@@ -77662,13 +77657,13 @@ bec
uYi
sDS
xDw
-iIw
-rQt
-eyB
-pFE
-mjW
-rQt
-grn
+sAe
+xkO
+eId
+itY
+afA
+xkO
+urj
dzl
mQV
iBr
@@ -77874,13 +77869,13 @@ mfF
uYi
lOy
lRT
-jGK
+imr
afk
afk
hkh
afk
afk
-hfJ
+lLi
dzl
iBr
iBr
@@ -78086,13 +78081,13 @@ hXG
uYi
sgJ
xDw
-jGK
+imr
afk
afk
pcu
afk
afk
-hfJ
+lLi
dzl
iBr
iBr
@@ -78298,13 +78293,13 @@ ncb
uYi
qhP
xDw
-jGK
+imr
afk
afk
hkh
afk
afk
-hfJ
+lLi
dzl
ksY
iBr
@@ -78510,13 +78505,13 @@ cUd
ncb
sXP
xDw
-xtI
-rhR
-dfw
-lJb
-ozB
-rhR
-mtM
+fHN
+qUn
+vrC
+eQy
+foE
+qUn
+oZv
rBF
lwn
iBr
@@ -78724,9 +78719,9 @@ wBE
xDw
cAW
bQM
-gjm
+gbs
pcu
-ihA
+rpE
bQM
bQM
rBF
@@ -79134,14 +79129,14 @@ hir
hir
hir
dOX
-nCS
+fEa
cEb
cEb
cEb
cEb
cEb
cEb
-dlg
+pPK
dOX
sIJ
dOX
@@ -80655,10 +80650,10 @@ bQM
cAW
bzO
bzO
-teE
+rVh
axx
axx
-aDj
+hcC
bzO
bzO
bzO
@@ -80866,12 +80861,12 @@ ogf
ogf
ogf
tsc
-mJp
-jEq
+qZN
+btJ
aeo
aeo
-llf
-mJp
+fhq
+qZN
mvF
kkU
kkU
@@ -82351,10 +82346,10 @@ scM
scM
scM
scM
-wzN
+ehW
qQl
qQl
-vIH
+tJS
scM
scM
scM
@@ -82563,10 +82558,10 @@ jZk
akZ
lOe
lnK
-pQm
+yhe
hqb
hqb
-xXP
+lcI
lnK
vJL
eZi
@@ -82761,7 +82756,7 @@ nGZ
hjW
hjW
nGZ
-obQ
+hLn
sYB
oTP
qQl
@@ -83366,25 +83361,25 @@ nGZ
hjW
hjW
nGZ
-grz
-gqC
-vHk
-ntW
-aKs
-wBV
-tPR
+qCj
+cSr
+bEi
+pDb
+mZh
+kMB
+uCV
sjd
cEb
nFJ
cEb
cEb
-qxW
-oht
-oht
-oht
-oht
-oht
-hxp
+sUP
+lPZ
+lPZ
+lPZ
+lPZ
+lPZ
+oeU
bxy
cUd
cUd
@@ -83397,7 +83392,7 @@ nGZ
hjW
hjW
nGZ
-kKy
+ebw
aic
ckr
qQl
@@ -83578,7 +83573,7 @@ nGZ
hjW
hjW
nGZ
-lCG
+hee
xeO
xeO
xeO
@@ -83596,7 +83591,7 @@ xeO
xfb
yat
xeO
-eOQ
+hRm
nGZ
nGZ
rJW
@@ -83790,7 +83785,7 @@ ntZ
nGZ
nGZ
nGZ
-lCG
+hee
bym
uKx
uKx
@@ -83808,18 +83803,18 @@ xeO
cAU
uyp
xeO
-esy
+svH
nGZ
lRT
lRT
-utl
-pYe
+qdA
+ulp
lRT
-utl
-pYe
+qdA
+ulp
lRT
-utl
-pYe
+qdA
+ulp
lRT
scM
scM
@@ -83827,9 +83822,9 @@ scM
scM
scM
bQM
-gjm
+gbs
pcu
-hfJ
+lLi
bQM
scM
aOC
@@ -84002,7 +83997,7 @@ lRT
lRT
lRT
hTo
-lCG
+hee
lpl
jVE
vzn
@@ -84020,7 +84015,7 @@ xeO
mQB
aTE
xeO
-uVM
+dPB
nGZ
lRT
lRT
@@ -84039,9 +84034,9 @@ bQM
bQM
bQM
bQM
-gjm
+gbs
pcu
-hfJ
+lLi
bQM
scM
eNv
@@ -84214,7 +84209,7 @@ bQM
bQM
xDw
oEN
-lCG
+hee
fSz
lIv
lIv
@@ -84232,7 +84227,7 @@ xeO
fCW
myf
xeO
-dTQ
+ipR
nGZ
xDw
bQM
@@ -84251,9 +84246,9 @@ bQM
bQM
bQM
bQM
-gjm
+gbs
pcu
-hfJ
+lLi
bQM
scM
xdE
@@ -84426,25 +84421,25 @@ bQM
bQM
lRT
lRT
-niZ
-otS
-otS
-otS
-otS
-otS
-qgY
-otS
-otS
-otS
-otS
-otS
-otS
-wXR
-otS
-otS
-otS
-otS
-vgA
+kUB
+kje
+kje
+kje
+kje
+kje
+fPo
+kje
+kje
+kje
+kje
+kje
+kje
+xUP
+kje
+kje
+kje
+kje
+huq
lRT
lRT
bQM
@@ -84460,18 +84455,18 @@ bQM
bQM
bQM
bQM
-rfI
-rQt
-rQt
-eyB
-pFE
-ocW
-eyB
-pFE
-ocW
-rQt
-rQt
-grn
+uBH
+xkO
+xkO
+eId
+itY
+bVb
+eId
+itY
+bVb
+xkO
+xkO
+urj
bQM
bQM
bQM
@@ -84672,7 +84667,7 @@ bQM
bQM
bQM
bQM
-gjm
+gbs
afk
afk
afk
@@ -84683,7 +84678,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -84884,7 +84879,7 @@ bQM
bQM
bQM
bQM
-gjm
+gbs
afk
afk
afk
@@ -84895,7 +84890,7 @@ pcu
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -85096,7 +85091,7 @@ bQM
bQM
bQM
bQM
-gjm
+gbs
afk
afk
afk
@@ -85107,7 +85102,7 @@ hkh
afk
afk
afk
-hfJ
+lLi
bQM
bQM
bQM
@@ -85308,18 +85303,18 @@ bQM
bQM
bQM
bQM
-rcy
-rhR
-rhR
-dfw
-lJb
-ngo
-dfw
-lJb
-ngo
-rhR
-rhR
-mtM
+rji
+qUn
+qUn
+vrC
+eQy
+ciH
+vrC
+eQy
+ciH
+qUn
+qUn
+oZv
bQM
bQM
bQM
diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm
index 82ac4eede517..fcaef21ea4d4 100644
--- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm
@@ -14,7 +14,7 @@
/turf/open/floor/wood,
/area/template_noop)
"bO" = (
-/obj/item/storage/belt/marine/quackers,
+/obj/item/storage/belt/quackers,
/turf/open/gm/river/pool,
/area/template_noop)
"cb" = (
@@ -37,10 +37,6 @@
/area/template_noop)
"cq" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/clothing/head/cueball{
- pixel_x = 32;
- pixel_y = -2
- },
/obj/item/reagent_container/food/drinks/bottle/beer/craft/tuxedo{
pixel_x = -9;
pixel_y = 9
@@ -1125,7 +1121,7 @@
/turf/open/floor/prison/darkbrown2,
/area/template_noop)
"Xn" = (
-/obj/item/storage/belt/shotgun/full/quackers{
+/obj/item/storage/belt/quackers{
layer = 3.1
},
/obj/item/trash/crushed_cup{
diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
index 20b96cfc3da1..b164cad66708 100644
--- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
+++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
@@ -474,7 +474,7 @@
/obj/structure/prop/invuln{
desc = "Its eyes follow you around through the ice.";
dir = 4;
- icon = 'icons/mob/xenos/queen.dmi';
+ icon = 'icons/mob/xenos/castes/tier_4/queen.dmi';
icon_state = "Normal Queen Knocked Down";
layer = 2.5;
name = "frozen creature";
@@ -9926,7 +9926,7 @@
/area/shiva/interior/aerodrome)
"gQL" = (
/obj/structure/closet/cabinet,
-/obj/item/clothing/under/darkred,
+/obj/item/clothing/under/color/darkred,
/turf/open/floor/wood,
/area/shiva/interior/colony/botany)
"gQR" = (
diff --git a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm
index da4415b5bcea..93565f4481f5 100644
--- a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm
+++ b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm
@@ -56,7 +56,7 @@
/turf/open/floor/shiva/floor3,
/area/shiva/interior/colony/s_admin)
"cL" = (
-/obj/item/prop/colony/folded_bedroll,
+/obj/item/roller/bedroll,
/turf/open/floor/shiva/bluefull,
/area/shiva/interior/colony/s_admin)
"cO" = (
@@ -1263,7 +1263,7 @@
/turf/open/floor/shiva/north,
/area/shiva/interior/colony/s_admin)
"TG" = (
-/obj/item/prop/colony/folded_bedroll,
+/obj/item/roller/bedroll,
/turf/open/floor/shiva/redfull/west,
/area/shiva/interior/colony/s_admin)
"TI" = (
diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index 0cbf9c9a9e30..4ba133caa595 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -14772,7 +14772,7 @@
/area/varadero/interior/technical_storage)
"lXv" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/holostool,
+/obj/item/stool,
/turf/open/floor/wood,
/area/varadero/interior/beach_bar)
"lYi" = (
@@ -25795,10 +25795,6 @@
/area/varadero/exterior/lz1_near)
"uLP" = (
/obj/structure/surface/rack,
-/obj/item/clothing/head/caphat{
- pixel_x = 2;
- pixel_y = 9
- },
/obj/item/clothing/head/cmcap,
/turf/open/floor/shiva/multi_tiles,
/area/varadero/interior/bunks)
@@ -28247,7 +28243,7 @@
/turf/open/floor/plating/icefloor/asteroidplating,
/area/varadero/interior/comms2)
"wyE" = (
-/obj/item/storage/belt/marine/quackers,
+/obj/item/storage/belt/quackers,
/turf/open/gm/river/shallow_ocean_shallow_ocean,
/area/varadero/exterior/pool)
"wzb" = (
diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
index 927aa971785a..32b0903b6f2d 100644
--- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
+++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
@@ -18434,7 +18434,7 @@
/turf/open/floor/strata/white_cyan2/west,
/area/strata/ag/interior/outpost/security)
"dyZ" = (
-/obj/structure/holostool,
+/obj/item/stool,
/turf/open/floor/strata/floor3/east,
/area/strata/ag/interior/outside/engineering/parts_storage)
"dzo" = (
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index e85786719749..91e67cfcb703 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -34520,7 +34520,7 @@
/obj/item/tool/screwdriver,
/obj/item/bananapeel{
desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the L42A Battle Rifle, M44 Combat Revolver, and M46C Pulse Rifle. This one appears to be covered in gun oil";
- icon = 'icons/obj/items/weapons/guns/attachments.dmi';
+ icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi';
icon_state = "iffbarrel";
name = "Broken B8 Smart-Scope";
pixel_x = -3;
diff --git a/maps/predship/regular.dmm b/maps/predship/regular.dmm
index 5524370c0847..0e381816f865 100644
--- a/maps/predship/regular.dmm
+++ b/maps/predship/regular.dmm
@@ -371,10 +371,6 @@
health = 80
},
/obj/structure/window/reinforced,
-/obj/item/clothing/mask/gas/voice/space_ninja{
- desc = "A close-fitting mask that appears to only cover half of the face. One can only wonder who would make such a thing.";
- name = "strange half-mask"
- },
/turf/open/floor/holofloor/cult/south,
/area/yautja)
"bP" = (
diff --git a/maps/templates/lazy_templates/clf_ert_station.dmm b/maps/templates/lazy_templates/clf_ert_station.dmm
index b3cccf7f03cd..25f28adb02be 100644
--- a/maps/templates/lazy_templates/clf_ert_station.dmm
+++ b/maps/templates/lazy_templates/clf_ert_station.dmm
@@ -1461,7 +1461,7 @@
/turf/open/floor/wood,
/area/adminlevel/ert_station/clf_station)
"OG" = (
-/obj/item/storage/belt/shotgun/full/quackers,
+/obj/item/storage/belt/quackers,
/turf/open/gm/river,
/area/adminlevel/ert_station/clf_station)
"OK" = (