From d3216deeb7e50a9c0f38b9c20cbd90446fac6cb7 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 26 Feb 2025 23:18:56 +0100 Subject: [PATCH] tiny tweaks - tiniest mapping tweaks like fixing access - replaced some gato / nt stuff where it makes sense --- _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 4 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 60 +++++++++++++++---- _maps/map_files/gs13/Fast_Food.dmm | 20 +++---- code/datums/shuttles.dm | 4 +- code/modules/projectiles/guns/energy/laser.dm | 6 +- 5 files changed, 65 insertions(+), 29 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 3ea042629d..0c92345520 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -75,7 +75,7 @@ "jh" = (/obj/structure/table,/obj/machinery/disposal/bin{pixel_y = -10},/obj/structure/disposalpipe/trunk{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "jI" = (/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) "jO" = (/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/melee/baton/stunsword/fattening,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/melee/baton/stunsword/fattening,/obj/item/clothing/neck/petcollar/calorite,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/pig/gag,/obj/item/stock_parts/cell/high,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/clothing/neck/petcollar/calorite,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/pig/gag,/obj/item/stock_parts/cell/high,/obj/item/melee/baton/fattening,/obj/item/melee/baton/fattening,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "kd" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/obj/item/kitchen/knife/butcher,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "kg" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_south"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ko" = (/obj/machinery/space_heater,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -161,7 +161,7 @@ "uF" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high/plus,/obj/structure/cable{icon_state = "1-2"},/obj/item/gps,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "uO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "uX" = (/obj/machinery/computer/security/telescreen/entertainment,/obj/structure/disposalpipe/segment,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) -"vf" = (/obj/machinery/button/door{desc = "A remote control-switch for secure storage."; id = "feederden_hangar"; name = "Syndicate Hangar Blast Doors"; req_access_txt = "11"; pixel_y = -24},/obj/effect/turf_decal/caution{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"vf" = (/obj/machinery/button/door{desc = "A remote control-switch for secure storage."; id = "feederden_hangar"; name = "Syndicate Hangar Blast Doors"; pixel_y = -24; req_one_access_txt = "150"},/obj/effect/turf_decal/caution{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "vk" = (/obj/item/trash/candy{pixel_x = 10; pixel_y = -3},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "vp" = (/obj/machinery/abductor/feeder_console,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "vt" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal{dir = 4},/obj/effect/turf_decal{dir = 8},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 90458d1494..a34bc82688 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -49766,6 +49766,9 @@ name = "Station Intercom (General)"; pixel_x = -27 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/main) "cfd" = ( @@ -49773,6 +49776,9 @@ dir = 1; pixel_y = -26 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engineering/main) "cff" = ( @@ -49780,6 +49786,9 @@ dir = 4; light_color = "#e8eaff" }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engineering/main) "cfl" = ( @@ -55085,6 +55094,12 @@ }, /turf/open/floor/plasteel, /area/science/explab) +"cNK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/main) "cOg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -56062,7 +56077,7 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "eHO" = ( -/obj/effect/turf_decal/vg_decals/atmos/plasma, +/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, /turf/open/floor/engine/co2, /area/engineering/atmos) "eIL" = ( @@ -57475,6 +57490,9 @@ dir = 1; pixel_y = -22 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/main) "hxn" = ( @@ -61731,6 +61749,12 @@ }, /turf/closed/wall, /area/service/theater) +"pUJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/main) "pUT" = ( /turf/open/floor/plasteel/dark, /area/service/chapel/office) @@ -63833,6 +63857,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/main) "uwT" = ( @@ -63998,6 +64025,15 @@ }, /turf/open/floor/engine, /area/engineering/main) +"uSb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/main) "uTz" = ( /obj/structure/sign/painting/library{ pixel_x = -32 @@ -96161,8 +96197,8 @@ fqS can cbj oge -cWw -cWw +pUJ +pUJ uwu cfa oge @@ -96932,9 +96968,9 @@ bZE car sdZ oge -cWw -cWw -cWw +cNK +cNK +cNK cfd qlt tlN @@ -97960,9 +97996,9 @@ fqS rZa sdZ oge -cWw -cWw -cWw +pUJ +pUJ +pUJ hxh qlt tlN @@ -98731,9 +98767,9 @@ fqS rZa cbn oge -cWw -cWw -cfP +cNK +cNK +uSb cff oge cfX diff --git a/_maps/map_files/gs13/Fast_Food.dmm b/_maps/map_files/gs13/Fast_Food.dmm index 36ede3dc9e..01060d9919 100644 --- a/_maps/map_files/gs13/Fast_Food.dmm +++ b/_maps/map_files/gs13/Fast_Food.dmm @@ -2,7 +2,7 @@ "ab" = (/obj/structure/sign/warning/nosmoking,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_main) "ac" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "ad" = (/obj/structure/flora/ashtree/ashtreee,/turf/open/floor/plating/asteroid/airless,/area/space/nearstation) -"ae" = (/obj/structure/chair/sofa{dir = 8},/obj/item/toy/plush,/obj/item/radio/intercom{pixel_x = 32},/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/fastfood_employee) +"ae" = (/obj/structure/chair/sofa{dir = 8},/obj/item/radio/intercom{pixel_x = 32},/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/fastfood_employee) "af" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/dark/side{dir = 6},/area/ruin/space/has_grav/fastfood_employee) "ag" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "ah" = (/obj/machinery/vending/coffee,/obj/machinery/light{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) @@ -51,7 +51,7 @@ "aY" = (/obj/structure/sink/kitchen{dir = 4; pixel_x = -11},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "aZ" = (/obj/structure/reagent_dispensers/cooking_oil,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "ba" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 1},/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/closet/crate/freezer,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) -"bb" = (/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"bb" = (/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "bc" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "bd" = (/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) "be" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/structure/sign/poster/official/cleanliness{pixel_y = 32},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) @@ -114,7 +114,7 @@ "eq" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "et" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) "eE" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) -"eG" = (/obj/structure/rack,/obj/item/circuitboard/computer/slot_machine,/obj/item/circuitboard/machine/biogenerator,/obj/item/circuitboard/machine/chem_dispenser,/obj/item/circuitboard/machine/dish_drive,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/microwave,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/seed_extractor,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) +"eG" = (/obj/structure/rack,/obj/item/circuitboard/computer/slot_machine,/obj/item/circuitboard/machine/biogenerator,/obj/item/circuitboard/machine/chem_dispenser,/obj/item/circuitboard/machine/dish_drive,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/microwave,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/seed_extractor,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/item/circuitboard/machine/dish_drive,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "eK" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/machinery/vending/cigarette{free = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "eM" = (/obj/structure/rack/shelf,/obj/machinery/light{dir = 1},/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "eP" = (/obj/item/reagent_containers/glass/beaker/bluespace{pixel_x = 8; pixel_y = 12},/obj/item/reagent_containers/food/snacks/store/cake/bscc{pixel_x = -9},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) @@ -318,7 +318,7 @@ "AR" = (/obj/machinery/disposal/bin{pixel_x = -8},/obj/structure/disposalpipe/trunk{dir = 4},/turf/open/floor/plasteel/checker,/area/ruin/space/has_grav/fastfood_employee) "AV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) "Ba" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/soysauce{pixel_x = -20},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) -"Bc" = (/obj/item/reagent_containers/food/snacks/cakeslice/carrot{pixel_y = 10},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"Bc" = (/obj/item/reagent_containers/food/snacks/cakeslice/carrot{pixel_y = 10},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Be" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "Bi" = (/obj/machinery/light/small{dir = 4},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Bp" = (/obj/item/shard,/turf/open/floor/plating/airless,/area/space/nearstation) @@ -427,10 +427,10 @@ "NS" = (/obj/structure/kitchenspike,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/structure/sign/warning/nosmoking/circle{pixel_y = 32},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "NV" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/stripes/line{dir = 1},/obj/item/trash/can,/obj/item/trash/boritos,/turf/open/floor/plating/airless,/area/space/nearstation) "NW" = (/obj/effect/turf_decal/stripes/line{dir = 5},/obj/effect/turf_decal/stripes/white/line{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 1},/turf/open/floor/circuit/telecomms,/area/ruin/space/has_grav/fastfood_employee) -"NY" = (/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"NY" = (/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Oa" = (/obj/item/trash/blueberry_gum,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/airless,/area/space/nearstation) "Oh" = (/obj/structure/sign/nanotrasen,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) -"OE" = (/obj/item/reagent_containers/food/snacks/burger/rib{pixel_y = 3; pixel_x = 1},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"OE" = (/obj/item/reagent_containers/food/snacks/burger/rib{pixel_y = 3; pixel_x = 1},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "OF" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/obj/machinery/modular_computer/console/preset/civilian{pixel_y = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "OV" = (/obj/structure/chair/comfy/black{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "OY" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_main) @@ -466,12 +466,12 @@ "RL" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "RV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_grid_diagonal"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_grid_diagonal"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "RZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_main) -"Sc" = (/obj/item/ammo_box/magazine/m45/kitchengun,/obj/item/gun/ballistic/automatic/pistol/m1911/kitchengun,/obj/structure/closet/wardrobe,/obj/item/clothing/neck/tie/black,/obj/item/clothing/under/suit/red,/obj/item/clothing/under/suit/navy,/obj/item/clothing/under/suit/burgundy,/obj/item/clothing/under/suit/charcoal,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) +"Sc" = (/obj/item/ammo_box/magazine/m45/kitchengun,/obj/item/gun/ballistic/automatic/pistol/m1911/kitchengun,/obj/structure/closet/wardrobe,/obj/item/clothing/neck/tie/black,/obj/item/clothing/under/suit/red,/obj/item/clothing/under/suit/navy,/obj/item/clothing/under/suit/burgundy,/obj/item/clothing/under/suit/charcoal,/obj/item/crowbar/large/heavy,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) "Sm" = (/obj/machinery/door/window/brigdoor/southright{name = "Pete Containment Unit"},/obj/machinery/door/firedoor/border_only/closed{dir = 2; name = "Pete Containment Unit seal"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "Sq" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "Sz" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "SE" = (/obj/structure/cursedfatfountain,/turf/open/floor/mineral/calorite/dance,/area/space/nearstation) -"SK" = (/obj/item/trash/tray,/obj/item/reagent_containers/food/snacks/burger/bigbite,/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"SK" = (/obj/item/trash/tray,/obj/item/reagent_containers/food/snacks/burger/bigbite,/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "SM" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "Te" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/sink/kitchen{dir = 4; pixel_x = -11; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "Tm" = (/obj/structure/bed/double,/obj/item/restraints/handcuffs/cable/zipties{pixel_y = 6},/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/cowmask/gag,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) @@ -497,7 +497,7 @@ "Vd" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Vm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "0-4"},/obj/machinery/power/apc{name = "Customer APC"; pixel_y = 28},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_main) "Vo" = (/obj/machinery/gibber,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) -"Vt" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"Vt" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Vx" = (/obj/structure/sign/poster/official/cleanliness{pixel_x = 32},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_main) "Vy" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/mayonnaise,/obj/item/reagent_containers/food/condiment/sugar{pixel_x = -10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "Vz" = (/obj/structure/sign/barsign,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) @@ -505,7 +505,7 @@ "VP" = (/obj/structure/chair/stool/bar,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "VR" = (/obj/structure/closet/crate/trashcart,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/stripes/line,/obj/item/trash/sosjerky,/turf/open/floor/plating/airless,/area/space/nearstation) "Wa" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals4"},/turf/open/floor/plasteel/dark/side{dir = 1},/area/ruin/space/has_grav/fastfood_employee) -"Wd" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"Wd" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Wg" = (/obj/machinery/conveyor_switch{id = "fastfood_trash"},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Wp" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "Wr" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/warning/vacuum{pixel_y = -32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 3e505e8662..1d15db8686 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -415,8 +415,8 @@ /datum/map_template/shuttle/emergency/goon suffix = "goon" - name = "NES Port" - description = "The GATO Emergency Shuttle Port(NES Port for short) is a shuttle used at other less known GATO facilities and has a more open inside for larger crowds, but fewer onboard shuttle facilities." //GS13 - Nanotrasen to GATO + name = "GES Port" //gs13 - NT to GT + description = "The GATO Emergency Shuttle Port(GES Port for short) is a shuttle used at other less known GATO facilities and has a more open inside for larger crowds, but fewer onboard shuttle facilities." //GS13 - Nanotrasen to GATO credit_cost = 500 // /datum/map_template/shuttle/emergency/rollerdome diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 91a97137cb..e326af353f 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -34,19 +34,19 @@ /obj/item/gun/energy/laser/retro name ="retro laser gun" icon_state = "retro" - desc = "An older model of the basic lasergun, no longer used by GATO's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws." //GS13 - Nanotrasen to GATO + desc = "An older model of the basic lasergun, no longer used by corporate private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws." //GS13 - made corpo name ambiguous ammo_x_offset = 3 /obj/item/gun/energy/laser/retro/old name ="laser gun" icon_state = "retro" - desc = "First generation lasergun, developed by GATO. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate. You really hope someone has developed a better lasergun while you were in cryo." //GS13 - Nanotrasen to GATO + desc = "First generation lasergun, developed by Nanotrasen. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate. You really hope someone has developed a better lasergun while you were in cryo." ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old) ammo_x_offset = 3 /obj/item/gun/energy/laser/hellgun name ="hellfire laser gun" - desc = "A relic of a weapon, built before GT began installing regulators on its laser weaponry. This pattern of laser gun became infamous for the gruesome burn wounds it caused, and was quietly discontinued once it began to affect GT's reputation." //GS13 - NT to GT + desc = "A relic of a weapon, built before corporations began installing regulators in laser weaponry. This pattern of laser gun became infamous for the gruesome burn wounds it caused, and was quietly discontinued once it began to affect GT's reputation." //GS13 - made corpo name ambiguous icon_state = "hellgun" ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire)