From 4cc7d40d835740651e04be46c212d7d310885c0f Mon Sep 17 00:00:00 2001 From: Pinta <> Date: Wed, 14 Feb 2024 02:18:49 -0500 Subject: [PATCH] maps and some other tweaks --- .../code/mechanics/den abductors/console.dm | 43 ++++++++++++++++++- _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 24 +++++++---- .../machinery/computer/camera_advanced.dm | 2 +- 3 files changed, 57 insertions(+), 12 deletions(-) diff --git a/GainStation13/code/mechanics/den abductors/console.dm b/GainStation13/code/mechanics/den abductors/console.dm index 4bdc63c0..811f4c6b 100644 --- a/GainStation13/code/mechanics/den abductors/console.dm +++ b/GainStation13/code/mechanics/den abductors/console.dm @@ -22,7 +22,7 @@ var/dat = "" dat += "

FeederSoft 3000

" - var/credits = linked_scale.credits + var/credits = linked_scale?.credits dat += "Gear Credits: [credits]
" dat += "Transfer data in exchange for supplies:
" dat += "Nutri-Pump TURBO Autosurgeon
" @@ -164,6 +164,11 @@ /// What is the current team number? var/team_number = 27 + +/obj/structure/scale/credits/Initialize(mapload) + ..() + return INITIALIZE_HINT_LATELOAD + /obj/structure/scale/credits/attackby(obj/item/used_tool, mob/user, params) if(!istype(used_tool, /obj/item/wrench)) return ..() @@ -197,5 +202,39 @@ /obj/machinery/abductor/pad/feeder team_number = 27 -/obj/machinery/computer/camera_advanced/abductor/camera/feeder +/obj/machinery/computer/camera_advanced/abductor/feeder team_number = 27 + vest_mode_action = null + vest_disguise_action = null + +/obj/machinery/computer/camera_advanced/abductor/feeder/IsScientist(mob/living/carbon/human/H) + return TRUE + +/obj/item/abductor/gizmo/feeder + mode = GIZMO_MARK + +/obj/item/abductor/gizmo/feeder/ScientistCheck(mob/user) + return TRUE + +/obj/item/abductor/gizmo/attack_self(mob/user) + return + +/obj/item/abductor/gizmo/feeder/mark(atom/target, mob/living/user) + if(!ishuman(target)) + return FALSE + + if(target == marked) + to_chat(user, "You begin to teleport [target]...") + if(!do_after(user, 45 SECONDS, target = target)) // You have to be standing still for a while + return FALSE + + console?.pad.Retrieve(marked) + return TRUE + + if(target == user) + marked = user + return TRUE + + prepare(target,user) + return TRUE + diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 6d75ff25..92798c31 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -14,7 +14,8 @@ "cw" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate{pixel_x = -10},/obj/item/clothing/head/helmet/space/syndicate{pixel_x = -10},/obj/item/clothing/mask/gas{pixel_x = -10; pixel_y = 3},/obj/item/clothing/suit/space/syndicate/orange{pixel_x = 8; name = "extra stretchy space suit"},/obj/item/clothing/head/helmet/space/syndicate/orange{pixel_x = 10},/obj/item/clothing/mask/gas{pixel_x = 10; pixel_y = 3},/obj/item/tank/jetpack/carbondioxide/eva,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "cx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cy" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/store/cake/chocolate,/obj/machinery/light/small{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) -"cV" = (/obj/structure/sign/poster/contraband/syndicate_recruitment{pixel_x = -28},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"cR" = (/obj/machinery/door/airlock/abductor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"cV" = (/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "cW" = (/obj/structure/cable{icon_state = "0-4"},/obj/machinery/power/apc{name = "Base Power Controller"; pixel_x = -28},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "dd" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "de" = (/obj/structure/sign/poster/contraband/donut_corp{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) @@ -73,13 +74,14 @@ "mf" = (/obj/structure/reagent_dispensers/cooking_oil,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "mm" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "mD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/door/airlock/public/glass{name = "Cell 3"; id_tag = "feederden_cell3"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) -"mJ" = (/obj/structure/scale,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) +"mJ" = (/obj/structure/scale/credits,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "mU" = (/obj/structure/sink/kitchen{dir = 8; pixel_x = 11},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "nd" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/store/cake/chocolate{pixel_y = 15},/obj/item/trash/plate{pixel_x = -4; pixel_y = 3},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "nr" = (/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "nu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/door/airlock/public/glass{name = "Cell 1"; id_tag = "feederden_cell1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "nw" = (/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "nE" = (/obj/structure/flora/junglebush,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) +"nK" = (/obj/machinery/abductor/feeder_console,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "nW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/plantgenes{pixel_y = 6},/obj/structure/table,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "oH" = (/obj/structure/lattice/catwalk,/turf/template_noop,/area/ruin/space/has_grav/feedersden) "oK" = (/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) @@ -180,6 +182,7 @@ "DM" = (/obj/machinery/vending/boozeomat/all_access,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "DO" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "DU" = (/obj/structure/chair/sofa/right,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Ef" = (/obj/machinery/light{dir = 1},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "Ek" = (/obj/structure/table/wood,/obj/item/storage/box/drinkingglasses{pixel_y = 10; pixel_x = 4},/obj/item/reagent_containers/food/drinks/soda_cans/cola,/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{pixel_y = -7; pixel_x = -5},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "En" = (/obj/item/reagent_containers/food/snacks/chocolatebar,/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "Eq" = (/obj/machinery/shower{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) @@ -228,6 +231,7 @@ "NA" = (/obj/structure/sign/poster/contraband/donut_corp{pixel_x = -32},/obj/structure/scale,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "NB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "NJ" = (/obj/structure/curtain,/obj/effect/turf_decal/tile{dir = 4},/obj/effect/turf_decal/tile{dir = 1},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) +"NU" = (/obj/machinery/abductor/pad/feeder,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "NX" = (/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/railing,/turf/open/floor/plasteel/stairs/left{dir = 4},/area/ruin/space/has_grav/feedersden) "Oc" = (/turf/open/floor/wood{icon_state = "wood-broken"},/area/ruin/space/has_grav/feedersden) "Ow" = (/obj/effect/turf_decal/sand/plating,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) @@ -242,8 +246,10 @@ "QV" = (/obj/structure/sign/poster/contraband/sun_kist{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "QW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/vending/hydroseeds{slogan_delay = 700},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Rc" = (/obj/machinery/computer/camera_advanced/abductor/feeder,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "Rh" = (/obj/structure/table,/obj/machinery/microwave,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Rp" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Rr" = (/obj/structure/table/abductor,/obj/item/abductor/gizmo/feeder,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "Ru" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_north"},/obj/effect/turf_decal/tile/red,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Rw" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plating/airless,/area/ruin/space/has_grav/feedersden) "Rz" = (/obj/structure/railing{dir = 1},/turf/open/floor/plasteel/stairs/left{dir = 8},/area/ruin/space/has_grav/feedersden) @@ -308,13 +314,13 @@ FEFEFEFEFEFEfmBrBrBrnrZnNBLvAjAjuAKWAjAjNXYAYAYAYABDTGXWTGTGTGqquOuOkakakaybDsAj FEFEFEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrDcWJiONxgUgUgUuXZpTKDcnrnrgqnrnrnrnrnrnrDciuiuDcDcBrFEFEFEFEFE FEFEFEFEBrZCfmISBrBrBrnrMaEqnrxGNgqtnrWNYEfncnbanrDxvYFDLNdCsRiNvYSsnrrJZOWrkoPgnrridlkCnrfNginrBrBrBrFEFEFEFE FEFEFEFEBrBrfmfmBrBrBrnrtyEqnrikJhBeWsDOlslslslsvtDxvYSyvYvYvYvwvYmUnrcWmaICrscxtVbXJhkMnrfNdAnrBrBrBrFEFEFEFE -FEFEFEFEFEBrwwfmeEBrBrDcnrnrnrnrxGHpNkDOtHguboygaQoYvYvYvYvYvYvwvYkdnrxCTYFHYpDBnrzlJhXPnrnrnrDcBrBrBrFEFEFEFE -FEFEFEFEFEBrxZfmfmBrBrBrBrBrBrDcnrnrDcsNlsucaEBPnrvYaDMYMdRhDKjhANYUnrnrnrTPJhYXnrnrRanrnrBrEWYNfmBrBrBrFEFEFE -FEFEFEFEFEFEfmfmBrBrBrBrBrBrBrBrBrBrnrqhlslslsVFDczAnrnrnrkgnrnrnrnrDcAgcwddRCuFnrKnlsdvnrISVefmxZfxBrBrFEFEFE -FEFEFEFEFEFEFEfmBrBrBrBrBrBrBrBrBrBrnrcVlslslsdzPItjfhnroHoHoHdrVxnwAalslsfKJhvHRalslssCkgeEfmFEFEebFEFEFEFEFE -FEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrBrnrqMyqzJjSTUbWTxsunroHoHoHdrBVBVAalslscdzoFmEsienWQWEsRwfmFEFEebFEFEFEFEFE -FEFEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrDcnrnrnrnrnrnrnrnrpfgDoHWtpfnrnrnrnrnrzEvLvLMivLvLvLMiUZFEFEFEebFEFEFEFEFE -FEFEFEFEFEFEFEFEFEFEBrBrBrBrBrFEFEBrBrBrBrBrBrBrXLBrqFebebebebebqFXLBrBrBrBrBrBrBrBrBrBrBrqFebebqFqFFEFEFEFEFE +FEFEFEFEFEBrwwfmeEBrBrDcnrnrDcnrxGHpNkDOtHguboygaQoYvYvYvYvYvYvwvYkdnrxCTYFHYpDBnrzlJhXPnrnrnrDcBrBrBrFEFEFEFE +FEFEFEFEFEBrxZfmfmBrBrBrBrBrDcDcnrnrDcsNlsucaEBPnrvYaDMYMdRhDKjhANYUnrnrnrTPJhYXnrnrRanrnrBrEWYNfmBrBrBrFEFEFE +FEFEFEFEFEFEfmfmBrBrBrBrBrBrnrnKEfRrnrqhlslslsVFDczAnrnrnrkgnrnrnrnrDcAgcwddRCuFnrKnlsdvnrISVefmxZfxBrBrFEFEFE +FEFEFEFEFEFEFEfmBrBrBrBrBrBrnrNUcVcVcRDOlslslsdzPItjfhnroHoHoHdrVxnwAalslsfKJhvHRalslssCkgeEfmFEFEebFEFEFEFEFE +FEFEFEFEFEFEFEFEBrBrBrBrBrBrnrRccVRrnrqMyqzJjSTUbWTxsunroHoHoHdrBVBVAalslscdzoFmEsienWQWEsRwfmFEFEebFEFEFEFEFE +FEFEFEFEFEFEFEFEFEBrBrBrBrBrDcnrnrnrDcnrnrnrnrnrnrnrnrpfgDoHWtpfnrnrnrnrnrzEvLvLMivLvLvLMiUZFEFEFEebFEFEFEFEFE +FEFEFEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrBrBrBrBrBrXLBrqFebebebebebqFXLBrBrBrBrBrBrBrBrBrBrBrqFebebqFqFFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrBrBrplfmFEFEFEFEFEFExZEWISfmeEfmBrBrBrBrBrBrBrFEFEFEBrBrFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrfmfmFEFEFEFEFEFEfmfmfmfmfmfmISBrBrBrBrBrBrFEFEFEFEFEFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrFEFEFEFEFEFEFEBrfmfmwwxZfmfmfmBrBrqFqFFEFEFEFEFEFEFEFEFEFEFE diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 320dff0d..1c40abde 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -89,7 +89,7 @@ return TRUE /obj/machinery/computer/camera_advanced/abductor/can_use(mob/user) - if(!isabductor(user)) + if(!IsScientist(user)) //GAINSTATION EDIT ORIGINAL: if(!isabductor(user)) return FALSE return ..()