Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project ARES: AI Core Makeover #5821

Merged
merged 7 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@
#define WALL_DEVWALL "devwall"
#define WALL_DEVWALL_R "devwall_r"
#define WALL_HUNTERSHIP "metal"//DMI specific name
#define WALL_AICORE "aiwall"

//Defines for dropship weapon gimbals
#define GIMBAL_LEFT -1
Expand Down
24 changes: 21 additions & 3 deletions code/game/machinery/doors/poddoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,40 @@
/obj/structure/machinery/door/airlock,
)

/obj/structure/machinery/door/poddoor/almayer/Initialize()
. = ..()
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, relativewall_neighbours)), 10)
realforest2001 marked this conversation as resolved.
Show resolved Hide resolved

/obj/structure/machinery/door/poddoor/almayer/open
density = FALSE

/obj/structure/machinery/door/poddoor/almayer/blended
icon_state = "almayer_pdoor1"
base_icon_state = "almayer_pdoor"

/obj/structure/machinery/door/poddoor/almayer/blended/open
density = FALSE

/obj/structure/machinery/door/poddoor/almayer/blended/white
icon_state = "w_almayer_pdoor1"
base_icon_state = "w_almayer_pdoor"

/obj/structure/machinery/door/poddoor/almayer/blended/white/open
density = FALSE

/obj/structure/machinery/door/poddoor/almayer/Initialize()
. = ..()
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, relativewall_neighbours)), 10)
/obj/structure/machinery/door/poddoor/almayer/blended/aicore
icon_state = "aidoor1"
base_icon_state = "aidoor"

/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open
density = FALSE

/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore
icon_state = "w_aidoor1"
base_icon_state = "w_aidoor"

/obj/structure/machinery/door/poddoor/almayer/blended/white_aicore/open
density = FALSE

/obj/structure/machinery/door/poddoor/almayer/locked
unslashable = TRUE
Expand Down
28 changes: 28 additions & 0 deletions code/game/objects/structures/window.dm
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,34 @@
unacidable = TRUE
health = 1000000 //Failsafe, shouldn't matter

/obj/structure/window/framed/almayer/aicore
icon_state = "ai_rwindow0"
basestate = "ai_rwindow"
window_frame = /obj/structure/window_frame/almayer/aicore

/obj/structure/window/framed/almayer/aicore/hull
name = "hull window"
desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
not_damageable = TRUE
not_deconstructable = TRUE
unslashable = TRUE
unacidable = TRUE
health = 1000000 //Failsafe, shouldn't matter

/obj/structure/window/framed/almayer/aicore/white
icon_state = "w_ai_rwindow0"
basestate = "w_ai_rwindow"
window_frame = /obj/structure/window_frame/almayer/aicore/white

/obj/structure/window/framed/almayer/aicore/white/hull
name = "hull window"
desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
not_damageable = TRUE
not_deconstructable = TRUE
unslashable = TRUE
unacidable = TRUE
health = 1000000 //Failsafe, shouldn't matter

/obj/structure/window/framed/colony
name = "window"
icon_state = "col_window0"
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/structures/window_frame.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,16 @@
basestate = "white_window"
window_type = /obj/structure/window/framed/almayer/white

/obj/structure/window_frame/almayer/aicore
icon_state = "ai_window0_frame"
basestate = "ai_window"
window_type = /obj/structure/window/framed/almayer/aicore

/obj/structure/window_frame/almayer/aicore/white
icon_state = "w_ai_window0_frame"
basestate = "w_ai_window"
window_type = /obj/structure/window/framed/almayer/aicore/white

/obj/structure/window_frame/almayer/requisitions/attackby(obj/item/W, mob/living/user)
if(istype(W, sheet_type))
to_chat(user, SPAN_WARNING("You can't repair this window."))
Expand Down
36 changes: 36 additions & 0 deletions code/game/turfs/floor_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,22 @@
/turf/open/floor/plating/plating_catwalk/shiva
icon = 'icons/turf/floors/ice_colony/shiva_floor.dmi'

/turf/open/floor/plating/plating_catwalk/aicore
icon = 'icons/turf/floors/aicore.dmi'
icon_state = "ai_plating_catwalk"

/turf/open/floor/plating/plating_catwalk/aicore/update_icon()
. = ..()
if(covered)
overlays += image(icon, src, "ai_catwalk", CATWALK_LAYER)

/turf/open/floor/plating/plating_catwalk/aicore/white
icon_state = "w_ai_plating_catwalk"

/turf/open/floor/plating/plating_catwalk/aicore/white/update_icon()
. = ..()
if(covered)
overlays += image(icon, src, "w_ai_catwalk", CATWALK_LAYER)

/turf/open/floor/plating/ironsand
name = "Iron Sand"
Expand Down Expand Up @@ -283,6 +298,27 @@
allow_construction = FALSE
hull_floor = TRUE

/turf/open/floor/almayer/aicore
icon = 'icons/turf/floors/aicore.dmi'
icon_state = "ai_floor1"

/turf/open/floor/almayer/aicore/glowing
icon_state = "ai_floor2"
light_color = "#d69c46"
light_range = 2

/turf/open/floor/almayer/aicore/glowing/Initialize(mapload, ...)
. = ..()
set_light_on(TRUE)

/turf/open/floor/almayer/aicore/no_build
allow_construction = FALSE
hull_floor = TRUE

/turf/open/floor/almayer/aicore/glowing/no_build
allow_construction = FALSE
hull_floor = TRUE

// RESEARCH STUFF
/turf/open/floor/almayer/research/containment/entrance
icon_state = "containment_entrance"
Expand Down
32 changes: 32 additions & 0 deletions code/game/turfs/walls/wall_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,39 @@
icon_state = "containment_window"
opacity = FALSE

//AI Core

/turf/closed/wall/almayer/aicore
walltype = WALL_AICORE
icon = 'icons/turf/walls/almayer_aicore.dmi'
icon_state = "aiwall"

/turf/closed/wall/almayer/aicore/reinforced
name = "reinforced hull"
damage_cap = HEALTH_WALL_REINFORCED
icon_state = "reinforced"

/turf/closed/wall/almayer/aicore/hull
name = "ultra reinforced hull"
desc = "An extremely reinforced metal wall used to isolate potentially dangerous areas"
hull = TRUE
icon_state = "hull"

/turf/closed/wall/almayer/aicore/white
walltype = WALL_AICORE
icon = 'icons/turf/walls/almayer_aicore_white.dmi'
icon_state = "aiwall"

/turf/closed/wall/almayer/aicore/white/reinforced
name = "reinforced hull"
damage_cap = HEALTH_WALL_REINFORCED
icon_state = "reinforced"

/turf/closed/wall/almayer/aicore/white/hull
name = "ultra reinforced hull"
desc = "An extremely reinforced metal wall used to isolate potentially dangerous areas"
hull = TRUE
icon_state = "hull"


//Sulaco walls.
Expand Down
Binary file modified icons/obj/structures/doors/blastdoors_shutters.dmi
Binary file not shown.
Binary file added icons/turf/floors/aicore.dmi
Binary file not shown.
Binary file added icons/turf/walls/almayer_aicore.dmi
Binary file not shown.
Binary file added icons/turf/walls/almayer_aicore_white.dmi
Binary file not shown.
Binary file modified icons/turf/walls/window_frames.dmi
Binary file not shown.
Binary file modified icons/turf/walls/windows.dmi
Binary file not shown.
Loading
Loading