diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c18b66d4..6a47ebdb 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -101,7 +101,7 @@ "abW" = (/obj/effect/landmark/secequipment,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/showroomfloor,/area/security/main) "abX" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/showroomfloor,/area/security/main) "abY" = (/obj/machinery/newscaster/security_unit{pixel_x = -30},/obj/machinery/camera{c_tag = "Head of Security's Office"; dir = 4},/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/wood,/turf/open/floor/carpet/red,/area/crew_quarters/heads/hos) -"abZ" = (/obj/structure/chair/comfy/black,/turf/open/floor/carpet/red,/area/crew_quarters/heads/hos) +"abZ" = (/obj/structure/chair/comfy/black,/obj/effect/landmark/start/head_of_security,/turf/open/floor/carpet/red,/area/crew_quarters/heads/hos) "aca" = (/turf/open/floor/carpet/red,/area/crew_quarters/heads/hos) "acb" = (/obj/machinery/holopad,/turf/open/floor/carpet/red,/area/crew_quarters/heads/hos) "acc" = (/obj/machinery/keycard_auth{pixel_x = 24; pixel_y = 10},/obj/structure/table/wood,/obj/item/radio/off,/obj/item/taperecorder,/turf/open/floor/carpet/red,/area/crew_quarters/heads/hos) @@ -252,7 +252,7 @@ "aeR" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/prison) "aeS" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/prison) "aeT" = (/obj/structure/rack,/obj/item/storage/box/rubbershot{pixel_x = -3; pixel_y = 3},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/storage/box/rubbershot{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/rubbershot,/obj/item/storage/box/rubbershot,/obj/item/storage/box/rubbershot{pixel_x = 3; pixel_y = -3},/obj/item/storage/box/rubbershot{pixel_x = 3; pixel_y = -3},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) -"aeU" = (/obj/structure/rack,/obj/item/storage/box/teargas{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/handcuffs,/obj/item/storage/box/flashbangs{pixel_x = 3; pixel_y = -3},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) +"aeU" = (/obj/structure/rack,/obj/item/storage/box/teargas{pixel_x = -3; pixel_y = 3},/obj/item/storage/box/handcuffs,/obj/item/storage/box/flashbangs{pixel_x = 3; pixel_y = -3},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/item/clothing/mask/gas/sechailer{pixel_x = 3; pixel_y = -3},/obj/item/clothing/mask/gas/sechailer,/obj/item/clothing/mask/gas/sechailer{pixel_x = -3; pixel_y = 3},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) "aeV" = (/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/ai_monitored/security/armory) "aeW" = (/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/ai_monitored/security/armory) "aeX" = (/obj/structure/closet/secure_closet/freezer/cream_pie,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/plasteel,/area/crew_quarters/theatre/clown) @@ -317,7 +317,7 @@ "age" = (/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-2"},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "prison blast door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/security/brig) "agf" = (/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "prison blast door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/security/brig) "agg" = (/turf/closed/wall/r_wall,/area/security/warden) -"agh" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30},/obj/machinery/camera{c_tag = "Brig Control Room"; dir = 4},/obj/machinery/light{dir = 8},/obj/structure/rack,/obj/item/clothing/mask/gas/sechailer{pixel_x = -3; pixel_y = 3},/obj/item/clothing/mask/gas/sechailer,/obj/item/clothing/mask/gas/sechailer{pixel_x = 3; pixel_y = -3},/turf/open/floor/plasteel/showroomfloor,/area/security/warden) +"agh" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30},/obj/machinery/camera{c_tag = "Brig Control Room"; dir = 4},/obj/machinery/light{dir = 8},/obj/machinery/rnd/production/techfab/department/security,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "agi" = (/obj/machinery/computer/prisoner/management,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "agj" = (/obj/machinery/computer/security,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "agk" = (/obj/machinery/computer/secure_data,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) @@ -1446,7 +1446,7 @@ "aBP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "aBQ" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "aBR" = (/obj/effect/turf_decal/tile/neutral,/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/dorms) -"aBS" = (/obj/machinery/light_switch{pixel_y = -25},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/crew_quarters/dorms) +"aBS" = (/obj/machinery/light_switch{pixel_y = -25},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/cable{icon_state = "4-8"},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/crew_quarters/dorms) "aBT" = (/turf/closed/wall,/area/crew_quarters/theatre) "aBU" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/stairs/right{dir = 8},/area/crew_quarters/fitness) "aBV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/crew_quarters/fitness) @@ -3373,7 +3373,7 @@ "bmS" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bmT" = (/obj/structure/table/reinforced,/obj/item/folder/white,/obj/item/pen,/obj/item/reagent_containers/glass/bottle/epinephrine,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bmU" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bmV" = (/obj/structure/table/reinforced,/turf/open/floor/plasteel/white,/area/medical/medbay/central) +"bmV" = (/obj/structure/table/reinforced,/obj/item/toy/plush/mammal/winterdawn{pixel_x = 3; pixel_y = 5},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bmW" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bmX" = (/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bmY" = (/obj/machinery/power/apc{areastring = "/area/security/checkpoint/medical"; dir = 8; name = "Medbay Security APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/security/checkpoint/medical) @@ -4249,7 +4249,7 @@ "bDL" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall,/area/medical/psych) "bDM" = (/obj/machinery/door/airlock/medical/glass{name = "Recovery Room"},/turf/open/floor/plasteel/white,/area/medical/sleeper) "bDN" = (/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bDO" = (/obj/machinery/firealarm{pixel_y = 24},/turf/open/floor/plasteel/white,/area/medical/medbay/central) +"bDO" = (/obj/machinery/firealarm{pixel_y = 24},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDP" = (/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/stack/packageWrap,/obj/item/pen,/obj/machinery/requests_console{department = "Medbay"; departmentType = 1; name = "Medbay RC"; pixel_y = 30},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDQ" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk,/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDR" = (/turf/closed/wall/r_wall,/area/crew_quarters/heads/cmo) @@ -5480,7 +5480,7 @@ "cbu" = (/turf/closed/wall/r_wall,/area/engine/break_room) "cbv" = (/obj/item/twohanded/required/kirbyplants/random,/turf/open/floor/plasteel,/area/ai_monitored/storage/eva) "cbw" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel/dark/corner{dir = 1},/area/engine/break_room) -"cbx" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/closet/firecloset,/turf/open/floor/plasteel/checker,/area/engine/break_room) +"cbx" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/checker,/area/engine/break_room) "cby" = (/turf/closed/wall,/area/security/checkpoint/engineering) "cbz" = (/obj/item/screwdriver{pixel_y = 10},/obj/machinery/button/door{desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; pixel_x = -24; pixel_y = -6; req_access_txt = "10"},/obj/structure/cable{icon_state = "1-2"},/obj/item/radio/off,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/checkpoint/engineering) "cbA" = (/obj/effect/landmark/event_spawn,/turf/open/floor/plasteel,/area/security/checkpoint/engineering) @@ -7060,10 +7060,10 @@ "cJN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/main) "cJP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel,/area/security/main) "cJQ" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel,/area/security/main) -"cJR" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/main) +"cJR" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel,/area/security/main) "cJS" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/main) -"cJT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/rnd/production/techfab/department/security,/obj/effect/turf_decal/stripes/line{dir = 9},/obj/machinery/light{light_color = "#cee5d2"},/turf/open/floor/plasteel/dark,/area/security/main) -"cJU" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/main) +"cJT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{light_color = "#cee5d2"},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/structure/table,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/donkpockets/donkpockethonk,/turf/open/floor/plasteel/dark,/area/security/main) +"cJU" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red{dir = 4},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/security/main) "cJV" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/fore/secondary) "cJW" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plating,/area/maintenance/fore/secondary) "cJX" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/fore/secondary) @@ -7075,7 +7075,7 @@ "cKd" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/trash_pile,/turf/open/floor/plating,/area/maintenance/fore/secondary) "cKg" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel,/area/security/main) "cKi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/plating,/area/maintenance/fore/secondary) -"cKj" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/structure/table,/obj/item/assembly/flash/handheld,/turf/open/floor/plasteel/dark,/area/security/main) +"cKj" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/table,/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/microwave{pixel_y = 4},/turf/open/floor/plasteel/dark,/area/security/main) "cKk" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/fore/secondary) "cKl" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/turf/open/floor/plating,/area/maintenance/fore/secondary) "cKm" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating,/area/maintenance/fore/secondary) @@ -7186,6 +7186,7 @@ "orU" = (/obj/structure/trash_pile,/turf/open/floor/plating,/area/maintenance/port/aft) "owk" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/quartermaster/miningdock) "oyk" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/structure/chair/comfy/black{dir = 4},/turf/open/floor/carpet/black,/area/crew_quarters/bar) +"ozK" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/quartermaster/office) "oQA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/item/twohanded/required/kirbyplants/random,/turf/open/floor/plasteel,/area/engine/atmos) "oRp" = (/obj/structure/cable/yellow{icon_state = "1-8"},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai) "oXx" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/structure/table/plasmaglass,/turf/open/floor/carpet/black,/area/crew_quarters/bar) @@ -7217,6 +7218,7 @@ "rgX" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/white/corner{dir = 8},/area/medical/psych) "rja" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "Gymshutter"; name = "Gym Window Shutter"},/turf/open/floor/plating,/area/crew_quarters/fitness/pool) "roa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) +"ruH" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/carpet,/area/science/misc_lab) "rJH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/mining/glass{dir = 4; name = "Cargo Bay"; req_access_txt = "31"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/quartermaster/sorting) "rQz" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) "sao" = (/obj/machinery/computer/cargo{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel/dark,/area/quartermaster/qm) @@ -7253,6 +7255,7 @@ "wao" = (/obj/structure/table,/obj/item/clipboard,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/item/cartridge/quartermaster,/obj/item/coin/silver,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel/dark,/area/quartermaster/qm) "who" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/medical/sleeper) "wmy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/closed/wall/r_wall,/area/quartermaster/qm) +"wtW" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/carpet/royalblue,/area/crew_quarters/heads/captain) "wwq" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/structure/closet/emcloset,/turf/open/floor/plasteel,/area/quartermaster/miningdock) "wyw" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/kitchen) "wzq" = (/turf/closed/wall,/area/crew_quarters/fitness/pool) @@ -7402,7 +7405,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaVDayUayUayWaxBaTcaVEaVFaVGaUuaVHaVIaUzaUwaTcaVJaVKaVQaPjaPlbfybfAbfMaVRaVSaVSaVSaXsaXtaXtaXuaXvaPlaVUaVVaVWaVXaVYaVZaWaaWbaWcaWdaWdaWdaWdaWdaWdaWdaWdbbVaIPbjDaCVaIPaWeaWfaWgaWhaWiaWjaWkaWlaWmaWnaWoaWpaWqaWraWsaWtaWuaWvaWkaWwaWxaWyaWzaWAaWBaWCaEpaLyaIPbjDcuTkYdaKocxccxjcxjcwdoykoXxaSAcwdcxjcxjnSJgmfxngcvccvdsZXpwBfhzcvvqPbaYoaJiaOHaUdaRwaZWaZWaRwaUgaOHaHTaWDbiKbjwaWPaWQaWRaWSaWSaWTaOMaOMaOMaOMbegaREaREaREaREaREaWVaWWaWXaYIaWZbHHcEvbKybKzaZObKAbfWaQhaQibSaaMzaZPaZObToaMzbseaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJjXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXebtZaRJbeycDSaxBaTcaXhaXiaXjaXkaXkaXlaXmaXnaTcaXoaRTaVLaXpaXpaXpaXqaXraXpaZaaZbaZcaPlaZdaZeaXwbnSaPlaXzaXAaXBaXCaXDaXEaXBaXFaXGaXGaXHaXIaXJaXKaXLaXMaWdbbVaIPbbZaWEaXPaXQaXRaXSaPCaXTaSpaUVaVhaXXaXYaXYaXZaNtaYbaYcaYdaYeaYfaXVaYgaXTaPCaXSaXRaYhaYiaWMbjoaIPbjDcuTmtRvaYaKoaKoaKoaKoaKoaKowRBaKoaKoaJegEHpqCaJiaJiaJiaYraYraYraYraJiaJiaJiaYsaYtdpcaRwaRwaYvcvsaYwaYxaYyaYzroaaYAaYBaYCaOMaOMaYDaOMaOMaOMaOMbegaYEaYFaYFaYFaYFaYFaYGaYHbjsaYJaYKaYLbXubckaZObsdbfWaQhaQibXvaMzbjhaZOaZNaMzbseaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayUayUayWaYOaYPaYQaYRaYSaYSaYSaYSaYTaUuaTcaYUaYVaVLaXpbDvaEFcHBaYZaXpcHCbawaZbaPlaZdaZeaXxbnSaPlaZhaZiaZjaZkaZjaZlaZmaZnaWdaZoaZpaZpaZqaZraZsaZtaWdbbYaLzbnVaZvaZvaZvaZvaZvaZvaZwaZxaZvaXXaXZaZzaZAaZAbeDaZAaZAaZCaYbaYeaZDaZEaZFaZDaZDaZDaZDaZDaZDbFoaIPbjDaJdcuNeBjbgUpXebrhvGObhSbiBbiDbiEbiJaJdbfubfuwIZnUqeQHaZTaZTaZTaZTntQnUqwIZaZUaRwkOEaZWaZWaZXaZYaYsaHTaZZbaababaFbbacbadbaeaVwaNCbafaUkaVwbvhaCwbahaFfbaiaREaREbaiaFfbajaCwbakbalbXwbXubXxcaXcbYbfWaQhaQichSaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUcEAayWbaoaTcaUwaVFbsatISbapaUwbaqaUwaTcbarbasbataXpaXpaXpcHDcHEaXpaZbaZbaZbaPlaZdaZeaXxbnSaPlaZhaZibaxbayaZjbazaZmaZnaWdbaAaZpaZpaZGbaBaZpbaDbbxbbVaIPbbZaZvbaFbaGbaHbaIbaJbcebaLbaMbaNbaOaZAaZAbaPbaQbaPaZAaZAbaRbaSbaCbaTbaUbaXbaYbbzbaVmAxaZDbjoaIPbjDaJdaJdcuTcuTaJdaJdaJdcuTcuTcuTaJdgIpaJdcuOcuSwIZbwobpBbpBbpBbpBbpBbpBqpNwIZiIVbbgbbgiIVkGahHajjdiIVaHTaZZbaababaFbaFbaFbbbhaFbbbhaFbbbhaFbaFbaCwaCwbbibbibbibbibbibbiaCwaCwbbjaQjcdhcdicdtcdvcepceraQhaQicEbcfraRkaRkaRkaRkbofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUcEAayWbaoaTcaUwaVFbsatISbapaUwbaqaUwaTcbarbasbataXpaXpaXpcHDcHEaXpaZbaZbaZbaPlaZdaZeaXxbnSaPlaZhaZibaxbayaZjbazaZmaZnaWdbaAaZpaZpaZGbaBaZpbaDbbxbbVaIPbbZaZvbaFbaGbaHbaIbaJbcebaLbaMbaNbaOaZAaZAbaPbaQbaPaZAaZAbaRbaSbaCbaTbaUbaXbaYbbzbaVwtWaZDbjoaIPbjDaJdaJdcuTcuTaJdaJdaJdcuTcuTcuTaJdgIpaJdcuOcuSwIZbwobpBbpBbpBbpBbpBbpBqpNwIZiIVbbgbbgiIVkGahHajjdiIVaHTaZZbaababaFbaFbaFbbbhaFbbbhaFbbbhaFbaFbaCwaCwbbibbibbibbibbibbiaCwaCwbbjaQjcdhcdicdtcdvcepceraQhaQicEbcfraRkaRkaRkaRkbofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaGRauSauSayUayUayUayUauSayUayUayUayUayUayUayUayUauSauSauSayWaxBaTcaTcaTdaTcaTcaTcaTcaTeaTcaTcbbmbbnbboaXpbDvcIecHFbbqaXpbbrbbsbbraPlaZdaZeaXxbnSaPlbbtaZiaZjbbubbvbbwaZmaZnbjqaZsbbybaZbbabbAaZpwSTbbCbbVaIPbbZbbDbbEbaJbbFbbGbbGbbHbbIbbJbaNbbKaZAaZAbaPbbLbaPaZAaZAbbMbaSbbBbbNbpdaXWbbSaYabaWbbOaZDbjobbUaIPaLPbembembembecbGkbehbembembembeibembembembembeobembembembembembembembemmsEbembembembembembembembcabepbccbcdbaabesbemmsEbembembembembembembekbeobfObembembembembembembbWcEyceraQjciHciIaYKbfHaYKcEzaYLaQiaOXaMzaMzaMzaMzaMzaRIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJjXDbanauSaPcaQqcEEayUawiawhawiawiawiawiawiawiawiawiawhawicEFcbbaxDbcmbcnbcobcpbcpbcpbcqbcrbcsaPjbctbcubcvaXpaXpaXpaXpaXpaXpaPlaPlaPlaPlaZdaZebdybqraPlaZhaZiaZjbcAbcBbcCbcDbcEbcFbcGbcGbcGbcHbcIaZsbcJaWdaQUaNhbbZbcKbcLbaJbcMbcNbcObcPbcQbcRbaNbcSbaPaZAbcTbcUbcTaZAbaPaZCbaSbbPbbNbpdaXWbdVaYabaWmAxaZDbjraIPaIPaIPbaabaabaabaabHGtvUbaabaabaabaabcYbaabaabaabaabaabcZaYzaYzaYzaYzaYzaYzbmtaYzbnPbaabaabaabaabdbbdcbddbdebdfbdfbdfbdgbdibdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdhbdicEBbdkbdkbdlcDTcDUaXaaXacECcDVcDWcEbcDXaRkaRkcDYaRkcDZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaayUaBdvKOaxBcEIbdqaxAaXbaxAazaaxBaxBbdqaxAaXbaxAazaaxBaxBaxBbdrbdsbdrbdrbdrbdrbdtbduaPjaPjaPjbdvaVLaPjcHGcHHcHLcHPaPjbfRbhTbhUaPlaPlaPlbdAbdBaPlaZhaZibdCbdDbdEbdFaZmbdzaWdaWdaWdaWdaWdaWdaWdbdGaWdbfPaIPbbZbcKbdIbaJbcMbdJbdKbcPbcQaBrbaNbdLbdMaZAbdNbdObdPaZAbdQbdRbaSaBtbbTbcVbdWbdXbjdbaWbdSaZDbjobeaaIPbedbgBbgBbgBbiicEabjtbgBbgBbgBbqsbefbeebeebjubgBbgBbgBbgBbgBbjvbqRbgBbgBnfGbstbsubjxbgBbgDbsvbjybenbjzbjAbeqbeqbeqbaanfGbgDbjBbgBbgBbaabaabaabaabaabaabaabaabaabaabaabbWcEGcEHbevcEcbfUcEdcEdcEdcEdcEJcfqcnWaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -7418,7 +7421,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJjXDatJjXDjXDatJjXDaaaaaaaaaaaaaaaaaaaaabtCbtDbtEbtFbmibkVbmibqHbqHbtGbqHbmibmibvgbhYbhYbxRbxYbzqbzwbzxbzxbpwbzybtLbDwbDxbzAbpAbjDasJbtMbtNbtObrgbrgbPgbQUbSWbVRcbaaTBcGKcGWcIrcIscGNaTBaadaadbsHbuabubbucbudbuebufbugbsHbjoaIPbMmbujbukbulbumbunbuobupbuqburbusbutbutbutbutbutbuubuvbutbutbutbuwblCbuxbuybrzbuzbuAbuBbuBbuCbuDbrGblJbrHbuEbuFbuGbuHbuIbuJbuKbkmbuLbkmbkmbkmbuMbqlbuNbuObuPbuQbuRbuSbuTbuUbuVbuWbuXbuYbuZbvabvbbvabtwbvcbvdbvebhIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbvfbmibkVbmibmibmibmibmibmibmibwEbwWbxTbxRbvibvjbvkbvnbvnbvnbvobAwbDwbDxbzAbpAbjDctHbsxbobbvrbvsbvtbvuchLckgcnKcsVaTBcGMcGWcItcIucGOaTBaaaaaabsHbvybvzbALbvBbvCbvCbvDbvEbvFbvGbWxbvHxRNbvJbvKbKsbKsbvNbvIbvMbvObvPbvQbvRbvLbIJbvSbvTbhcbhcbvUbvVbvVbvWbrzbrzbrzbvXbvYbvZbtbbuDbrGbwabrHbfLbqlbqlbqlbqlbqlbqlbqlbqlbqlbwbbwcbwbbqlbwdbwebwfbwgbwgbwgbwhbwibwjbwkbwlbwmbwnbwqbwpbwqbwrbwsbwtbwubwvblYbwwbwwblYaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaabwxbtCbtDbtEbpkbwybmjbwzbnKbmibwybmibmibmibwEbxUbxVbxRbAybsobwCbpwbpwbpwbAzbpwbDwbDxbzAbpAbjDctIbwGbobbwHbwIbwJbwKbpGbobcurcuqaTBcGPcIvaMZbiLcGQaTBaaaaaabsHbwPbwQbwRbwSbwTbwUbwVbsHcHwaIPbAWbyobyobwXnkDcGubyobyobxbbxcbxcbxbbxabxbbxabxbbxabxbbxabfzbfzbvVbxdbuBbxebxfbrzbvXbxgbxhbxibxjbrGbxkbxlbxmbxnbxobwgbwgbxpbwgbwgbxqbxrbxsbxtbxubwgbxvbxwbxxbxybxybxybxzbxzbxzbxzbXybxAbzgbzjbxDbzjbxEbtxbScbxFbxGbxHbxIbxJblYaadaaaaaaaaaaaaaaaaaaaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabxKbxLbxKbxMbxNbxMbxMbxMbxMbxMbxMbxObmibwEbxUbzrbxRbxSbzzbAxbBPbBUbBUbBUbBUbXzbxPbzAbpAaKebxZbsxbobbyabybbycbydbyebobaTBaTBaTBaTBcGXcGRcGYaTBaTBaTBaTBbsHbyjbykbylbymbwTbwUbwVbsHbynaIPaxxbyobypbyqrgXbyrbysbyobyubyubyvbywbyxbjcbyzbyAbyzbyBbxabhcbyCbvVbyDbuBbyEbyFbyGbyHbyIbyJbyJbyKbyLbyMbyNbyObyPbyQbyRbySbyRbyRbyTbyRbyRbyUbyVbyRbyRbyWbyXbyYbpRbrXbrYbrZbzcbzdbzebXybzfbzgbzjbzibzjbxEbzkbScbxFbhIbzlbzmbznblYaaaaaaaaaaaaaaaaaaaaaaadbzoaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaabxKbxLbxKbxMbxNbxMbxMbxMbxMbxMbxMbxObmibwEbxUbzrbxRbxSbzzbAxbBPbBUbBUbBUozKbXzbxPbzAbpAaKebxZbsxbobbyabybbycbydbyebobaTBaTBaTBaTBcGXcGRcGYaTBaTBaTBaTBbsHbyjbykbylbymbwTbwUbwVbsHbynaIPaxxbyobypbyqrgXbyrbysbyobyubyubyvbywbyxbjcbyzbyAbyzbyBbxabhcbyCbvVbyDbuBbyEbyFbyGbyHbyIbyJbyJbyKbyLbyMbyNbyObyPbyQbyRbySbyRbyRbyTbyRbyRbyUbyVbyRbyRbyWbyXbyYbpRbrXbrYbrZbzcbzdbzebXybzfbzgbzjbzibzjbxEbzkbScbxFbhIbzlbzmbznblYaaaaaaaaaaaaaaaaaaaaaaadbzoaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJatJjXDatJjXDjXDatJjXDaaaaaaaaaaaaaaaaaaaaabqFbnFbnFbnFbhYbzpbzpbzpbzpbzpbtVbmibmibwEbxUbDebhYbzsbztbzubtWbxWbxXbxXbxXbxWbxWbLdcGsaRmaTBaTBbobbobbobbobbobbzBbobcFXcFYcFZaTBcGZcGScHaaTBbjmbiUbsFbsHbsHbsHbsHbsHbsHbsHbsHbsHcGtaTSaRmpistNbbzHbAZbBahfQbyobzJbyubDFbyubzLbzMbzNbzObzPbzMbzLbhcbyCbvVbzRbzSbzTbzUbzVbzWbzXbzUbzUbzYbzZbAabAbbAcbAcbAcbAcbAdbAcbAcbAcbAebAebAfbAgbAhbAhbtrbAibtsbpRbHIbsbbsAbAmbAnbAobScbtybtzbAqbtAbAqbApbArbScbxFbhIbAsbzmbAtblYaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbzpcIdbqObMlbzpbtXbAvbmibIjbQwbQwwzybAAbABbACbADbxXbvxbwLbwMbwNbxWcGwbpAaIPaLPbAIbAJbAKaLPbiFbEWbAMbKObXBbXBbXBcHbbAPbAQcGTcHcaIPaLPaIPaLPbAKaLPbiFaNKaLPaLPbAJaLPbAVaIPbjDpisbAXbAYqhIjOubBbbyobBcbyubBdbyubzLbzMbzQbBebBfbzMbzLbhcbBhbvVbuBbBibBjbBkbBlbBmbBnbBobBpbrGbrGbBqbBrbAcbBsbBtbBubBvbBwbBxbAcbwObygbyhbzvbzCbAhbtrbAibBDbBEbsBbsVbtPbBIbBJbBKbScbBLbTkbTlbTmbTlbTkbTnbScbxFbhIbBMbBNbBOblYaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbzpfpLbMklOVbzpbzpbzpbBRbDcbDcbzpbzpbBWbBXbBYbBZbCabzDbAubAEbAFbxWbjibCeaIPaIPaIPaIPaIPaIPbCfaIPbpAaIPaIPaIPaIPaIPbCgbChbCiaIPaIPaIPaIPaIPaIPaIPaLzaIPaIPaIPaIPaNhbAVbCjbjDbyobCkbClbCmbCnbCobyobCpbyubyvbCqbxabCrbCubCtbCubCvbxabhcbyCbvVbvVbvVbvVbvVbrGbrGbrGbrGbrGbrGbCwbCxbCybAcbCzbCAbCBbCCbCDbCEbAcbAGbAHbBybBzbBAbAhbtrbCKbCLbCMbtQbyybyybyZbzabzbbScbUtbUubCSbCTbCSbUvbUtbScbxFbhIbCUbzmbCVblYaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -7437,7 +7440,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEybShbJIbJIorUbJIbSibSjbSkbJIbSlbSmbSnbSobJIbJIbQWbJIbJIbNFbNFbNFbNGbImaaabodbRabimbgLbimbSpbgKbTxbTybSrbSsbStbSubSvbSwbHbbSzbSAbSBbSCbSDbSEbSFbSGbSDbSHbSDbSIbSJbSKbOWbSLbSMbSNbSObSPbSQbSRbSSaadbSTbSUbRAbSVbQkaadbRBbCxbPeaTVbSXbQtbSYbPfbSZbTabTbbPfbQtbQtbTcbQtbQtbPebCxbFabLRbLRbLRbLRbLRbTdbTebTfbNkbLRbLRbLRbLRbLRbTgbThbThbTibTjcgtlVacgumVNwLYbhBbWvbTrbTqbTrbTsbGDbTtbNrbSebNrbNrbNraadaadaadaaeaaeaaeaaeaaeaaeaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEybEybShbJIbSkbJIbEybJIbEybJIbTubTvbJIbJIbJIbTwbEybNFbNFbEyaaabNFbIlbImaaabTFbTGbinbmEbilcHMbTFcHOcIhbTzbTAbTBbTCbTDbTHbHbbOObTIbTJbTKbPdbTLbTMbTNbTObTPbTQbTRbTSbTSbTTbTUbRqbTVbTWbTXbTYbTZbUabUbbRxbUcbRAbRAbQkaadbRBbCxbPebUdbUeaYmbPfbPfbPfbUfbPfbPfbUgbUgbUhbUgbUgbPebCxbFachychzchybUkchBbOnbUmbUnbUobUpbGlbGlbGlbLRbUqbThbThbUrbUschCclRclRpdgbVAbhBbUxbUybUzbUAbUBbGDbUCbNrbSebNraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDaaaaaaaaaaaajXDaadaaeaaeaaeaaeaaeatJaadaadaadaadaadbNFbUDbJIbJIbJIbUEbEybUFbEybUGbEybTvbJIbJIbUHbNEbEyaaaaadaaaaaabNFbIlbMsbEybvwcHJcHKcIkcHKcIlbvwbGQbEibvwbvwbvwbvwbUMbUSbHbxYcbUTbUUbUVbPdbPdbUWbNSbUXbUYbUZbVabPdbPdbOWbVbbVcbVdbVcbVdbVebVdbVfaadbQkbQkbQkbQkbQkaadbEEbCxbPebQtbVgbVhbVibVjbVkbVlbVmbVnbQtbQtbQtbQtbVobPebCxbFaciKciLciMbVpciNbOnbVrbOnbVsbVtbGlbGliiObLRbVubThbThbThbVvcjIclRclRpdgbVAbhBbVBbWtbVCbWubVDbGDbVEbNrbSebNraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDatJctcjXDatJjXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEybEybShbJIbJIbJIbVFbJIbTubVGbEybEybEybVHbEybEybEybNFbNFbNFbVIbVJbVKbVNbSmbvwbvwbvwbvwbvwbvwbvwbvwbvwbvwbUHcHNbEybVObVPcdDbWKgdUbNXbVSbTNbVTbTNbNSlvHbPdbPdbVabVUbQibQibVVbVWbVXbRrbVYbVZbWabRvbRwbRxbWbbWcbWcbQkaadbEEbCxbWdbWebWebWebWfbWgbQtcpsbVhbWibVhbVhbVhbVhbWjbPebCxbFachyopzchybWkbWlbOnbVrbOnbWnbWobUjbUjbWpbLRbWqbWrbThbThbWspdgpdgpdgpdgbVAbhBbWvcbWbWwbVBsWKbGDbVEbNrbSebNraadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajXDatJctcjXDatJjXDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEybEybShbJIbJIbJIbVFbJIbTubVGbEybEybEybVHbEybEybEybNFbNFbNFbVIbVJbVKbVNbSmbvwbvwbvwbvwbvwbvwbvwbvwbvwbvwbUHcHNbEybVObVPcdDbWKgdUbNXbVSbTNbVTbTNbNSlvHbPdbPdbVabVUbQibQibVVbVWbVXbRrbVYbVZbWabRvbRwbRxbWbbWcbWcbQkaadbEEbCxbWdbWebWebWebWfbWgbQtcpsbVhbWibVhbVhbVhbVhbWjbPebCxbFachyopzchybWkbWlbOnbVrbOnbWnbWobUjbUjbWpbLRbWqbWrbThbThbWspdgpdgpdgpdgruHbhBbWvcbWbWwbVBsWKbGDbVEbNrbSebNraadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaoBaoBaaeaadaadctdaoBbEybEybEybEybEybEybEybEybEybEybJIbJIbJIbJIbJIbWybWzbWAbWAbWBbWCbUNbWFbWFbWFbWFbWFbWFbWFbWFbWFbWFbWGbWHbWHbWIbEybURbWJcdDbWKbWLbWMbWNbQibQibWObWPbQibQibWQbWRbWSbPdbWTbWUbWVbWWbPdbWXbWYbWZbSSaadbSTbXabXbbXcbQkaadbRBbXdbMPbMPbMPbXebPebXfbQtbXgbXhbXibXjbXkbXkbXkbXlbPebCxbFabLRbLRbLRbLRbNkbOnbVrbXobXmbLRbLRbLRbLRbLRbXpbXqbThbThbXrbXsbXsbXsbXsbXthOjbScbScbScbScbScbScbVEbNrbSebNraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaactectfctfctfctfctTcuDcuDcuGbXEbXFbXGbXHbXIbXJbXKbEybXLbEybEybEybEybEybXMbEybEybMsbNGbXNbXNbXNbXNbXNbXNbXNbXNbXObXObXObXObXObNEbXPbEybURbWJcdDqyMbXQbXRbXSbXTbTSbXUbXVoQAbTSbXWbXXbXYbXZbYabYbbYccaqbPdbWXbYebYfbUabUbbRxbYgbWcbWcbQkaadbRBbYhbEEbEEbEEbCxbPebYibQtbQtbYjbYkbYlbQpbXkbQpbYmbPebCxbFabUibUjbUjbYnbUlbOnbYobUnbYpbYqbGlbGlbGlbLRbYrbYsbYtbThbYubThbThbThbYvbYwbYxbYybYzbYAbYBbYCdhWbVEbNrbSebNraadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaoBaadaoBaoBbNFbNFbNFbJIbYDbYEbYFbYGbYHbEybJIbEybYIbYJbYIbYKbYLbYIbYMbMsbNGbXNbYNbYObYPbYQbYRbYSbYNbYTbYUbYVbYWbXObXObXPbEybYXbWJcdDbYYbYZbZabZabZbbZcbZcbZcbZcbZcbZdbZebOPbOPbOPbZfbPdbWVbZgbZhbZibZjbZkbZlbQkbQkbQkbQkbQkaadbRBbYhbZmwAobCwbCxbQlbZnbZobZpbZqbZrbZsbZtbXkbZtbZubPebCxbFavIdbGlbGlbZwbVqbOnbVrbOnbVsbZxbGlbZviiObLRbZybZzbZAbZBbZCbZDbZEbZEbZFbZGbZHbZIhbpbZJcptbZLdhWbVEbNrbSebNrbNrbNraaeaaeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 5da495f3..09897dbf 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -50,6 +50,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ //END OF CIT CHANGES new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \ null, \ + //add this when I can find a way to make them easily constructible > new/datum/stack_recipe("sink", /obj/structure/sink, 2, one_per_turf = TRUE, on_floor = TRUE), + new/datum/stack_recipe("shower", /obj/machinery/shower/crafted, 2, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \ new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ null, \ diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 69ca79d2..f76c1a27 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -891,6 +891,16 @@ obj/item/storage/belt/slut/ComponentInitialize() final_block_chance = 0 //Too thin to block bullets return ..() +/obj/item/storage/belt/sabre/chloesabre + name = "Ornate Sheath" + desc = "An ornate and rather sinister looking sabre sheathe." + icon = 'icons/obj/custom.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' + icon_state = "darksheath" + item_state = "darksheath" + fitting_swords = list(/obj/item/toy/sword/chloesabre, /obj/item/melee/sabre, /obj/item/melee/baton/stunsword) + starting_sword = /obj/item/toy/sword/chloesabre + /obj/item/storage/belt/botany name = "botanical belt" desc = "A belt made for holding hydroponics supplies." diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 8731a6d7..420a92ff 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -219,8 +219,8 @@ var/watertemp = "normal" //freezing, normal, or boiling var/datum/looping_sound/showering/soundloop -/*/obj/machinery/shower/crafted //When created from sheets of metal - anchored = FALSE */ //Stop exploiting this ree +/obj/machinery/shower/crafted //When created from sheets of metal + anchored = FALSE /obj/machinery/shower/Initialize() . = ..() @@ -292,19 +292,43 @@ if (user.a_intent != INTENT_HELP) return ..() - if (I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You begin to adjust the temperature valve with \the [I]...") - if(I.use_tool(src, user, 50)) - switch(watertemp) - if("normal") - watertemp = "freezing" - if("freezing") - watertemp = "boiling" - if("boiling") - watertemp = "normal" - user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [watertemp] temperature.") - log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])") - add_hiddenprint(user) + switch (I.tool_behaviour) + if (TOOL_WRENCH) + if (!anchored) + user.visible_message("[user] starts to take apart [src]...", "You start dismantling [src]...") + I.play_tool_sound(src) + if(I.use_tool(src, user, 20)) + deconstruct(TRUE) + else + to_chat(user, "You begin to adjust the temperature valve with \the [I]...") + if(I.use_tool(src, user, 50)) + switch(watertemp) + if("normal") + watertemp = "freezing" + if("freezing") + watertemp = "boiling" + if("boiling") + watertemp = "normal" + user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [watertemp] temperature.") + log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])") + add_hiddenprint(user) + + if (TOOL_SCREWDRIVER) + if (!anchored) + to_chat(user, "You begin screwing in [src] to the floor...") + I.play_tool_sound(src) + if(I.use_tool(src, user, 30)) + user.visible_message("[user] connects [src] to the floor.", "You connect [src] to the floor.") + anchored = TRUE + else + to_chat(user, "You start to take out [src]'s screws...") + on = FALSE + soundloop.stop() + update_icon() + I.play_tool_sound(src) + if(I.use_tool(src, user, 20)) + user.visible_message("[user] disconnects [src] from the floor.", "You disconnect [src] from the floor.") + anchored = FALSE /obj/machinery/shower/examine() . += ..() @@ -468,7 +492,7 @@ return PROCESS_KILL /obj/machinery/shower/deconstruct(disassembled = TRUE) - new /obj/item/stack/sheet/metal (loc, 3) + new /obj/item/stack/sheet/metal (loc, 2) qdel(src) /obj/machinery/shower/proc/check_heat(mob/living/carbon/C) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index ee1a0228..f723c33a 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -50,7 +50,7 @@ Captain suit = /obj/item/clothing/suit/armor/vest/capcarapace shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/caphat - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/station_charter=1) + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/station_charter=1, /obj/item/modular_computer/tablet/preset/advanced = 1) backpack = /obj/item/storage/backpack/captain satchel = /obj/item/storage/backpack/satchel/cap diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index 310d7e56..c207ddfc 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -5,16 +5,16 @@ alt_titles = list("Head Engineer", "Construction Coordinator", "Project Manager") /datum/job/engineer - alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician", "Structural Engineer", "Station Architect") + alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician", "Structural Engineer", "Mechanic", "Station Architect") /datum/job/atmos - alt_titles = list("Firefighter", "Life Support Specialist") + alt_titles = list("Firefighter", "Life Support Specialist", "Disposals Technician") /datum/job/junior_engineer //Service /datum/job/assistant - alt_titles = list("Civilian", "Visitor", "Businessman", "Trader", "Entertainer", "Tourist") + alt_titles = list("Civilian", "Morale Officer", "Stripper", "Off-Duty", "Escort", "Visitor", "Businessman", "Trader", "Entertainer", "Tourist") /datum/job/cook alt_titles = list("Cook", "Culinary Artist", "Butcher", "Chef de partie") @@ -23,7 +23,7 @@ alt_titles = list("Gardener", "Herbalist", "Botanical Researcher", "Hydroponicist", "Farmer", "Beekeeper") /datum/job/curator - alt_titles = list("Journalist", "Librarian") + alt_titles = list("Journalist", "Librarian", "Keeper") /datum/job/chaplain alt_titles = list("Priest", "Priestess", "Bishop", "Prior", "Monk", "Nun", "Counselor") @@ -38,10 +38,10 @@ alt_titles = list("Jester", "Comedian") /datum/job/mime - alt_titles = list("Performer") + alt_titles = list("Performer", "Pantomime", "Mimic") /datum/job/bartender - alt_titles = list("Mixologist", "Bar Owner") + alt_titles = list("Mixologist", "Bar Owner", "Barmaid") //Science /datum/job/rd @@ -51,13 +51,13 @@ alt_titles = list("Circuitry Designer", "Xenobiologist", "Xenobotanist", "Xenoarcheologist", "Chemical Researcher", "Researcher", "Pyrotechnician") /datum/job/roboticist - alt_titles = list("Biomechanical Engineer", "Mechatronic Engineer", "Mechanic") + alt_titles = list("Biomechanical Engineer", "Mechatronic Engineer", "Mechanic", "Techpriest") /datum/job/junior_scientist //Medical /datum/job/cmo - alt_titles = list("Medical Director") + alt_titles = list("Medical Director", "Medical Administrator") /datum/job/doctor alt_titles = list("Nurse", "Surgeon", "Physician", "Paramedic") @@ -69,7 +69,7 @@ alt_titles = list("Microbiologist", "Biochemist", "Pathologist") /datum/job/geneticist - alt_titles = list("Gene Therapist") + alt_titles = list("Gene Therapist", "Genetics Researcher") /datum/job/psychologist alt_titles = list("Therapist", "Psychiatrist") @@ -78,13 +78,13 @@ //Security /datum/job/hos - alt_titles = list("Chief of Security", "Security Commander") + alt_titles = list("Chief of Security", "Security Commander", "Sheriff") /datum/job/warden - alt_titles = list("Prison Chief", "Armory Manager", "Prison Administrator") + alt_titles = list("Prison Chief", "Armory Manager", "Prison Administrator", "Brig Superintendent") /datum/job/officer - alt_titles = list("Security Agent", "Probation Officer", "Security Peacekeeper", "Security Cadet") + alt_titles = list("Security Agent", "Probation Officer", "Security Peacekeeper", "Security Guard", "Guardsman", "Security Cadet") /datum/job/detective alt_titles = list("Forensics Technician", "Private Investigator", "Gumshoe") @@ -103,7 +103,7 @@ //Command /datum/job/captain - alt_titles = list("Station Director", "Station Commander", "Station Overseer") + alt_titles = list("Station Director", "Station Commander", "Station Overseer", "Stationmaster", "Commissar") /datum/job/hop - alt_titles = list("Personnel Manager", "Staff Administrator") + alt_titles = list("Personnel Manager", "Staff Administrator", "Records Administrator") diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index a3ba4590..5901a4da 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -42,7 +42,7 @@ Chief Medical Officer suit = /obj/item/clothing/suit/toggle/labcoat/cmo l_hand = /obj/item/storage/firstaid/regular suit_store = /obj/item/flashlight/pen - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index 2f828072..0b18fd65 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -55,7 +55,7 @@ Head of Security suit_store = /obj/item/gun/energy/e_gun r_pocket = /obj/item/assembly/flash/handheld l_pocket = /obj/item/restraints/handcuffs - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index f1382d9b..cb38d885 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -327,11 +327,11 @@ /obj/item/reagent_containers/glass/beaker/waterbottle name = "bottle of water" - desc = "A bottle of water filled at an old Earth bottling facility." + desc = "A bottle of water filled at some factory in space." icon = 'icons/obj/drinks.dmi' icon_state = "smallbottle" item_state = "bottle" - list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard + list_reagents = list(/datum/reagent/water = 50)//see desc, don't think about it too hard materials = list(MAT_GLASS=0) volume = 50 amount_per_transfer_from_this = 10 diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index 30a9a3c2..d744793d 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -29,20 +29,7 @@ squeak_override = list('sound/weapons/plasma_cutter.ogg' = 1) // The sound the crusher uses is the same as the plasma cutter :P -/obj/item/toy/plush/slimeplushie/tania - desc = "An adorable stuffed toy of a slimegirl. She seems oddly damp..." // Milky slime - icon = 'hyperstation/icons/obj/plushes.dmi' - icon_state = "tania" - item_state = "tania" - attack_verb = list("hugged", "cuddled", "embraced") - squeak_override = list('sound/weapons/thudswoosh.ogg' = 1) - -/obj/item/toy/plush/slimeplushie/tania/love(obj/item/toy/plush/Kisser, mob/living/user) - /* if (istype(Kisser, /obj/item/toy/plush/vladin) ) // Vladin plushie isn't real, Vladin plushie cannot hug you ;-; - ..() - else */ - user.show_message("[src] hugs [Kisser]!", 1, - "[src] hugs [Kisser]!", 0) +//society has progressed past the need for Tania /obj/item/toy/plush/mammal/grug name = "Grug S. Cavemannington Plushie" @@ -53,7 +40,7 @@ attack_verb = list("thomped", "ook'd", "stoned") squeak_override = list('sound/voice/gorillaplush.ogg' = 1) -/obj/item/toy/plush/mammal/lyricalpaws +/obj/item/toy/plush/mammal/winterdawn name = "hyena plushie" desc = "An adorable stuffed toy of a mammal that seems to resemble a crew member! She's a little yeen in a big labcoat." gender = FEMALE //probably a girl @@ -66,10 +53,6 @@ 'modular_citadel/sound/voice/bark2.ogg' = 1 ) -/obj/item/toy/plush/mammal/lyricalpaws/attack_self(mob/user) - to_chat(user, "You pet [src]. You swear she looks up at you.") - - /obj/item/toy/plush/mammal/chemlight desc = "An adorable stuffed toy of a mammal that seems to resemble a crew member! It looks to glow and sport four arms." gender = MALE //he's a boy, right? diff --git a/hyperstation/code/obj/rewards.dm b/hyperstation/code/obj/rewards.dm index 01f07b53..ff89db3f 100644 --- a/hyperstation/code/obj/rewards.dm +++ b/hyperstation/code/obj/rewards.dm @@ -105,9 +105,9 @@ flags_inv = HIDEFACE|HIDEFACIALHAIR w_class = WEIGHT_CLASS_SMALL -/obj/item/clothing/suit/hooded/wintercoat/chloe +/obj/item/clothing/suit/chloe name = "Fleet Commander's Overcoat" - desc = "Custom tailored to warm the cold commanding hearts of the Syndicate's feared XIV'th battle group. Its armour plating has been removed, but its beret remains inside." + desc = "Custom tailored to warm the cold commanding hearts of the Syndicate's feared XIV'th battle group. Its armour plating has been removed." icon_state = "commissar_greatcoat" item_state = "commissar_greatcoat" allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/screwdriver, /obj/item/crowbar, /obj/item/wrench, /obj/item/stack/cable_coil, /obj/item/weldingtool, /obj/item/multitool) @@ -115,12 +115,32 @@ body_parts_covered = CHEST|GROIN|ARMS|LEGS mutantrace_variation = MUTANTRACE_VARIATION tauric = TRUE - hoodtype = /obj/item/clothing/head/hooded/winterhood/chloe -/obj/item/clothing/head/hooded/winterhood/chloe +/obj/item/clothing/head/chloe name = "Fleet Commander's Beret" desc = "A beret bearing a worn golden symbol that stikes fear in the hearts of many. It smells faintly of plasma and gunpowder." icon = 'hyperstation/icons/obj/clothing/rewards.dmi' alternate_worn_icon = 'hyperstation/icons/mobs/rewards.dmi' icon_state = "commissar_beret" - item_state = "commissar_beret" \ No newline at end of file + item_state = "commissar_beret" + +/obj/item/toy/sword/chloesabre + name = "Fleet Commander's Sabre" + desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a syndicate twist." + icon = 'icons/obj/custom.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' + icon_state = "darksabre" + item_state = "darksabre" + force = 5 + throwforce = 5 + hitsound = 'sound/weapons/rapierhit.ogg' + lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi' + righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi' + obj_flags = UNIQUE_RENAME + attack_verb = list("slashed", "cut") + +/obj/item/toy/sword/chloesabre/get_belt_overlay() + return mutable_appearance('icons/obj/custom.dmi', "darksheath-darksabre") + +/obj/item/toy/sword/chloesabre/get_worn_belt_overlay(icon_file) + return mutable_appearance(icon_file, "darksheath-darksabre") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index fa910e94..2afd7d30 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -99,16 +99,23 @@ path = /obj/item/clothing/head/crystalline ckeywhitelist = list("dragontrance") -/datum/gear/lyricalpawsplush - name = "Winter Dawn Plushie" - category = SLOT_IN_BACKPACK - path = /obj/item/toy/plush/mammal/lyricalpaws - ckeywhitelist = list("lyricalpaws") - /datum/gear/lyricalpawssuit name = "Fleet Commander's Overcoat" category = SLOT_IN_BACKPACK - path = /obj/item/clothing/suit/hooded/wintercoat/chloe + path = /obj/item/clothing/suit/chloe + ckeywhitelist = list("lyricalpaws") + +/datum/gear/lyricalpawshat + name = "Fleet Commander's Beret" + category = SLOT_IN_BACKPACK + path = /obj/item/clothing/head/chloe + cost = 0 + ckeywhitelist = list("lyricalpaws") + +datum/gear/darksabresheath + name = "Dark Sabre Sheath" + category = SLOT_IN_BACKPACK + path = /obj/item/storage/belt/sabre/chloesabre ckeywhitelist = list("lyricalpaws") /datum/gear/cherostavikmask