diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index e23159a2bd..56d0ca606f 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -1,102 +1,415 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 +/obj/machinery/porta_turret/syndicate/energy/pirate{ + dir = 1; + faction = list("pirate"); + icon_state = "standard_lethal" }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, /area/shuttle/pirate) "ab" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/obj/structure/grille, +/turf/open/floor/plating/airless, /area/shuttle/pirate) "ac" = ( -/obj/machinery/computer/shuttle/pirate, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/structure/girder, +/obj/item/stack/rods{ + amount = 3 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating/airless, /area/shuttle/pirate) "ad" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "piratebridge"; - name = "Bridge Shutters Control"; - pixel_y = -5 +/obj/structure/girder, +/obj/item/stack/rods{ + amount = 5 }, -/obj/item/radio/intercom{ - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating/airless, /area/shuttle/pirate) "ae" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, +/turf/closed/wall/r_wall/syndicate/pirate, /area/shuttle/pirate) "af" = ( /turf/template_noop, /area/template_noop) "ag" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, +/obj/structure/window/reinforced, +/obj/structure/frame/machine, +/obj/item/crowbar, +/turf/open/floor/plating/airless, /area/shuttle/pirate) "ah" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, +/obj/structure/window/reinforced, +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/cut/red, +/turf/open/floor/plating/airless, /area/shuttle/pirate) "ai" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/structure/frame/computer{ + anchored = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, /turf/open/floor/pod/dark, /area/shuttle/pirate) "aj" = ( /turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, /area/shuttle/pirate) "ak" = ( -/obj/machinery/airalarm/all_access{ +/obj/structure/grille, +/obj/structure/window/plastitanium/pirate, +/obj/machinery/door/poddoor/shutters{ + id = "cuttershutters"; + name = "Blast Shutters" + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"al" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ dir = 4; pixel_x = -24 }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"am" = ( +/obj/structure/rack, +/obj/machinery/nuclearbomb/beer{ + desc = "A nuclear fission warhead designed to be fired from a high-speed matter-propellent cannon to turn some unlucky sod in the distance into a sun. This one has a jolly roger crudely painted on the side of it. Interestingly, there's a tap on the back and it sloshes when it moves."; + name = "\improper Very Real Nuclear Explosive" + }, /obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"an" = ( +/obj/machinery/porta_turret/syndicate/energy/pirate{ + dir = 4; + faction = list("pirate"); + icon_state = "standard_lethal" + }, +/turf/closed/wall/r_wall/syndicate/pirate, +/area/shuttle/pirate) +"aq" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ar" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"as" = ( +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + name = "Port Gun Battery"; + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/crude{ + layer = 3.13 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"at" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/structure/grille, +/obj/structure/window/plastitanium/pirate, +/obj/machinery/door/poddoor/shutters{ + id = "cuttershutters"; + name = "Blast Shutters" + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"ay" = ( +/obj/machinery/recharger{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "cuttershutters"; + name = "Corvette Shutters Control"; + pixel_x = 6; + pixel_y = -3; + req_access_txt = "150" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"az" = ( +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + name = "Starboard Gun Battery"; + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/crude{ + layer = 3.13 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aA" = ( +/obj/machinery/porta_turret/syndicate/energy/pirate{ + dir = 8; + faction = list("pirate"); + icon_state = "standard_lethal" + }, +/turf/closed/wall/r_wall/syndicate/pirate, +/area/shuttle/pirate) +"aB" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"aC" = ( +/obj/structure/rack{ + icon = 'icons/obj/stationobjs.dmi'; + icon_state = "minibar_left"; + name = "skeletal minibar" + }, +/obj/machinery/chem_dispenser/drinks{ + dir = 0; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"aD" = ( +/obj/structure/rack{ + icon = 'icons/obj/stationobjs.dmi'; + icon_state = "minibar_right"; + name = "skeletal minibar" + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/item/bedsheet/pirate{ + pixel_y = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"aE" = ( +/obj/machinery/vending/boozeomat, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"aF" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/shuttle/pirate, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aG" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/turretid{ + icon_state = "control_kill"; + lethal = 1; + locked = 0; + pixel_y = -24; + req_access = "150" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"aH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"aI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"aJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"aK" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "piratebridgebolt"; + name = "Bridge Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -24; + req_access_txt = "150"; + specialfunctions = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"aL" = ( +/obj/machinery/computer/security, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aM" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med{ + pixel_y = 8 + }, +/obj/item/wirecutters{ + pixel_y = 8 + }, +/obj/item/weldingtool/mini{ + pixel_y = -6 + }, +/obj/item/reagent_containers/medspray/sterilizine{ + pixel_x = 6; + pixel_y = -12 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aN" = ( +/obj/structure/table/optable, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/robot_debris{ + layer = 2.81; + pixel_x = -2; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"aO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/frame/computer{ + anchored = 1; + dir = 8 + }, +/obj/structure/sign/departments/showers{ + pixel_y = 32 + }, +/obj/item/shard{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"aP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"aQ" = ( +/obj/machinery/shuttle_scrambler, +/obj/item/radio/intercom{ + freerange = 1; + name = "Station Intercom (General)"; + pixel_x = -26 + }, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aR" = ( /obj/machinery/light/small{ dir = 8 }, @@ -116,31 +429,30 @@ pixel_y = -6 }, /obj/item/reagent_containers/food/snacks/chocolatebar, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/shuttle/pirate) -"al" = ( -/obj/machinery/loot_locator, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ +"aS" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel, /area/shuttle/pirate) -"am" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +"aT" = ( +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + id_tag = "piratebridgebolt"; + name = "Bridge"; + req_access_txt = "150" + }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -151,60 +463,82 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/shuttle/pirate) -"an" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "piratebridgebolt"; - name = "Bridge Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -24; - specialfunctions = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, -/area/shuttle/pirate) -"ao" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"ap" = ( -/obj/machinery/door/airlock/hatch{ - name = "Port Gun Battery" - }, -/obj/structure/barricade/wooden/crude, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aU" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced, +/obj/item/book/manual/wiki/surgery{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/clipboard{ + pixel_x = 2 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/surgical_drapes, +/obj/item/scalpel{ + pixel_y = 16 + }, +/obj/item/wrench{ + pixel_y = 12 + }, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 12 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"aq" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"aV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aW" = ( +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 +/obj/structure/window/reinforced, +/obj/structure/sink{ + dir = 4; + pixel_x = 6 + }, +/obj/machinery/shower{ + dir = 1; + pixel_y = 4 + }, +/obj/structure/curtain, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"ar" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/box/white, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aX" = ( +/obj/structure/closet/crate/medical, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/under/rank/medical/doctor/blue, +/obj/item/clothing/shoes/sneakers/white, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"aY" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes{ pixel_x = 2; @@ -232,388 +566,853 @@ pixel_x = -10; pixel_y = -2 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"as" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/pirate, +/obj/structure/sign/poster/official/high_class_martini{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/shuttle/pirate) -"at" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/bedsheet/pirate, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"au" = ( -/obj/machinery/door/airlock/hatch{ - id_tag = "piratebridgebolt"; - name = "Bridge" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/neutral{ +"aZ" = ( +/obj/structure/chair/stool, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/shuttle/pirate) -"av" = ( -/obj/machinery/door/airlock/hatch{ - name = "Starboard Gun Battery" +"ba" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/shard, +/obj/item/chair/stool/bar, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"bb" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = -12; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"bc" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, -/obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"aw" = ( +"bd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"be" = ( +/obj/machinery/loot_locator, +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 27 + }, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bg" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "Pirate Corvette APC"; + pixel_y = 23; + req_access = null + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bi" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters{ + id = "cuttermedbay"; + name = "Blast Shutters" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bj" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bk" = ( +/obj/structure/sign/departments/medbay/alt{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bm" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bn" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bo" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = 32 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"br" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"bs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"bt" = ( +/obj/structure/chair/stool/bar, +/obj/item/shard, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"bu" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/departments/cargo{ + pixel_x = -32 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bw" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bx" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"by" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bA" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters{ + id = "cuttermedbay"; + name = "Blast Shutters" + }, +/obj/machinery/button/door{ + id = "cuttermedbay"; + pixel_y = -24; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bB" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/departments/examroom{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bD" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bF" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/sign/directions/dorms{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bG" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bH" = ( +/obj/structure/table, +/obj/machinery/microwave{ + pixel_y = 5 + }, +/obj/item/book/manual/wiki/barman_recipes{ + pixel_x = -8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"bI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"ax" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"ay" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"az" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks{ - dir = 8 - }, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"aA" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/obj/item/bedsheet/pirate, -/turf/open/floor/wood, -/area/shuttle/pirate) -"aB" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/monitor/secret{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ +/obj/item/chair/stool, +/obj/machinery/light, +/obj/machinery/airalarm/syndicate{ dir = 1; pixel_y = -24 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/shuttle/pirate) -"aC" = ( -/obj/machinery/shuttle_scrambler, +"bJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/shuttle/pirate) -"aD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aF" = ( -/obj/machinery/door/airlock/external/glass{ - id_tag = "pirateportexternal" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aH" = ( -/obj/structure/shuttle/engine/propulsion/left, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"aI" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/warning/vacuum/external{ - pixel_x = -32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aJ" = ( -/obj/machinery/door/airlock/external/glass{ - id_tag = "pirateportexternal" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aK" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"aL" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aN" = ( -/obj/machinery/light/small, -/obj/machinery/button/door{ - id = "pirateportexternal"; - name = "External Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -4; - pixel_y = -24; - specialfunctions = 4 - }, -/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aO" = ( -/obj/machinery/light/small, -/obj/machinery/button/door{ - id = "piratestarboardexternal"; - name = "External Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 4; - pixel_y = -24; - specialfunctions = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aQ" = ( -/obj/machinery/porta_turret/syndicate/energy/pirate{ - dir = 1; - faction = list("pirate"); - icon_state = "standard_lethal" - }, -/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, -/area/shuttle/pirate) -"aR" = ( -/obj/machinery/porta_turret/syndicate/energy/pirate{ - faction = list("pirate"); - icon_state = "standard_lethal" - }, -/turf/closed/wall/r_wall/syndicate/pirate, -/area/shuttle/pirate) -"aS" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"aU" = ( -/obj/structure/sign/departments/engineering, -/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, -/area/shuttle/pirate) -"aV" = ( -/obj/effect/mob_spawn/human/pirate{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/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/shuttle/pirate) -"aW" = ( -/obj/machinery/light/small{ - dir = 8 +"bK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"bL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + name = "Spirits Lounge"; + req_access_txt = "150" + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bN" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 4; + req_access = "150"; x_offset = -3; y_offset = 7 }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bO" = ( +/obj/machinery/computer/monitor/secret{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bP" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/syndie/x4{ + pixel_y = 8 + }, +/obj/item/grenade/smokebomb{ + pixel_x = -5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 5 + }, +/obj/effect/turf_decal/box/red, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bQ" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"bR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/box/white, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"bT" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/glass/bottle/bicaridine{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/glass/bottle/kelotane{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/reagent_containers/glass/bottle/antitoxin{ + layer = 3.01; + pixel_x = 2 + }, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + layer = 3.01; + pixel_x = -6 + }, +/obj/item/clipboard{ + layer = 2.99; + pixel_x = 16; + pixel_y = 4 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 14; + pixel_y = 6 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = 15; + pixel_y = -2 + }, +/obj/item/reagent_containers/hypospray/medipen{ + pixel_x = 16; + pixel_y = 11 + }, +/obj/item/reagent_containers/hypospray/medipen{ + pixel_x = 16; + pixel_y = 7 + }, +/obj/machinery/light, +/obj/machinery/airalarm/syndicate{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bU" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/bodybags{ + pixel_y = 4 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/glass/bottle/charcoal{ + layer = 3.01; + pixel_x = -6 + }, +/obj/item/reagent_containers/glass/bottle/dexalin{ + layer = 3.01; + pixel_x = 2 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + name = "Captain's Quarters"; + req_access_txt = "150" + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bX" = ( +/obj/item/shard{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot_white, +/obj/machinery/door/window/southleft{ + name = "Surgical Ward"; + req_access_txt = "150" + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"bZ" = ( +/obj/machinery/computer/piratepad_control{ + dir = 0 + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_y = 22 + }, +/obj/structure/sign/directions/supply{ + pixel_y = 30 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ca" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"cb" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"cc" = ( +/obj/machinery/piratepad{ + pixel_y = 6 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/box, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = 22 + }, +/obj/structure/sign/directions/engineering{ + pixel_y = 30 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + name = "Crew's Quarters"; + req_access_txt = "150" + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ce" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/bedsheet/pirate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/shuttle/pirate) +"cf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/shuttle/pirate) +"cg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/shuttle/pirate) +"ch" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"ci" = ( +/obj/structure/closet/crate, +/obj/item/storage/bag/money/vault, +/obj/item/stack/sheet/mineral/gold{ + amount = 3; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/silver{ + amount = 8; + pixel_x = 2; + pixel_y = -1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cj" = ( +/obj/machinery/vending/dinnerware, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"ck" = ( +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"cl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"cn" = ( +/obj/item/tank/internals/oxygen/yellow, +/obj/item/clothing/suit/space/syndicate/green/dark{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/clothing/head/helmet/space/syndicate/green/dark{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/breath, +/obj/structure/closet/crate/large, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"co" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"cr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"cs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/pirate) -"be" = ( -/obj/machinery/space_heater, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +"ct" = ( +/obj/structure/mirror{ + pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plating, -/area/shuttle/pirate) -"bf" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/turretid{ - icon_state = "control_kill"; - lethal = 1; - locked = 0; - pixel_y = -24; - req_access = null - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/shuttle/pirate) -"bg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/gun/energy/laser{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/gun/energy/laser{ - pixel_y = 3 - }, -/obj/machinery/recharger, -/turf/open/floor/pod/light, -/area/shuttle/pirate) -"bk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/power/smes/engineering{ - charge = 1e+006 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"bl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airalarm/all_access{ +/obj/structure/sink{ pixel_y = 24 }, +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/gun/energy/laser{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/gun/energy/laser{ - pixel_y = 3 - }, -/turf/open/floor/pod/light, -/area/shuttle/pirate) -"bm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/box/white, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"bo" = ( -/obj/machinery/light/small{ - dir = 4 +"cu" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/item/gun/energy/laser{ + pixel_x = -3; + pixel_y = 2 }, -/obj/structure/sign/warning/vacuum/external{ +/obj/item/gun/energy/laser{ + pixel_y = -1 + }, +/obj/item/gun/energy/laser{ + pixel_x = 2; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/shuttle/pirate) -"br" = ( +"cv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/chair/wood/normal{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"cw" = ( /obj/structure/table/wood, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/bottle/rum{ @@ -627,244 +1426,398 @@ }, /obj/item/clothing/mask/cigarette/cigar, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/light, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, /turf/open/floor/wood, /area/shuttle/pirate) -"bt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/melee/transforming/energy/sword/pirate{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/melee/transforming/energy/sword/pirate{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/melee/transforming/energy/sword/pirate{ - pixel_x = 13; - pixel_y = 6 - }, -/turf/open/floor/pod/light, -/area/shuttle/pirate) -"bu" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"bv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"bx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"by" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/piratepad, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"bA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"bB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"bC" = ( -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"bF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 5 - }, -/obj/item/book/manual/wiki/barman_recipes{ - pixel_x = -8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"bH" = ( -/obj/machinery/vending/boozeomat, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"bI" = ( -/obj/machinery/light/small, -/obj/machinery/computer/piratepad_control{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"bJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +"cy" = ( +/obj/effect/mob_spawn/human/pirate/captain{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/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, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/wood, /area/shuttle/pirate) -"bK" = ( +"cz" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, +/area/shuttle/pirate) +"cA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/shuttle/pirate) -"bM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock{ - name = "Crew Cabin" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/mob_spawn/human/pirate{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/box/red, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/light, +/obj/structure/sign/poster/contraband/random{ + pixel_x = -32 }, /turf/open/floor/plasteel/dark, /area/shuttle/pirate) -"bO" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "Pirate Corvette APC"; - pixel_y = 23; - req_access = null - }, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/bot, +"cB" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"bP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/mob_spawn/human/pirate{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/turf_decal/box/red, +/turf/open/floor/plasteel/dark, /area/shuttle/pirate) -"bQ" = ( -/obj/structure/cable{ +"cC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/large, +/obj/machinery/jukebox{ + anchored = 0; + desc = "Formally known as the SSDD, the Space Shanty Delivery Device is employed by various rings of the piracy scene for its capability of raising crew morale with its inspiring tunes. Unfortunately, this one doesn't seem as if it has many records pertaining to its designated topic on hand."; + name = "\improper Space Shanty Delivery Device"; + req_one_access = null + }, +/obj/item/clothing/head/collectable/pirate{ + pixel_x = 1; + pixel_y = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cD" = ( +/obj/machinery/suit_storage_unit/pirate, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/large, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cF" = ( +/obj/structure/shuttle/engine/heater, +/obj/effect/spawner/structure/window/plastitanium/pirate, +/obj/structure/window/reinforced/tinted{ + layer = 3.1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"cG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, +/area/shuttle/pirate) +"cH" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 20 + }, +/obj/item/stack/cable_coil/yellow{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/cable_coil/yellow{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cI" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, +/obj/structure/tank_dispenser/oxygen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"cJ" = ( +/obj/structure/table/reinforced, +/obj/item/pickaxe, +/obj/effect/decal/cleanable/dirt, +/obj/item/pickaxe{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/extinguisher/mini{ + pixel_x = 4 + }, +/obj/item/extinguisher/mini{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/flashlight/seclite{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/flashlight/seclite{ + pixel_x = -10 + }, +/obj/item/crowbar/red{ + pixel_x = -20; + pixel_y = 2 + }, +/obj/item/crowbar/red{ + pixel_x = -16; + pixel_y = -4 + }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cK" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/lethalshot{ + pixel_y = 8 + }, +/obj/item/gun/ballistic/shotgun/automatic/combat{ + pixel_y = 16 + }, +/obj/item/melee/transforming/energy/sword/pirate{ + pixel_x = -1; + pixel_y = 0 + }, +/obj/item/melee/transforming/energy/sword/pirate{ + pixel_x = 6; + pixel_y = 0 + }, +/obj/item/melee/transforming/energy/sword/pirate{ + pixel_x = 13; + pixel_y = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cL" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/bedsheet/pirate, +/obj/effect/decal/cleanable/dirt, +/obj/item/bedsheet/pirate, +/obj/item/storage/backpack/satchel, +/turf/open/floor/plasteel/dark, +/area/shuttle/pirate) +"cM" = ( +/obj/structure/shuttle/engine/heater, +/obj/effect/spawner/structure/window/plastitanium/pirate, +/obj/structure/window/reinforced/tinted{ + layer = 3.1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4; + layer = 3.1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"cN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/dresser, +/turf/open/floor/wood, +/area/shuttle/pirate) +"cO" = ( +/obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + name = "Engineering"; + req_access_txt = "150" + }, +/turf/open/floor/pod/dark, /area/shuttle/pirate) -"bX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/terminal{ +"cP" = ( +/obj/structure/shuttle/engine/heater, +/obj/effect/spawner/structure/window/plastitanium/pirate, +/obj/structure/window/reinforced/tinted{ + layer = 3.1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8; + layer = 3.1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"cR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"cS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/structure/rack, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"cT" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cV" = ( +/obj/machinery/suit_storage_unit/pirate, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = -32 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"cW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/smes/engineering{ + charge = 1e+006 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"cX" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/sign/warning/electricshock{ + pixel_y = 32 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"cY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + target_pressure = 405.3 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"cZ" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, +/area/shuttle/pirate) +"da" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"db" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/safety_internals{ + pixel_x = 32 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"dc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold4w/supply/visible, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dd" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/obj/structure/sign/departments/engineering{ + pixel_y = 32 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"de" = ( +/obj/item/storage/box/lights/bulbs, /obj/item/storage/toolbox/mechanical{ pixel_y = 4 }, +/obj/item/multitool, +/obj/item/storage/belt/utility{ + pixel_x = 2; + pixel_y = -4 + }, /obj/item/flashlight{ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/box/lights/bulbs, /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, -/obj/item/multitool, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/shuttle/pirate) -"bZ" = ( -/obj/machinery/door/airlock/external/glass{ - id_tag = "piratestarboardexternal" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/rack, +/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/fire{ + pixel_x = 32 + }, /turf/open/floor/plating, /area/shuttle/pirate) -"ce" = ( -/obj/machinery/door/airlock/external/glass{ - id_tag = "piratestarboardexternal" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, +"dg" = ( /obj/docking_port/mobile/pirate{ dwidth = 11; height = 16; @@ -872,7 +1825,7 @@ movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Pirate Ship"; port_direction = 2; - width = 17 + width = 23 }, /obj/docking_port/stationary{ dwidth = 11; @@ -882,612 +1835,798 @@ width = 17 }, /obj/structure/fans/tiny, -/turf/open/floor/plating, +/obj/machinery/door/poddoor/shutters{ + id = "cuttereva"; + name = "EVA Shutters" + }, +/obj/machinery/button/door{ + id = "cuttereva"; + name = "EVA Shutters"; + pixel_x = 26; + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden/crude{ + layer = 3.13 + }, +/turf/open/floor/pod/dark, /area/shuttle/pirate) -"db" = ( -/obj/structure/shuttle/engine/heater, -/obj/effect/spawner/structure/window/plastitanium/pirate, +"dk" = ( +/obj/structure/shuttle/engine/large, /turf/open/floor/plating/airless, /area/shuttle/pirate) -"df" = ( +"dl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/eastleft{ + name = "EVA Storage"; + req_access_txt = "150" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"dm" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dn" = ( +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ + dir = 4 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"do" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dp" = ( +/obj/machinery/porta_turret/syndicate/energy/pirate{ + faction = list("pirate"); + icon_state = "standard_lethal" + }, +/turf/closed/wall/r_wall/syndicate/pirate, +/area/shuttle/pirate) +"dq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ + dir = 8 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"ds" = ( +/obj/item/crowbar, +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dt" = ( +/obj/machinery/door/airlock/external/glass{ + aiControlDisabled = 1; + id_tag = "piratestarboardexternal"; + name = "EVA Airlock"; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/structure/barricade/wooden/crude{ + layer = 3.13 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"dv" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/sign/poster/official/wtf_is_co2{ + pixel_y = -32 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/shuttle/pirate) +"dw" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/item/wrench, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/pirate) +"dz" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dA" = ( +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dB" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 20 + }, +/obj/item/clothing/gloves/color/fyellow/old{ + pixel_y = 2 + }, +/obj/item/clothing/gloves/color/fyellow/old{ + pixel_y = -2 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"dC" = ( +/obj/structure/shuttle/engine/propulsion/left, +/turf/open/floor/plating, +/area/shuttle/pirate) +"dD" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating, +/area/shuttle/pirate) +"dE" = ( +/obj/structure/shuttle/engine/propulsion/right, +/turf/open/floor/plating, +/area/shuttle/pirate) +"kI" = ( +/obj/structure/sign/barsign, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, +/area/shuttle/pirate) +"mq" = ( +/obj/machinery/porta_turret/syndicate/energy/pirate{ + dir = 8; + faction = list("pirate"); + icon_state = "standard_lethal" + }, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, +/area/shuttle/pirate) +"ol" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"pw" = ( /obj/machinery/porta_turret/syndicate/energy/pirate{ dir = 4; faction = list("pirate"); icon_state = "standard_lethal" }, -/turf/closed/wall/r_wall/syndicate/pirate, +/turf/closed/wall/r_wall/syndicate/pirate/nodiagonal, /area/shuttle/pirate) -"dy" = ( -/obj/structure/chair/wood/normal, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"sE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"un" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"vT" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/machinery/light/small{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/shuttle/pirate) +"yP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/shuttle/pirate) -"dU" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/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/structure/sign/directions/dorms{ + pixel_y = -22 }, /turf/open/floor/plasteel/dark, /area/shuttle/pirate) -"ek" = ( -/obj/effect/turf_decal/stripes/line, +"BD" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/structure/sign/poster/contraband/revolver{ - pixel_x = 32 - }, -/obj/item/storage/backpack/duffelbag/syndie/x4{ - pixel_y = 8 - }, -/obj/item/grenade/smokebomb{ - pixel_x = -5 - }, -/obj/item/grenade/smokebomb{ - pixel_x = 5 - }, -/obj/item/pickaxe/drill/diamonddrill, -/obj/item/pickaxe/drill/diamonddrill, -/obj/item/pickaxe/drill/diamonddrill, -/turf/open/floor/pod/light, -/area/shuttle/pirate) -"ep" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"er" = ( -/obj/structure/shuttle/engine/propulsion/right, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"et" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"eu" = ( -/obj/structure/girder, -/obj/item/stack/rods{ - amount = 3 - }, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"ew" = ( -/obj/structure/girder, -/obj/item/stack/rods{ - amount = 5 - }, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"ex" = ( -/obj/structure/window/reinforced, -/obj/structure/frame/machine, -/obj/item/wrench, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"ey" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" - }, -/obj/structure/grille, -/obj/structure/window/plastitanium/pirate, -/turf/open/floor/plating, -/area/shuttle/pirate) -"ez" = ( -/obj/structure/window/reinforced, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cut/red, -/turf/open/floor/plating/airless, -/area/shuttle/pirate) -"eA" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/structure/frame/computer{ - anchored = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"eE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"fW" = ( -/turf/closed/wall/r_wall/syndicate/pirate, -/area/shuttle/pirate) -"fY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"gY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"km" = ( -/obj/machinery/atmospherics/components/unary/tank/air, -/obj/effect/turf_decal/bot, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"mU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/engineering{ - name = "Engineering" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"np" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/all_access{ - pixel_y = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"vB" = ( -/obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/storage/box/lethalshot, -/obj/item/gun/ballistic/shotgun/automatic/combat{ - pixel_x = -2; - pixel_y = 2 - }, -/turf/open/floor/pod/light, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/pirate) -"wf" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/shuttle/pirate) -"wR" = ( -/obj/machinery/porta_turret/syndicate/energy/pirate{ - dir = 8; - faction = list("pirate"); - icon_state = "standard_lethal" - }, -/turf/closed/wall/r_wall/syndicate/pirate, -/area/shuttle/pirate) -"yi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/hatch{ - name = "Armory Access" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) -"zw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock{ - name = "Captain's Quarters" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/shuttle/pirate) -"Gk" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/suit_storage_unit/pirate, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/pirate) -"JT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/storage/bag/money/vault, -/obj/item/stack/sheet/mineral/gold{ - amount = 3; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/silver{ - amount = 8; - pixel_x = 2; - pixel_y = -1 - }, -/turf/open/floor/pod/light, -/area/shuttle/pirate) -"Oe" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +"HH" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/turf/open/floor/plasteel, -/area/shuttle/pirate) -"OD" = ( -/obj/machinery/airalarm/all_access{ - pixel_y = 24 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, -/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{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/shuttle/pirate) -"OL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, /turf/open/floor/plasteel, /area/shuttle/pirate) -"RY" = ( -/obj/effect/mob_spawn/human/pirate/captain{ - dir = 4 - }, -/obj/machinery/airalarm/all_access{ - pixel_y = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, -/turf/open/floor/wood, -/area/shuttle/pirate) (1,1,1) = {" af af af -fW -aj -aj -aj -aj -aj -aj -aj -wR af af af af +af +af +af +af +af +af +ae +aj +aj +mq +af +af +af "} (2,1,1) = {" af -et -eu -ex -eA -aa -ap -aw -ak -bF +af +af +af +af +af +af +aA aj aj aj -fW +aj +aj +aj +cF +ck +dk +af af af "} (3,1,1) = {" -aQ -aj -aj -aj -aj -aj -aj -ax -aq -ar -aj -RY -aA -ep -aH -af -"} -(4,1,1) = {" af af af -af -af -af -ey -ay -Oe -OL -zw -dy -br -ep -er -af -"} -(5,1,1) = {" -af -af -af -af -af -af -aj -az -bx -bH -aj +ae aj aj aj aj aR +aY +cj +bH +aj +ce +cM +ck +ck +af +af +af +"} +(4,1,1) = {" +af +ab +ac +ag +ai +al +as +ol +vT +aZ +bq +bI +aj +cf +cN +cP +ck +dk +af +af +"} +(5,1,1) = {" +aa +aj +aj +aj +aj +am +kI +aC +aB +HH +br +bJ +bV +cg +cv +cF +ck +ck +af +af "} (6,1,1) = {" af af af -ey -ey +af +ae +aj +aj +aD +aB +ba +bs +yP +aj +ch +cw aj aj aj -yi aj -aj -Gk -aS -aF -aI -aJ +af "} (7,1,1) = {" af af -ey -ey -aC -aW +af +af +af +af +at +aE +aS +bb +bt +bK aj -bg -gY -JT -aj -km -aN +cy aj aj +cD +cT aj +af "} (8,1,1) = {" af af -ey -ab -ae -bf +af +af +af +af aj -bl -fY -ai -aU -be -aD -aG -db -aH +aj +aj +aj +aj +bL +aj +aj +aj +cV +dl +dv +aj +dp "} (9,1,1) = {" af af -ey -ac -ag -am -au -bm -by -bm -mU -aL -bP -bX -db -aK +af +af +af +ak +aj +bN +aj +bZ +bu +bM +cn +cC +aj +cW +dm +dw +cF +dC "} (10,1,1) = {" af af -ey -ad -ah -an +af +af +ak +ak +aQ +aG aj -bt -gY -bI +cc +bv +bM +co +cE aj -bO -bQ -bk -db -er +cX +dn +dx +cF +dD "} (11,1,1) = {" af af -ey -ey -al -aB -aj -ek -bA -vB -aj -np -aO -aj -aj +af +af +ak +ay +aV +aH aj +ci +bw +cl +cp +cp +cO +cY +do +dy +cF +dE "} (12,1,1) = {" af af af -ey -ey +af +ak +aF +bc +aI +aT +bf +bx +cm +cs +cG +cG +dc +dq +dz aj aj -aj -yi -aj -aj -Gk -aS -bZ -bo -ce "} (13,1,1) = {" af af af af -af -af +ak +aL +bd +aJ aj -as -bB -at +bg +by +bP +ca +cH aj -aj -aj -aj -aj -aR +dd +dr +dA +cF +dC "} (14,1,1) = {" af af af af -af -af -ey -eE -bC -bJ -bM -dU -aV -ep -aH -af +ak +ak +be +aK +aj +bh +bz +bQ +cb +cJ +aj +de +ds +dB +cF +dD "} (15,1,1) = {" -aQ -aj -aj -aj -aj -aj -aj -bu -aj -wf -aj -OD -aV -ep -er af +af +af +af +af +ak +aj +bO +aj +bi +bA +aj +cu +cK +aj +aj +dt +cZ +cF +dE "} (16,1,1) = {" af -et -ew -ez -eA -ao -av -bv -aj -bK -aj -aj -aj -fW af af +af +af +af +aj +aj +aj +bj +bB +aj +aj +aj +aj +cI +cR +da +aj +dp "} (17,1,1) = {" af af af -fW -aj -aj -aj -aj -aj -aj -aj -df af af af +at +aM +aU +bk +bC +bR +aj +cL +cz +aj +cS +db +dg +af +"} +(18,1,1) = {" +af +af +af +af +ae +aj +aj +aN +bX +bl +bD +bS +cd +cq +cA +aj +aj +aj +aj +af +"} +(19,1,1) = {" +aa +aj +aj +aj +aj +aq +aj +aO +aW +bm +bE +bF +aj +cr +cB +cF +ck +dk +af +af +"} +(20,1,1) = {" +af +ab +ad +ah +ai +ar +az +aP +aP +bn +BD +bT +aj +sE +un +cM +ck +ck +af +af +"} +(21,1,1) = {" +af +af +af +ae +aj +aj +aj +aj +aX +bo +bG +bU +aj +ct +cP +ck +dk +af +af +af +"} +(22,1,1) = {" +af +af +af +af +af +af +af +an +aj +aj +aj +aj +aj +aj +cF +ck +ck +af +af +af +"} +(23,1,1) = {" +af +af +af +af +af +af +af +af +af +af +af +af +af +ae +aj +aj +pw +af +af af "} diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 23548e6807..ef506bddb3 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -13,7 +13,6 @@ GLOBAL_LIST_EMPTY(radial_menus) icon_state = "radial_slice" var/choice var/next_page = FALSE - var/tooltips = FALSE /obj/screen/radial/slice/MouseEntered(location, control, params) . = ..() diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 20e1a0a4e2..1e3fff8a17 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -57,7 +57,7 @@ /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper, /obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini, /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol, - /obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini + /obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/ballistic/derringer )) /datum/component/storage/concrete/pockets/shoes/clown/Initialize() diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index 6217665157..9a4c793274 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -90,7 +90,13 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code var/mob/living/L = target var/text = texts_by_atom[target] if(text) - usr << browse("[isliving(target) ? L.get_visible_name() : target.name][replacetext(texts_by_atom[target], "\n", "
")]", "window=[isliving(target) ? L.get_visible_name() : target.name];size=500x200") + var/content + if(flavor_name == "OOC Notes") + content += "[L]'s OOC Notes:
ERP: [L.client.prefs.erppref] | Non-Con: [L.client.prefs.nonconpref] | Vore: [L.client.prefs.vorepref]\n" + if(L.client.prefs.extremepref == "Yes") + content += "
Extreme content: [L.client.prefs.extremepref] | Extreme content harm: [L.client.prefs.extremeharm]\n" + content += text + usr << browse("[isliving(target) ? L.get_visible_name() : target.name][replacetext(content, "\n", "
")]", "window=[isliving(target) ? L.get_visible_name() : target.name];size=500x200") onclose(usr, "[target.name]") return TRUE diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 650c86ffa7..a62972e9a6 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -56,6 +56,9 @@ ///Internal holder for emissive blocker object, do not use directly use blocks_emissive var/atom/movable/emissive_blocker/em_block + /// Should we use tooltips, if the thing does not have the code implemented `get_tooltip_data()`, it will default to examine(src) + var/tooltips = FALSE + /atom/movable/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 7d2b0ed832..df7d6467f0 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -553,6 +553,9 @@ /obj/item/card/id/syndicate/locked_banking bank_support = ID_LOCKED_BANK_ACCOUNT +/obj/item/card/id/pirate + access = list(ACCESS_SYNDICATE) + /obj/item/card/id/captains_spare name = "captain's spare ID" desc = "The spare ID of the High Lord himself." diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 7f2fe6a01d..417fd96c85 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -248,6 +248,24 @@ /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS + +/obj/item/kitchen/unrollingpin + name = "unrolling pin" + desc = "For when you accidentally flattened something." + icon_state = "unrolling_pin" + force = 8 + throwforce = 5 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_NORMAL + custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) + attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") + custom_price = PRICE_ALMOST_CHEAP + +/obj/item/kitchen/unrollingpin/suicide_act(mob/living/carbon/user) + user.visible_message("[user] begins unflattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return BRUTELOSS + /* Trays moved to /obj/item/storage/bag */ /obj/item/kitchen/knife/scimitar diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 517cea683f..69d4ff573e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -250,6 +250,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ null, \ new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 20), \ new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \ + new/datum/stack_recipe("unrolling pin", /obj/item/kitchen/unrollingpin, 2, time = 30), \ new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \ new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\ new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \ diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index de7374379d..9d48351852 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -367,7 +367,7 @@ /obj/item/storage/fancy/cigarettes/derringer/AltClick(mob/living/carbon/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) || locate(/obj/item/ammo_casing/g4570) //Easy access smokes and bullets + var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) ||(locate(/obj/item/gun/ballistic/derringer) in contents) || (locate(/obj/item/ammo_casing/c38) in contents) || locate(/obj/item/ammo_casing/g4570) in contents//Easy access smokes and bullets if(W && contents.len > 0) SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user) user.put_in_hands(W) @@ -382,6 +382,7 @@ new /obj/item/ammo_casing/a357(src) new /obj/item/ammo_casing/a357(src) new /obj/item/ammo_casing/a357(src) + new /obj/item/ammo_casing/a357(src) new /obj/item/clothing/mask/cigarette/syndicate(src) //For traitors with luck/class @@ -404,6 +405,7 @@ new /obj/item/ammo_casing/g4570(src) new /obj/item/ammo_casing/g4570(src) new /obj/item/ammo_casing/g4570(src) + new /obj/item/ammo_casing/g4570(src) new /obj/item/clothing/mask/cigarette/xeno(src) //For Cargomen, looking for a good deal on arms, with no quarrels as to where they're from. @@ -419,6 +421,7 @@ new /obj/item/ammo_casing/c38/lethal(src) new /obj/item/ammo_casing/c38/lethal(src) new /obj/item/ammo_casing/c38/lethal(src) + new /obj/item/ammo_casing/c38/lethal(src) new /obj/item/clothing/mask/cigarette/shadyjims (src) ///////////// //CIGAR BOX// diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 3b78f03e4d..9a3eeedc1f 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -571,6 +571,26 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("[key_name_admin(src)] has created a command report") SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! +/client/proc/cmd_admin_make_priority_announcement() + set category = "Admin.Events" + set name = "Make Priority Announcement" + + if(!check_rights(R_ADMIN)) + return + + var/input = input(usr, "Enter a priority announcement. Ensure it makes sense IC.", "What?", "") as message|null + if(!input) + return + + var/title = input(src, "What should the title be?", "What?","") as text|null + + var/special_name = input(src, "Who is making the announcement?", "Who?", "") as text|null + priority_announce(input, title, sender_override = special_name) + + log_admin("[key_name(src)] has sent a priority announcement: [input]") + message_admins("[key_name_admin(src)] has made a priority announcement") + SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Priority Announcement") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/cmd_change_command_name() set category = "Admin.Events" set name = "Change Command Name" diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 2267ebf1d1..f714a94646 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -79,31 +79,27 @@ if (atmos_adjacent_turfs) adjacent_turfs = atmos_adjacent_turfs.Copy() else - adjacent_turfs = list() + return list() // don't bother checking diagonals, diagonals are going to be cardinal checks anyways. if (!alldir) return adjacent_turfs - var/turf/curloc = src - - for (var/direction in GLOB.diagonals_multiz) - var/matchingDirections = 0 - var/turf/S = get_step_multiz(curloc, direction) - if(!S) + var/turf/other + var/turf/mid + for (var/d in GLOB.diagonals) + other = get_step(src, d) + if(!other) + continue + // NS step + mid = get_step(src, NSCOMPONENT(d)) + if((mid in adjacent_turfs) && (get_step(mid, EWCOMPONENT(d)) in adjacent_turfs)) + adjacent_turfs += other + continue + // EW step + mid = get_step(src, EWCOMPONENT(d)) + if((mid in adjacent_turfs) && (get_step(mid, NSCOMPONENT(d)) in adjacent_turfs)) + adjacent_turfs += other continue - - for (var/checkDirection in GLOB.cardinals_multiz) - var/turf/checkTurf = get_step(S, checkDirection) - if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf]) - continue - - if (adjacent_turfs[checkTurf]) - matchingDirections++ - - if (matchingDirections >= 2) - adjacent_turfs += S - break - return adjacent_turfs /atom/proc/air_update_turf(command = 0) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index ed3f274f47..de3e657386 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -240,7 +240,6 @@ desc = "Hey kid.. c'mere. Boss says we need to offload these, to any buyer, no questions asked. You pay us, we give you three of these guns, no strings attached. Locks are to ensure they get to PAYING customers." cost = 2000 contraband = TRUE - can_private_buy = TRUE contains = list(/obj/item/storage/fancy/cigarettes/derringer/smuggled, /obj/item/storage/fancy/cigarettes/derringer/smuggled, /obj/item/storage/fancy/cigarettes/derringer/smuggled, diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4401225dc1..6acd132b82 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -107,7 +107,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/gender = MALE //gender of character (well duh) var/age = 30 //age of character //SKYRAT CHANGES BEGIN - var/skyrat_ooc_notes = "" var/erppref = "Ask" var/nonconpref = "Ask" var/vorepref = "Ask" @@ -402,7 +401,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "[TextPreview(features["silicon_flavor_text"])]...
" dat += "

OOC notes

" - /*dat += "Set OOC notes
" + dat += "Set OOC notes
" var/ooc_notes_len = length(features["ooc_notes"]) if(ooc_notes_len <= 40) if(!ooc_notes_len) @@ -411,9 +410,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["ooc_notes"]]
" else dat += "[TextPreview(features["ooc_notes"])]...
" - */ //SKYRAT EDIT - dat += "Set OOC Notes
" dat += "ERP : [erppref]
" dat += "Non-Con : [nonconpref]
" dat += "Vore : [vorepref]
" @@ -1688,17 +1685,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(!isnull(msg)) features["silicon_flavor_text"] = strip_html_simple(msg, MAX_FLAVOR_LEN, TRUE) //Skyrat edit, uses strip_html_simple() - //SKYRAT CHANGES - if("skyrat_ooc_notes") - var/msg = input(usr, "Set your OOC Notes", "OOC Notes", skyrat_ooc_notes) as message|null - if(msg) - skyrat_ooc_notes = strip_html_simple(msg, MAX_FLAVOR_LEN, TRUE) - - /* Skyrat changes - do nothing here because we dont use this and this may be exploited if("ooc_notes") var/msg = stripped_multiline_input(usr, "Set always-visible OOC notes related to content preferences. THIS IS NOT FOR CHARACTER DESCRIPTIONS!", "OOC notes", html_decode(features["ooc_notes"]), MAX_FLAVOR_LEN, TRUE) if(!isnull(msg)) - features["ooc_notes"] = msg*/ + features["ooc_notes"] = msg if("hide_ckey") hide_ckey = !hide_ckey diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 6f9010eb95..1cd09097f4 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -89,10 +89,8 @@ /datum/outfit/pirate/space suit = /obj/item/clothing/suit/space/pirate head = /obj/item/clothing/head/helmet/space/pirate/bandana - mask = /obj/item/clothing/mask/breath - suit_store = /obj/item/tank/internals/oxygen ears = /obj/item/radio/headset/syndicate - id = /obj/item/card/id + id = /obj/item/card/id/pirate /datum/outfit/pirate/space/captain head = /obj/item/clothing/head/helmet/space/pirate diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 388a4fdac0..d284146ea3 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -206,6 +206,7 @@ icon_screen = "syndishuttle" icon_keyboard = "syndie_key" light_color = LIGHT_COLOR_RED + req_access = list(ACCESS_SYNDICATE) possible_destinations = "pirateship_away;pirateship_home;pirateship_custom" /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate @@ -214,8 +215,8 @@ shuttleId = "pirateship" lock_override = CAMERA_LOCK_STATION shuttlePortId = "pirateship_custom" - x_offset = 9 - y_offset = 0 + x_offset = 11 + y_offset = 1 see_hidden = FALSE /obj/docking_port/mobile/pirate @@ -224,11 +225,7 @@ rechargeTime = 3 MINUTES /obj/machinery/suit_storage_unit/pirate - suit_type = /obj/item/clothing/suit/space - helmet_type = /obj/item/clothing/head/helmet/space - mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/jetpack/void - // storage_type = /obj/item/tank/internals/oxygen + storage_type = /obj/item/tank/jetpack/carbondioxide /obj/machinery/loot_locator name = "Booty Locator" diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm index e071fb3df7..10b8c946fc 100644 --- a/code/modules/food_and_drinks/food/snacks/dough.dm +++ b/code/modules/food_and_drinks/food/snacks/dough.dm @@ -26,6 +26,17 @@ else ..() +/obj/item/reagent_containers/food/snacks/flatdough/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/unrollingpin)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/dough(loc) + to_chat(user, "You unflatten [src].") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to undo the rolling!") + else + ..() + // sliceable into 3xdoughslices /obj/item/reagent_containers/food/snacks/flatdough @@ -98,6 +109,17 @@ else ..() +/obj/item/reagent_containers/food/snacks/piedough/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/unrollingpin)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/cakebatter(loc) + to_chat(user, "You unflatten [src].") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to undo the rolling!") + else + ..() + /obj/item/reagent_containers/food/snacks/piedough name = "pie dough" desc = "Cook it to get a pie." diff --git a/code/modules/mapping/space_management/multiz_helpers.dm b/code/modules/mapping/space_management/multiz_helpers.dm index ae05aee150..b949ac67e6 100644 --- a/code/modules/mapping/space_management/multiz_helpers.dm +++ b/code/modules/mapping/space_management/multiz_helpers.dm @@ -13,13 +13,15 @@ var/offset while((offset = SSmapping.level_trait(other_z, ZTRAIT_DOWN))) other_z += offset + if(other_z in .) + break // no infinite loops . += other_z other_z = center_z while((offset = SSmapping.level_trait(other_z, ZTRAIT_UP))) other_z += offset + if(other_z in .) + break // no infinite loops . += other_z - return . - /proc/get_dir_multiz(turf/us, turf/them) us = get_turf(us) @@ -46,4 +48,4 @@ /turf/proc/below() return get_step_multiz(src, DOWN) - + diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index a10c1dbe8a..e1eb45752d 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -491,11 +491,6 @@ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) //This also handles flavor texts now - var/invisible_man = skipface || get_visible_name() == "Unknown" // SKYRAT EDIT -- BEGIN - if(!invisible_man) - if(client) - . += "OOC Notes: \[View\]" // SKYRAT EDIT -- END - . += "*---------*" /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects! diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fb80aca065..89609c8790 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -47,7 +47,7 @@ AddComponent(/datum/component/combat_mode) AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text") AddElement(/datum/element/flavor_text/carbon/temporary, "", "Set Pose (Temporary Flavor Text)", "This should be used only for things pertaining to the current round!", _save_key = null) - //AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) //Skyrat change - we have our own OOC notes + AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) /mob/living/carbon/human/Destroy() QDEL_NULL(physiology) @@ -1137,6 +1137,17 @@ . = ..() set_species(race) +/mob/living/carbon/human/get_tooltip_data() + var/t_He = p_they(TRUE) + var/t_is = p_are() + . = list() + var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) + if(skipface || get_visible_name() == "Unknown") + . += "You can't make out what species they are." + else + . += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]" + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .) + /mob/living/carbon/human/species/abductor race = /datum/species/abductor diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 3a086cdaec..0f117f41e8 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -85,6 +85,8 @@ var/last_fire_update var/hardcore_survival_score = 0 + tooltips = TRUE + /// Unarmed parry data for human /datum/block_parry_data/unarmed/human parry_respect_clickdelay = TRUE diff --git a/code/modules/mob/living/silicon/examine.dm b/code/modules/mob/living/silicon/examine.dm index 7de281de5f..0840ea1191 100644 --- a/code/modules/mob/living/silicon/examine.dm +++ b/code/modules/mob/living/silicon/examine.dm @@ -1,5 +1,4 @@ /mob/living/silicon/examine(mob/user) //Displays a silicon's laws to ghosts - . = ..() if(laws && isobserver(user)) . += "[src] has the following laws:" for(var/law in laws.get_law_list(include_zeroth = TRUE)) diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 5e0b7a1fd4..45a3d15635 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -49,10 +49,7 @@ if(DEAD) . += "It looks like its system is corrupted and requires a reset." - //SKYRAT EDIT - OOC NOTES! - if(client) - . += "OOC Notes: \[View\]" - //END SKYRAT EDIT + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .) . += "*---------*" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 38f93f9ffc..47f9a794cf 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1326,3 +1326,18 @@ var/datum/computer_file/program/robotact/program = modularInterface.get_robotact() if(program) program.force_full_update() + +/mob/living/silicon/robot/get_tooltip_data() + var/t_He = p_they(TRUE) + var/t_is = p_are() + . = list() + var/borg_type = module ? module : "Default" +//This isn't even used normally, but if that ever changes, just uncomment this +/* var/obj/item/borg_chameleon/chameleon = locate() in src + if(!chameleon) + chameleon = locate() in src.module + if(chameleon?.active) + borg_type = "Engineering" +*/ + . += "[t_He] [t_is] a [borg_type] unit" + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .) diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index f44552f1ab..fe22ec1236 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -125,3 +125,5 @@ var/sleeper_g var/sleeper_r var/sleeper_nv + + tooltips = TRUE diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 92ba24420a..fbe2e372e2 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -58,9 +58,9 @@ /mob/living/silicon/ComponentInitialize() . = ..() - AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _save_key = "silicon_flavor_text") - AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!") - //AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) //Skyrat edit + AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _always_show = TRUE, _save_key = "silicon_flavor_text") + AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!", _always_show = TRUE) + AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) /mob/living/silicon/med_hud_set_health() return //we use a different hud diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 70058801f8..1f1cc10459 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -60,6 +60,13 @@ desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with." ammo_type = /obj/item/ammo_casing/c38/match +/obj/item/ammo_box/g4570 + name = "ammo box (.45-70 GOVT)" + desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets." + ammo_type = /obj/item/ammo_casing/g4570 + icon_state = "45box" + max_ammo = 10 + /obj/item/ammo_box/c9mm name = "ammo box (9mm)" icon_state = "9mmbox" diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index cc86549793..dad8386178 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -3,28 +3,17 @@ ammo_type = /obj/item/ammo_casing/c38 caliber = "38" max_ammo = 2 - multiload = FALSE - -/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1) - if (!countempties) - var/boolets = 0 - for(var/obj/item/ammo_casing/bullet in stored_ammo) - if(bullet.BB) - boolets++ - return boolets - else - return ..() /obj/item/ammo_box/magazine/internal/derringer/a357 name = "\improper derringer muzzle" ammo_type = /obj/item/ammo_casing/a357 caliber = "357" max_ammo = 2 - multiload = FALSE + multiload = 0 /obj/item/ammo_box/magazine/internal/derringer/g4570 name = "\improper derringer muzzle" ammo_type = /obj/item/ammo_casing/g4570 caliber = "45-70g" max_ammo = 2 - multiload = FALSE + multiload = 0 diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index a88a11b416..47213f17df 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -3,16 +3,14 @@ desc = "A easily concealable derringer. Uses .38 ammo" icon = 'icons/obj/guns/projectile.dmi' icon_state = "derringer" + flags_1 = CONDUCT_1 mag_type = /obj/item/ammo_box/magazine/internal/derringer + fire_delay = 5 obj_flags = UNIQUE_RENAME fire_sound = 'sound/weapons/revolvershot.ogg' casing_ejector = FALSE w_class = WEIGHT_CLASS_TINY -/obj/item/gun/ballistic/derringer/Initialize() - ..() - transform *= 0.8 //Spriter too lazy to make icons smaller than default revolvers, local coder hacks in solution. - /obj/item/gun/ballistic/derringer/get_ammo(countchambered = FALSE, countempties = TRUE) var/boolets = 0 //legacy var name maturity if (chambered && countchambered) @@ -27,7 +25,7 @@ return var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) - to_chat(user, "You load [num_loaded] shell\s into \the [src].") + to_chat(user, "You load [num_loaded] bullet\s into \the [src].") playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1) A.update_icon() update_icon() diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 5d68d00200..be8c7fac36 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -44,6 +44,26 @@ desc = "A small bottle. Contains epinephrine - used to stabilize patients." list_reagents = list(/datum/reagent/medicine/epinephrine = 30) +/obj/item/reagent_containers/glass/bottle/bicaridine + name = "bicaridine bottle" + desc = "A small bottle. Contains bicaridine - used to treat brute damage." + list_reagents = list(/datum/reagent/medicine/bicaridine = 30) + +/obj/item/reagent_containers/glass/bottle/kelotane + name = "kelotane bottle" + desc = "A small bottle. Contains kelotane - used to treat burn damage." + list_reagents = list(/datum/reagent/medicine/kelotane = 30) + +/obj/item/reagent_containers/glass/bottle/antitoxin + name = "anti-toxin bottle" + desc = "A small bottle. Contains anti-toxin - used to treat minor poisoning." + list_reagents = list(/datum/reagent/medicine/antitoxin = 30) + +/obj/item/reagent_containers/glass/bottle/dexalin + name = "dexalin bottle" + desc = "A small bottle. Contains dexalin - used to treat minor suffocation." + list_reagents = list(/datum/reagent/medicine/dexalin = 30) + /obj/item/reagent_containers/glass/bottle/toxin name = "toxin bottle" desc = "A small bottle of toxins. Do not drink, it is poisonous." diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index ab7dc91739..fd45ea37d9 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -51,7 +51,7 @@ Notes: /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none") if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size)) - return 0 + return FALSE if (!init) //Initialize some vars init = 1 @@ -83,7 +83,7 @@ Notes: if (queueHide) hide() - return 1 + return TRUE /datum/tooltip/proc/hide() @@ -122,4 +122,33 @@ Notes: if(user.client && user.client.tooltips) user.client.tooltips.hide() +/** + * # `get_tooltip_data()` + * + * If set, will return a list for the tooltip (that will also be put together in a `Join()`) + * However, if returning `null`, falls back to default behavior, which is `examine(src)`, and it will definitely include + * images since it is the default behavior + * + * Though no tooltips will be created for atoms that have `tooltips = FALSE` +*/ +/atom/movable/proc/get_tooltip_data() + return +/atom/movable/MouseEntered(location, control, params) + . = ..() + if(tooltips) + if(!QDELETED(src)) + var/list/examine_list = examine(src) + var/get_tooltip_data = get_tooltip_data() + if(length(get_tooltip_data)) + examine_list = get_tooltip_data + var/examine_data = examine_list.Join("
") + openToolTip(usr, src, params, title = name, content = examine_data) + +/atom/movable/MouseExited(location, control, params) + . = ..() + closeToolTip(usr) + +/client/MouseDown(object, location, control, params) + closeToolTip(usr) + . = ..() diff --git a/code/modules/unit_tests/character_saving.dm b/code/modules/unit_tests/character_saving.dm index c17c5ed37d..8d978a630d 100644 --- a/code/modules/unit_tests/character_saving.dm +++ b/code/modules/unit_tests/character_saving.dm @@ -3,12 +3,12 @@ var/datum/preferences/P = new P.load_path("test") P.features["flavor_text"] = "Foo" - P.skyrat_ooc_notes = "Bar" + P.features["ooc_notes"] = "Bar" P.save_character() P.load_character() if(P.features["flavor_text"] != "Foo") Fail("Flavor text is failing to save.") - if(P.skyrat_ooc_notes != "Bar") + if(P.features["ooc_notes"] != "Bar") Fail("OOC text is failing to save.") P.save_character() P.load_character() diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm index 853f6111b2..2ab6c6f490 100644 --- a/code/modules/uplink/uplink_items/uplink_ammo.dm +++ b/code/modules/uplink/uplink_items/uplink_ammo.dm @@ -7,6 +7,13 @@ // Ammunition +/datum/uplink_item/ammo/derringer + name = "Ammo Box - .45-70 GOVT" + desc = "Contains 10 additional .45-70 GOVT rounds. Caliber is exceedingly rare, and thus, comes at a premium." + item = /obj/item/ammo_box/g4570 + cost = 5 + include_modes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/pistol name = "10mm Handgun Magazine" desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \ diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm index 673f2ab6ee..63d70b9141 100644 --- a/code/modules/uplink/uplink_items/uplink_stealth.dm +++ b/code/modules/uplink/uplink_items/uplink_stealth.dm @@ -49,7 +49,7 @@ name = "Compact Derringer" desc = "An easily concealable handgun capable of firing .357 rounds. Comes in an inconspicuious packet of cigarettes with additional munitions." item = /obj/item/storage/fancy/cigarettes/derringer - cost = 8 + cost = 6 surplus = 30 /datum/uplink_item/stealthy_weapons/derringerpack/purchase(mob/user, datum/component/uplink/U) @@ -57,7 +57,7 @@ item = /obj/item/storage/fancy/cigarettes/derringer/gold ..() -/datum/uplink_item/stalthy_weapons/derringerpack_nukie +/datum/uplink_item/stealthy_weapons/derringerpack_nukie name = "Antique Derringer" desc = "An easy to conceal, yet extremely deadly handgun, capable of firing .45-70 Govt rounds. Comes in a unique pack of cigarettes with additional munitions." item = /obj/item/storage/fancy/cigarettes/derringer/midworld diff --git a/code/modules/vending/dinnerware.dm b/code/modules/vending/dinnerware.dm index b78af9c46b..c5b85ed61c 100644 --- a/code/modules/vending/dinnerware.dm +++ b/code/modules/vending/dinnerware.dm @@ -8,6 +8,7 @@ /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, /obj/item/kitchen/rollingpin = 4, + /obj/item/kitchen/unrollingpin = 4, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/storage/box/cups = 2, diff --git a/html/changelogs/AutoChangeLog-pr-14637.yml b/html/changelogs/AutoChangeLog-pr-14637.yml new file mode 100644 index 0000000000..679e234e4a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14637.yml @@ -0,0 +1,5 @@ +author: "TheObserver-sys" +delete-after: True +changes: + - bugfix: "Fixes most of the weird handling bugs and improves cigarette case handling in general." + - rscadd: "The Gorlex Marauders have seen fit to allow you to purchase the .45-70 GOVT rare ammo, at a premium cost. Don't waste it." diff --git a/html/changelogs/AutoChangeLog-pr-14664.yml b/html/changelogs/AutoChangeLog-pr-14664.yml new file mode 100644 index 0000000000..c3d172a60c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14664.yml @@ -0,0 +1,5 @@ +author: "WanderingFox95" +delete-after: True +changes: + - rscadd: "added the unrolling pin, an innovative solution to dough-based mishaps." + - imageadd: "added visuals for the unrolling pin" diff --git a/html/changelogs/AutoChangeLog-pr-14684.yml b/html/changelogs/AutoChangeLog-pr-14684.yml new file mode 100644 index 0000000000..6b601d9579 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14684.yml @@ -0,0 +1,5 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "pirates now have a medbay and several other things qualifying as a buff" + - balance: "pirates lost their toilet" diff --git a/html/changelogs/AutoChangeLog-pr-14688.yml b/html/changelogs/AutoChangeLog-pr-14688.yml new file mode 100644 index 0000000000..df20b92695 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14688.yml @@ -0,0 +1,6 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "Fixed Cyborg examines adding an extra weird line." + - code_imp: "Everything can be set to have tooltips, and even coded to have neat tooltips." + - rscadd: "Makes it so humans and borgs already have tooltips." diff --git a/html/changelogs/AutoChangeLog-pr-14693.yml b/html/changelogs/AutoChangeLog-pr-14693.yml new file mode 100644 index 0000000000..a223095ecf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14693.yml @@ -0,0 +1,5 @@ +author: "dzahlus" +delete-after: True +changes: + - soundadd: "added new malf AI spawn and doomsday sound" + - sounddel: "removed old malf AI spawn and doomsday sound" diff --git a/html/changelogs/AutoChangeLog-pr-14696.yml b/html/changelogs/AutoChangeLog-pr-14696.yml new file mode 100644 index 0000000000..8d3185c647 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14696.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "Priority announcement admeme verb" diff --git a/icons/mob/inhands/equipment/kitchen_lefthand.dmi b/icons/mob/inhands/equipment/kitchen_lefthand.dmi index 93cd988cff..bd3e1f779f 100644 Binary files a/icons/mob/inhands/equipment/kitchen_lefthand.dmi and b/icons/mob/inhands/equipment/kitchen_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/kitchen_righthand.dmi b/icons/mob/inhands/equipment/kitchen_righthand.dmi index 075b4c2033..9e9f21b0f5 100644 Binary files a/icons/mob/inhands/equipment/kitchen_righthand.dmi and b/icons/mob/inhands/equipment/kitchen_righthand.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 7dac61a663..892f974afd 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 31312ac9a1..9a4af82449 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index 587703a2de..8d08e59dc4 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -26,8 +26,6 @@ if(!(alt_titles_preferences[job.title] in job.alt_titles)) alt_titles_preferences.Remove(job.title) - skyrat_ooc_notes = sanitize_text(S["skyrat_ooc_notes"]) - skyrat_ooc_notes = strip_html_simple(skyrat_ooc_notes, MAX_FLAVOR_LEN, TRUE) erppref = sanitize_text(S["erp_pref"], "Ask") if(!length(erppref)) erppref = "Ask" nonconpref = sanitize_text(S["noncon_pref"], "Ask") @@ -42,11 +40,6 @@ extremeharm = "No" enable_personal_chat_color = sanitize_integer(enable_personal_chat_color, 0, 1, initial(enable_personal_chat_color)) personal_chat_color = sanitize_hexcolor(personal_chat_color, 6, 1, "#FFFFFF") - //Moves over the previous OOC notes to our ooc notes - if(length(features["ooc_notes"]) > length(skyrat_ooc_notes)) - skyrat_ooc_notes = features["ooc_notes"] - features["ooc_notes"] = "" - //END OF SKYRAT CHANGES /datum/preferences/proc/cit_character_pref_save(savefile/S) //ipcs @@ -71,7 +64,6 @@ WRITE_FILE(S["silicon_feature_flavor_text"], features["silicon_flavor_text"]) //skyrat stuff - WRITE_FILE(S["skyrat_ooc_notes"], skyrat_ooc_notes) WRITE_FILE(S["erp_pref"], erppref) WRITE_FILE(S["noncon_pref"], nonconpref) WRITE_FILE(S["vore_pref"], vorepref) diff --git a/modular_sand/code/modules/mob/living/carbon/human/human.dm b/modular_sand/code/modules/mob/living/carbon/human/human.dm deleted file mode 100644 index d797abb637..0000000000 --- a/modular_sand/code/modules/mob/living/carbon/human/human.dm +++ /dev/null @@ -1,12 +0,0 @@ -/mob/living/carbon/human/Topic(href, href_list) - . = ..() - if(href_list["skyrat_ooc_notes"]) - if(client) - var/str = "[src]'s OOC Notes :
ERP : [client.prefs.erppref] | Non-Con : [client.prefs.nonconpref] | Vore : [client.prefs.vorepref]" - if(client.prefs.extremepref == "Yes") - str += "
Extreme content : [client.prefs.extremepref] | Extreme content harm : [client.prefs.extremeharm]" - str += "
[html_encode(client.prefs.skyrat_ooc_notes)]" - var/datum/browser/popup = new(usr, "[name]'s ooc info", "[name]'s OOC Information", 500, 200) - popup.set_content(text("[][]", "[name]'s OOC information", replacetext(str, "\n", "
"))) - popup.open() - return diff --git a/modular_sand/code/modules/mob/living/silicon/silicon.dm b/modular_sand/code/modules/mob/living/silicon/silicon.dm index 77215a64e5..eaf8bb7400 100644 --- a/modular_sand/code/modules/mob/living/silicon/silicon.dm +++ b/modular_sand/code/modules/mob/living/silicon/silicon.dm @@ -4,14 +4,6 @@ pull_cursor_icon = null throw_cursor_icon = null -/mob/living/silicon/Topic(href, href_list) - . = ..() - if(href_list["skyrat_ooc_notes"]) - if(client) - var/str = "[src]'s OOC Notes :
ERP : [client.prefs.erppref] | Non-Con : [client.prefs.nonconpref] | Vore : [client.prefs.vorepref]
[client.prefs.skyrat_ooc_notes]" - usr << browse(text("[][]", "[name]'s OOC information", replacetext(str, "\n", "
")), text("window=[];size=500x200", "[name]'s ooc info")) - onclose(usr, "[name]'s ooc info") - /mob/living/silicon/verb/robot_nom(var/mob/living/T in oview(1)) set name = "Eat Mob" set category = "Vore" diff --git a/sound/ambience/antag/Malf.ogg b/sound/ambience/antag/Malf.ogg index feea5fbf19..c84ec5ecff 100644 Binary files a/sound/ambience/antag/Malf.ogg and b/sound/ambience/antag/Malf.ogg differ diff --git a/sound/announcer/classic/aimalf.ogg b/sound/announcer/classic/aimalf.ogg index b7996916b4..cd74872c66 100644 Binary files a/sound/announcer/classic/aimalf.ogg and b/sound/announcer/classic/aimalf.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 351da3112b..e6e66b1781 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3904,7 +3904,6 @@ #include "modular_sand\code\modules\mob\living\typing_indicator_overrides.dm" #include "modular_sand\code\modules\mob\living\carbon\carbon.dm" #include "modular_sand\code\modules\mob\living\carbon\show.dm" -#include "modular_sand\code\modules\mob\living\carbon\human\human.dm" #include "modular_sand\code\modules\mob\living\carbon\human\species.dm" #include "modular_sand\code\modules\mob\living\silicon\silicon.dm" #include "modular_sand\code\modules\mob\living\silicon\robot\robot.dm"