diff --git a/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm b/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm index 193ecadb..8894f999 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm @@ -97,7 +97,7 @@ height = 17; id = "whiteship"; launch_status = 0; - movement_force = list("KNOCKDOWN"=0,"THROW"=0); + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); name = "Salvage Ship"; port_direction = 8; preferred_direction = 4; @@ -1350,7 +1350,7 @@ pixel_x = 4; pixel_y = 3; name = "Radio Network Manual"; - info = "RADIO NETWORK MANUAL

Every order intercom is set on 145.3 frequency by default. There are 6 of them, 0-5. It is recommended that you familiarize yourself with the layout of these tables for more efficient ship operation.
The general radio broadcast channel is for communicating with nearby crafts and stations. May be used for advertising purposes. It is recommended to temporary mute the order receiver intercom when preparing for general broadcast, as orders may interrupt your transmission." + info = "RADIO NETWORK MANUAL


Every order intercom is set on 145.3 frequency by default. There are 6 of them, 0-5. It is recommended that you familiarize yourself with the layout of these tables for more efficient ship operation.

The general radio broadcast channel is for communicating with nearby crafts and stations. May be used for advertising purposes. It is recommended to temporary mute the order receiver intercom when preparing for general broadcast, as orders may interrupt your transmission." }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/stripes{ @@ -1699,6 +1699,11 @@ /obj/machinery/computer/shuttle/white_ship{ dir = 8 }, +/obj/item/paper{ + pixel_x = -7; + name = "paper - printed note"; + info = "Hello lucky soul!

I'm Cynthia! More precisely, one of the Automonus Spacefearring Nutrision Distribution Centers (A.S.N.D.)! One of the Cynthia Fitness Corporation most advanced public assets! I don't have much time, so I'll make it quick! I got hit by a solar flare, lost contact with CFC, and soon being offline from hivemind will trigger my termination protocols!

I'm asking for one thing! Please, continue my mission! Bring 'healthy' yummies to whoever wants (or needs, by your judgment)! CFC will be grateful for your service! Make me proud of you, random explorer!



((PS. Remember my company policy! Clients with BMI equal or higher than 35 gets at least triple servings!))" + }, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/bridge{ name = "Bridge" @@ -1868,9 +1873,11 @@ name = "Bridge" }) "cG" = ( +/obj/structure/closet/emcloset/anchored, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 8 }, +/obj/item/crowbar, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, @@ -1888,11 +1895,6 @@ icon_state = "trim"; dir = 6 }, -/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ - dir = 8; - x_offset = -7; - y_offset = -8 - }, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/bridge{ name = "Bridge" diff --git a/_maps/map_files/gs13/Fast_Food.dmm b/_maps/map_files/gs13/Fast_Food.dmm index be15f1d2..b7671695 100644 --- a/_maps/map_files/gs13/Fast_Food.dmm +++ b/_maps/map_files/gs13/Fast_Food.dmm @@ -28,15 +28,15 @@ "aB" = (/obj/structure/chair/stool/bar,/obj/structure/sign/poster/official/foam_force_ad{pixel_x = -32},/obj/item/trash/popcorn,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/fastfood_main) "aC" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate/trashcart,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "aD" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) -"aE" = (/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/machinery/light{dir = 1},/obj/machinery/vending/gato,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) +"aE" = (/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/machinery/light{dir = 1},/obj/machinery/vending/gato{credits = 30},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "aF" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) -"aG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/sea_weed,/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) +"aG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/sea_weed,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "aH" = (/obj/structure/table/reinforced,/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "aI" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "aJ" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "aK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "aL" = (/obj/structure/chair/comfy/black{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) -"aM" = (/obj/docking_port/stationary/picked/whiteship,/turf/open/space,/area/space) +"aM" = (/turf/open/space,/area/space) "aN" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "2-4"},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "aO" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/item/twohanded/required/kirbyplants,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "aP" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/checker,/area/ruin/space/has_grav/fastfood_employee) @@ -61,7 +61,7 @@ "bi" = (/obj/structure/table/wood,/obj/item/storage/backpack/cheeseburgerbackpack,/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/fastfood_employee) "bj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/machinery/power/apc{pixel_x = 28; name = "Employee APC"},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "bk" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/structure/disposalpipe/segment{dir = 10},/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) -"bl" = (/obj/structure/closet/secure_closet/freezer/kitchen,/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/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) +"bl" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "bm" = (/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "bn" = (/obj/structure/rack/shelf,/obj/item/storage/bag/trash{pixel_x = -6},/obj/item/storage/bag/trash/bluespace{pixel_x = -12},/obj/item/lightreplacer{pixel_x = 6},/obj/item/storage/box/lights/mixed,/obj/item/soap/nanotrasen,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "bo" = (/obj/structure/table/wood,/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/fastfood_employee) @@ -115,7 +115,7 @@ "et" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) "eE" = (/obj/machinery/teleport/station,/obj/machinery/light{dir = 8},/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) -"eK" = (/obj/machinery/vending/cigarette,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) +"eK" = (/obj/machinery/vending/cigarette{credits = 30; baseprice = 0},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/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) "eS" = (/obj/machinery/door/airlock/external,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) @@ -135,6 +135,7 @@ "fZ" = (/obj/item/clothing/head/helmet/skull,/obj/item/stack/sheet/bone{pixel_x = 16},/turf/open/floor/plating/asteroid/airless,/area/space/nearstation) "gq" = (/obj/structure/chair/sofa/right{dir = 8},/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/fastfood_employee) "gA" = (/obj/machinery/telecomms/relay/preset/mining,/turf/open/floor/bluespace,/area/ruin/space/has_grav/fastfood_employee) +"gF" = (/obj/docking_port/stationary/picked/whiteship,/turf/open/space/basic,/area/space) "gI" = (/obj/effect/turf_decal/stripes/line{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 4},/turf/open/floor/circuit,/area/ruin/space/has_grav/fastfood_employee) "gP" = (/obj/machinery/disposal/bin{pixel_x = -8},/obj/machinery/airalarm/syndicate{pixel_y = 32},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "gQ" = (/obj/structure/trash_pile,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating/airless,/area/space/nearstation) @@ -172,12 +173,12 @@ "lm" = (/obj/structure/chair/comfy/black,/obj/structure/sign/poster/contraband/space_up{pixel_x = 32},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "ls" = (/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/obj/item/storage/toolbox/mechanical,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "lu" = (/obj/machinery/vending/wardrobe/bar_wardrobe,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"ly" = (/obj/effect/mob_spawn/human/fastfood,/obj/item/crowbar/red,/obj/item/clothing/mask/gas,/obj/item/tank/internals/emergency_oxygen/engi,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) +"ly" = (/obj/effect/mob_spawn/human/fastfood,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "lA" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/rack/shelf,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/rods/twentyfive,/obj/item/stack/rods/twentyfive,/obj/item/stack/rods/twentyfive,/obj/item/stock_parts/cell/high/plus,/obj/item/stock_parts/cell/high/plus,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/obj/item/stock_parts/cell/bluespace,/obj/item/storage/box/stockparts/deluxe,/obj/item/storage/box/stockparts/deluxe,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "lF" = (/obj/structure/sign/warning,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) "lH" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/sign/poster/contraband/space_cola{pixel_x = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "mb" = (/obj/machinery/vending/wardrobe/chef_wardrobe,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"mi" = (/obj/machinery/vending/dinnerware,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) +"mi" = (/obj/machinery/vending/dinnerware{credits = 10},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "mn" = (/obj/machinery/disposal/bin,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/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) "mq" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) "mr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) @@ -501,7 +502,7 @@ "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) "Wv" = (/obj/item/trash/plate{pixel_x = -4; pixel_y = 10},/obj/item/trash/candy{pixel_x = 10; pixel_y = -3},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) -"WF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/fastfood_employee) +"WF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/mob_spawn/human/fastfoodmanager{dir = 4},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/fastfood_employee) "WM" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "WN" = (/obj/structure/trash_pile,/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plating/airless,/area/space/nearstation) "WO" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) @@ -516,7 +517,7 @@ "XN" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) "XP" = (/obj/structure/table/plaswood,/obj/item/flashlight/lamp,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "XQ" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/obj/item/reagent_containers/food/snacks/cubannachos,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) -"Yk" = (/obj/machinery/light{dir = 1},/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/mob_spawn/human/fastfood,/obj/item/crowbar/red,/obj/item/clothing/mask/gas,/obj/item/tank/internals/emergency_oxygen/engi,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) +"Yk" = (/obj/machinery/light{dir = 1},/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/obj/structure/rack/shelf,/obj/item/tank/internals/emergency_oxygen/engi,/obj/item/tank/internals/emergency_oxygen/engi,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/crowbar/red,/obj/item/crowbar/red,/obj/item/crowbar/red,/obj/item/clothing/mask/gas,/obj/item/tank/internals/emergency_oxygen/engi,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "Ys" = (/obj/machinery/door/airlock/public,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "YL" = (/obj/structure/medkit_cabinet{pixel_y = 27},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/item/trash/can,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "YW" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 1},/turf/open/floor/plasteel/dark/side{dir = 6},/area/ruin/space/has_grav/fastfood_employee) @@ -527,7 +528,7 @@ (1,1,1) = {" DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaMDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh -DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh +DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhgFDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 22120993..b922c73e 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -634,25 +634,31 @@ mob_species = /datum/species/human short_desc = "It's the grand opening day!" flavour_text = "After you've sold your soul to corporate overlords, your contract obliged you to enter cryostasis. \ - Finally, after God knows how long, the cryopod system have awakened you with only a single sentence of information - welcome and lure in new guests into the freshly opened restaurant!" + Finally, after God knows how long, the cryopod system have awakened you with only a single sentence of information - welcome and lure in new guests into the freshly opened GATO restaurant!" assignedrole = "Restaurant worker" mirrorcanloadappearance = TRUE +/obj/effect/mob_spawn/human/fastfoodmanager + name = "Corporate cryostasis pod" + desc = "Through the grease-stained cryopod glass, you can see someone sleeping inside..." + mob_name = "fastfood worker" + job_description = "Restaurant Manager" + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + death = FALSE + roundstart = FALSE + mob_species = /datum/species/human + short_desc = "It's the grand opening day!" + flavour_text = "After you've sold your soul to corporate overlords, your contract obliged you to enter cryostasis. \ + Finally, after God knows how long, the cryopod system have awakened you with only a single sentence of information - make sure to keep the best care of GATO's restaurant, currently under your management! You have a higher say over your workers, but do not abuse this power." + assignedrole = "Restaurant manager" + mirrorcanloadappearance = TRUE + /obj/effect/mob_spawn/human/fastfood/Initialize(mapload) . = ..() - var/arrpee = rand(1,3) + var/arrpee = rand(1,2) switch(arrpee) if(1) - flavour_text += "You are this restaurant's manager, taking care of all the necessary paperwork, overseeing all the workers... \ - But most importantly, you always have to make sure that the restaurant prospers and remains in good shape! " - outfit.glasses = /obj/item/clothing/glasses/sunglasses/reagent - outfit.uniform = /obj/item/clothing/under/suit_jacket/burgundy - outfit.shoes = /obj/item/clothing/shoes/sneakers/black - outfit.back = /obj/item/storage/backpack/satchel/leather - outfit.ears = /obj/item/radio/headset - outfit.id = /obj/item/card/id/silver - - if(2) flavour_text += "You are this restaurant's cook, using up the plethora of ingredients to cook up deliciously greasy and caloric foods. \ The kitchen and the bar is your turf! Make sure the guests stay fed." outfit.glasses = /obj/item/clothing/glasses/sunglasses/reagent @@ -663,7 +669,7 @@ outfit.back = /obj/item/storage/backpack outfit.ears = /obj/item/radio/headset outfit.id = /obj/item/card/id/silver - if(3) + if(2) flavour_text += "You are this restaurant's waiter, responsible not only for tending to the guests, but also fixing and taking care of station's shape, power and looks. \ Make sure everything looks squeaky clean and that the restaurant remains powered!" outfit.head = /obj/item/clothing/head/soft/black @@ -673,6 +679,32 @@ outfit.ears = /obj/item/radio/headset outfit.id = /obj/item/card/id/silver +/obj/effect/mob_spawn/human/fastfoodmanager/Initialize(mapload) + . = ..() + var/arrpee = rand(1,2) + switch(arrpee) + if(1) + flavour_text += "You are this restaurant's manager, taking care of all the necessary paperwork, overseeing all the workers... \ + But most importantly, you always have to make sure that the restaurant prospers and remains in good shape! " + outfit.glasses = /obj/item/clothing/glasses/sunglasses/reagent + outfit.uniform = /obj/item/clothing/under/suit_jacket/burgundy + outfit.shoes = /obj/item/clothing/shoes/sneakers/black + outfit.back = /obj/item/storage/backpack/satchel/leather + outfit.ears = /obj/item/radio/headset + outfit.id = /obj/item/card/id/silver + outfit.l_pocket = /obj/item/modular_computer/tablet + + if(2) + flavour_text += "You are this restaurant's manager, taking care of all the necessary paperwork, overseeing all the workers... \ + But most importantly, you always have to make sure that the restaurant prospers and remains in good shape! " + outfit.glasses = /obj/item/clothing/glasses/sunglasses/reagent + outfit.uniform = /obj/item/clothing/under/suit_jacket/navy + outfit.shoes = /obj/item/clothing/shoes/sneakers/black + outfit.back = /obj/item/storage/backpack/satchel/leather + outfit.ears = /obj/item/radio/headset + outfit.id = /obj/item/card/id/silver + outfit.l_pocket = /obj/item/modular_computer/tablet + /obj/effect/mob_spawn/human/fastfood/special(mob/living/carbon/human/new_spawn) ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT) @@ -681,13 +713,16 @@ return ..() +/obj/effect/mob_spawn/human/fastfoodmanager/Destroy() + return ..() + // Feeder's Den - fanatic (GS13) /obj/effect/mob_spawn/human/feeders_den/fanatic name = "Sleeper pod" desc = "Through the red glass, you can see someone sleeping inside..." - mob_name = "fanatical feeder" - job_description = "Den's Feeder" + mob_name = "Feeder Fanatic" + job_description = "Feeder Fanatic" short_desc = "You are a member of a niche branch of Syndicate with... strange goals." flavour_text = "After months of construction and gathering equipment, your den is finished - a monument to gluttony, equipped with every tool to turn any sharp body into a quivering mound of lard..." important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT! Despite being able to leave the outpost, you do NOT have a permission to antag or grief." @@ -710,7 +745,7 @@ ears = /obj/item/radio/headset/syndicate/alt back = /obj/item/storage/backpack r_hand = /obj/item/flashlight - r_pocket = /obj/item/gun/ballistic/automatic/pistol + r_pocket = /obj/item/gun/energy/fatoray id = /obj/item/card/id/syndicate/anyone implants = list(/obj/item/implant/weapons_auth) diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index 45c40f24..cbfb7f1e 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -53,4 +53,4 @@ #_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm ## GS13 #_maps/RandomRuins/SpaceRuins/feeders_den.dmm -#_maps/RandomRuins/SpaceRuins/fastfood.dmm +#_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm \ No newline at end of file