Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
}
]
}
128 changes: 67 additions & 61 deletions _maps/map_files/YogStation/YogStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -37589,6 +37589,15 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/exit)
"fOU" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/computer/ai_resource_distribution,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"fPF" = (
/obj/effect/turf_decal/delivery,
/obj/structure/noticeboard{
Expand Down Expand Up @@ -37735,13 +37744,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"fXq" = (
/obj/machinery/light,
/obj/effect/turf_decal/tile/darkblue{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"fXK" = (
/obj/effect/turf_decal/stripes,
/obj/structure/railing/corner,
Expand Down Expand Up @@ -43511,12 +43513,6 @@
},
/turf/open/floor/plating,
/area/storage/tech)
"jOp" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"jOV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
Expand Down Expand Up @@ -43821,6 +43817,12 @@
dir = 1
},
/area/hallway/secondary/entry)
"jXT" = (
/obj/machinery/status_display/ai{
pixel_x = 32
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat_interior)
"jXZ" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 5
Expand Down Expand Up @@ -44041,17 +44043,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"keO" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat_interior)
"kfj" = (
/obj/machinery/computer/station_alert{
dir = 4
Expand Down Expand Up @@ -44774,6 +44765,19 @@
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
/area/maintenance/aft)
"kGm" = (
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/tile/darkblue{
dir = 1
},
/obj/structure/sign/departments/minsky/command/charge{
pixel_y = 32
},
/obj/machinery/ai/expansion_card_holder,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"kGo" = (
/obj/machinery/light/small{
dir = 1
Expand Down Expand Up @@ -44869,6 +44873,14 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"kJS" = (
/obj/machinery/light,
/obj/effect/turf_decal/tile/darkblue{
dir = 8
},
/obj/machinery/ai/expansion_card_holder,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"kJW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/border_only{
Expand Down Expand Up @@ -48268,6 +48280,18 @@
},
/turf/open/floor/plating,
/area/bridge)
"nbi" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/machinery/ai/data_core/primary,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat_interior)
"nbu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
Expand Down Expand Up @@ -51034,6 +51058,13 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"oKe" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
/obj/item/memory_card,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"oKv" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
Expand Down Expand Up @@ -51351,14 +51382,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"oTV" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"oTW" = (
/obj/machinery/light{
dir = 1
Expand Down Expand Up @@ -52633,6 +52656,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/ai_monitored/storage/satellite)
"pPN" = (
/obj/item/processing_card,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"pQy" = (
/obj/machinery/door/airlock/public/glass{
name = "Escape Podbay"
Expand Down Expand Up @@ -61721,18 +61748,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"vZa" = (
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/tile/darkblue{
dir = 1
},
/obj/structure/sign/departments/minsky/command/charge{
pixel_y = 32
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"vZn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
Expand Down Expand Up @@ -64728,15 +64743,6 @@
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"yeT" = (
/obj/machinery/status_display/ai{
pixel_x = 32
},
/obj/machinery/porta_turret/ai{
scan_range = 4
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat_interior)
"yfe" = (
/obj/structure/table,
/obj/item/shard{
Expand Down Expand Up @@ -105808,11 +105814,11 @@ fSL
piS
tmG
pnH
vZa
lZD
kGm
pPN
vpQ
jOp
fXq
oKe
kJS
nnx
fgc
gHO
Expand Down Expand Up @@ -106065,9 +106071,9 @@ nWL
umC
pPs
pGB
oTV
fOU
bEI
keO
nbi
cVj
wjG
pbT
Expand Down Expand Up @@ -106322,11 +106328,11 @@ gEh
igK
xPv
pnH
yeT
jXT
ykC
lMF
pBu
yeT
jXT
nnx
mZe
lhR
Expand Down
2 changes: 2 additions & 0 deletions code/_onclick/hud/_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
// AI

#define ui_ai_core "SOUTH:6,WEST"
#define ui_ai_dashboard "SOUTH+1:6,WEST"
#define ui_ai_camera_list "SOUTH:6,WEST+1"
#define ui_ai_track_with_camera "SOUTH:6,WEST+2"
#define ui_ai_camera_light "SOUTH:6,WEST+3"
Expand All @@ -139,6 +140,7 @@
#define ui_ai_sensor "SOUTH:6,WEST+14"
#define ui_ai_multicam "SOUTH+1:6,WEST+13"
#define ui_ai_add_multicam "SOUTH+1:6,WEST+14"
#define ui_ai_language_menu "SOUTH+1:8,WEST+11:30"

// pAI

Expand Down
17 changes: 16 additions & 1 deletion code/_onclick/hud/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@
var/mob/living/silicon/ai/AI = usr
AI.ai_roster()

/obj/screen/ai/dashboard
name = "Processing Dashboard"
icon_state = "dashboard"

/obj/screen/ai/dashboard/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.dashboard.ui_interact(AI)

/obj/screen/ai/alerts
name = "Show Alerts"
icon_state = "alerts"
Expand Down Expand Up @@ -194,14 +204,19 @@

// Language menu
using = new /obj/screen/language_menu
using.screen_loc = ui_borg_language_menu
using.screen_loc = ui_ai_language_menu
static_inventory += using

//AI core
using = new /obj/screen/ai/aicore()
using.screen_loc = ui_ai_core
static_inventory += using

//Dashboard
using = new /obj/screen/ai/dashboard
using.screen_loc = ui_ai_dashboard
static_inventory += using

//Camera list
using = new /obj/screen/ai/camera_list()
using.screen_loc = ui_ai_camera_list
Expand Down
6 changes: 6 additions & 0 deletions code/modules/jobs/job_types/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

/datum/job/ai/after_spawn(mob/H, mob/M, latejoin)
. = ..()
/*
if(latejoin)

var/obj/structure/AIcore/latejoin_inactive/lateJoinCore
for(var/obj/structure/AIcore/latejoin_inactive/P in GLOB.latejoin_ai_cores)
if(P.is_available())
Expand All @@ -36,7 +38,11 @@
lateJoinCore.available = FALSE
H.forceMove(lateJoinCore.loc)
qdel(lateJoinCore)
*/
var/mob/living/silicon/ai/AI = H

AI.relocate(TRUE)

AI.apply_pref_name("ai", M.client) //If this runtimes oh well jobcode is fucked.
AI.set_core_display_icon(null, M.client)

Expand Down
Loading