diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 3ae6ae554c..2bc2d22ea6 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -298,6 +298,9 @@ underlays -= gun_underlay gun_underlay = null +/obj/item/storage/pouch/pistol/alt + icon_state = "pistol_alt" + ///CO pouch. This pouch can hold only 1 of each type of item: 1 sidearm, 1 pair of binoculars, 1 CO tablet /obj/item/storage/pouch/pistol/command name = "command pouch" diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 22ee703ca2..21c43eaca2 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -1063,16 +1063,59 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/pap, WEAR_BODY) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/pap, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST) //limbs new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE) +/datum/equipment_preset/upp/police/riot + name = "UPP People's Armed Police Officer - Riot" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "People's Armed Police Militsioner" + role_comm_title = "MILTSY" + paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/cmb + access = list(ACCESS_UPP_GENERAL, ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/upp/police/riot/load_gear(mob/living/carbon/human/new_human) + + new_human.undershirt = "undershirt" + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked/police, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp, WEAR_FACE) + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/pap, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/type23, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_L_HAND) + /datum/equipment_preset/upp/prisoner name = "UPP Prisoner" flags = EQUIPMENT_PRESET_EXTRA diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 3cc4b0b606..90c42f9632 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -122,10 +122,18 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP +/datum/equipment_preset/uscm/pfc/upp/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/pfc/upp/lesser_rank name = parent_type::name + " (Lesser Rank)" paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/uscm/pfc/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/pfc/forecon name = "FORECON Squad Rifleman" paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1) @@ -166,10 +174,18 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP +/datum/equipment_preset/uscm/sg/upp/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/sg/upp/lesser_rank name = parent_type::name + " (Lesser Rank)" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/uscm/sg/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/sg/forecon name = "FORECON Squad Smartgunner" paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) @@ -387,10 +403,18 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP +/datum/equipment_preset/uscm/medic/upp/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/medic/upp/lesser_rank name = parent_type::name + " (Lesser Rank)" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/uscm/medic/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/medic/forecon name = "FORECON Squad Corpsman" assignment = "Squad Corpsman" @@ -423,6 +447,10 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP +/datum/equipment_preset/uscm/tl/upp/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/tl/forecon name = "FORECON Assistant Squad Leader" assignment = "Assistant Squad Leader" @@ -491,10 +519,18 @@ faction_group = list(FACTION_UPP) faction = FACTION_UPP +/datum/equipment_preset/uscm/leader/upp/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/leader/upp/lesser_rank name = parent_type::name + " (Lesser Rank)" paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/uscm/leader/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm/leader/forecon name = "FORECON Squad Leader" assignment = "Squad Leader" diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 46b1ac6e69..55ba3c4739 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -677,6 +677,10 @@ name = parent_type::name + " (Lesser Rank)" paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0) +/datum/equipment_preset/uscm_ship/so/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human) + new_human.undershirt = "Naval Infantry Telnyashka" + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) + /datum/equipment_preset/uscm_ship/so/upp/equipped name = "UPP Platoon Commander (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE diff --git a/icons/mob/humans/onmob/contained/wy_goons.dmi b/icons/mob/humans/onmob/contained/wy_goons.dmi index 475f1d7dde..26a098a29d 100644 Binary files a/icons/mob/humans/onmob/contained/wy_goons.dmi and b/icons/mob/humans/onmob/contained/wy_goons.dmi differ diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi index 8833b592ba..37d977ea17 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/obj/items/clothing/pouches.dmi b/icons/obj/items/clothing/pouches.dmi index a6ccd6a1d0..d1c009b10f 100644 Binary files a/icons/obj/items/clothing/pouches.dmi and b/icons/obj/items/clothing/pouches.dmi differ diff --git a/maps/shuttles/dropship_upp.dmm b/maps/shuttles/dropship_upp.dmm index c7ea3f72a5..0e83b4a0b7 100644 --- a/maps/shuttles/dropship_upp.dmm +++ b/maps/shuttles/dropship_upp.dmm @@ -33,22 +33,6 @@ }, /turf/open/floor/strata/floor3/east, /area/shuttle/ds_upp) -"fN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/bed/chair/vehicle{ - dir = 4; - pixel_x = -9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = -12 - }, -/turf/open/floor/strata/floor3/east, -/area/shuttle/ds_upp) "hg" = ( /turf/closed/shuttle/ert{ icon_state = "upp9" @@ -71,7 +55,7 @@ icon_state = "S"; pixel_y = -1 }, -/turf/open/floor/strata/floor2, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "kt" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -80,7 +64,7 @@ pixel_x = 23; network = list("Chapaev","Akademia Nauk") }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "ld" = ( /obj/effect/attach_point/weapon/midway/left_wing{ @@ -107,7 +91,7 @@ dir = 1 }, /obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "nZ" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -116,7 +100,7 @@ pixel_x = -23; network = list("Chapaev","Akademia Nauk") }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "pv" = ( /turf/closed/shuttle/ert{ @@ -161,7 +145,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp{ id = "aft_door" }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "wO" = ( /turf/closed/shuttle/ert{ @@ -179,7 +163,7 @@ dir = 8; pixel_x = -14 }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "xE" = ( /turf/closed/shuttle/ert{ @@ -202,6 +186,9 @@ icon_state = "upp21" }, /area/shuttle/ds_upp) +"BD" = ( +/turf/open/floor/strata/grey_multi_tiles, +/area/shuttle/ds_upp) "BT" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_2"; @@ -213,7 +200,7 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = 30 }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "DG" = ( /turf/closed/shuttle/ert{ @@ -404,7 +391,7 @@ pixel_x = -6; pixel_y = -16 }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "Sn" = ( /obj/effect/decal/warning_stripes{ @@ -424,7 +411,7 @@ /area/shuttle/ds_upp) "Th" = ( /obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "TG" = ( /turf/closed/shuttle/ert{ @@ -467,7 +454,7 @@ icon_state = "N"; pixel_y = 1 }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "Xe" = ( /obj/effect/attach_point/weapon/midway/left_fore, @@ -503,7 +490,7 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = -30 }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "Zh" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -511,7 +498,7 @@ dir = 4; pixel_x = 14 }, -/turf/open/floor/strata/floor3/east, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ds_upp) "Zm" = ( /turf/closed/shuttle/ert{ @@ -638,7 +625,7 @@ HB Js ey Yn -fN +hS hS hS hS @@ -648,7 +635,7 @@ cS um TO si -Yn +BD "} (7,1,1) = {" Hk diff --git a/maps/shuttles/ert_upp_shuttle.dmm b/maps/shuttles/ert_upp_shuttle.dmm index 4783538350..ae1abcdaed 100644 --- a/maps/shuttles/ert_upp_shuttle.dmm +++ b/maps/shuttles/ert_upp_shuttle.dmm @@ -4,8 +4,21 @@ icon_state = "upp4" }, /area/shuttle/ert) +"b" = ( +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles/west, +/area/shuttle/ert) "c" = ( -/turf/open/shuttle/dropship/light_grey_top_right, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/strata/floor3/east, +/area/shuttle/ert) +"d" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ert) "e" = ( /obj/docking_port/mobile/emergency_response/ert3, @@ -19,14 +32,8 @@ icon_state = "upp5" }, /area/shuttle/ert) -"h" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/shuttle/ert) "i" = ( -/turf/open/shuttle/dropship/light_grey_bottom_left, +/turf/open/floor/strata/multi_tiles/west, /area/shuttle/ert) "j" = ( /turf/closed/shuttle/ert{ @@ -34,7 +41,11 @@ }, /area/shuttle/ert) "k" = ( -/turf/open/shuttle/dropship/light_grey_single_wide_left_to_right, +/obj/effect/attach_point/crew_weapon/midway{ + attach_id = 9; + ship_tag = "dropship_upp" + }, +/turf/open/floor/strata/floor3/east, /area/shuttle/ert) "l" = ( /turf/closed/shuttle/ert{ @@ -47,6 +58,18 @@ icon_state = "upp23" }, /area/shuttle/ert) +"o" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/bed/chair/vehicle{ + pixel_x = 9; + dir = 8 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/shuttle/ert) "p" = ( /turf/closed/shuttle/ert{ icon_state = "upp_rightengine" @@ -64,7 +87,10 @@ }, /area/shuttle/ert) "s" = ( -/turf/open/shuttle/dropship/light_grey_top_left, +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/turf/open/floor/strata/floor3/east, /area/shuttle/ert) "u" = ( /turf/closed/shuttle/ert{ @@ -77,9 +103,7 @@ }, /area/shuttle/ert) "w" = ( -/turf/closed/shuttle/ert{ - icon_state = "upp2" - }, +/turf/open/floor/strata/floor3/east, /area/shuttle/ert) "x" = ( /turf/closed/shuttle/ert{ @@ -102,15 +126,20 @@ }, /area/shuttle/ert) "B" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/barricade/handrail/strata{ + layer = 3.5 }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ert) "C" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/syndicate, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/gun_rack/type71, +/turf/open/floor/strata/floor3/east, /area/shuttle/ert) "E" = ( /turf/closed/shuttle/ert{ @@ -123,9 +152,13 @@ opacity = 0 }, /area/shuttle/ert) -"G" = ( -/obj/structure/machinery/door/airlock/almayer/generic, -/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, +"H" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/largecrate/random/barrel/red{ + stuff = list(/obj/item/clothing/under/marine/veteran/UPP,/obj/item/clothing/gloves/marine,/obj/item/clothing/gloves/marine/brown,/obj/item/clothing/gloves/marine/joe,/obj/item/clothing/shoes/marine/joe,/obj/item/clothing/shoes/marine/upp/guard,/obj/item/clothing/shoes/marine/upp); + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ert) "I" = ( /turf/closed/shuttle/ert{ @@ -133,21 +166,29 @@ }, /area/shuttle/ert) "J" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv{ - pixel_x = 2; - pixel_y = -5 +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/largecrate/supply/ammo/type71{ + parts_type = /obj/item/stack/sheet/metal; + pixel_x = 1; + anchored = 1 }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/obj/structure/largecrate/random/case{ + stuff = list(/obj/item/weapon/shield/riot/metal,/obj/item/weapon/classic_baton); + parts_type = /obj/item/stack/sheet/metal; + pixel_y = 11; + pixel_x = 3; + anchored = 1 + }, +/turf/open/floor/strata/floor3/east, /area/shuttle/ert) "K" = ( /turf/template_noop, /area/template_noop) -"N" = ( -/turf/open/shuttle/dropship/light_grey_bottom_right, -/area/shuttle/ert) "O" = ( -/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/turf/open/floor/strata/multi_tiles/west, /area/shuttle/ert) "P" = ( /turf/closed/shuttle/ert{ @@ -161,11 +202,25 @@ }, /area/shuttle/ert) "S" = ( -/obj/structure/bed/chair/dropship/passenger, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/turf/closed/shuttle/ert{ + icon_state = "uppwall" + }, /area/shuttle/ert) "T" = ( -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = 1 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/strata/grey_multi_tiles, +/area/shuttle/ert) +"U" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ert) "V" = ( /turf/closed/shuttle/ert{ @@ -173,34 +228,44 @@ opacity = 0 }, /area/shuttle/ert) +"W" = ( +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/shuttle/ert) "X" = ( /obj/structure/blocker/invisible_wall, /obj/structure/machinery/computer/shuttle/ert, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/shuttle/ert) "Y" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp{ + id = "aft_door" }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/turf/open/floor/strata/floor3/east, /area/shuttle/ert) "Z" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/regular, -/obj/item/storage/belt/medical/lifesaver/upp/full, -/obj/item/device/healthanalyzer, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/bed/chair/vehicle{ + dir = 4; + pixel_x = -9 + }, +/turf/open/floor/strata/grey_multi_tiles, /area/shuttle/ert) (1,1,1) = {" K z a -G Q a a -G +a +a a j P @@ -211,11 +276,11 @@ e K v C -T -B -B +U B -T +Z +Z +Z Z u a @@ -227,56 +292,56 @@ z q s O -O -O -O -O i -T -T +i +i +i +i +d +w T Y "} (4,1,1) = {" I X -k -S -S +W +w +w S S S k -O -O -O +d +w +T w "} (5,1,1) = {" E m c -O -O -O -O -O -N -T -T +b +i +i +i +i +i +d +w T -Y +w "} (6,1,1) = {" K v J -T -h -h -h -T -Z +H +B +o +o +o +o y g g @@ -286,11 +351,11 @@ x K E g -G g g g -G +g +g g p r