Skip to content

Commit

Permalink
New CIC Bulky Computers
Browse files Browse the repository at this point in the history
  • Loading branch information
LC4492 committed Jul 23, 2024
1 parent 31e22ad commit e7db6c6
Show file tree
Hide file tree
Showing 10 changed files with 153 additions and 80 deletions.
6 changes: 6 additions & 0 deletions code/game/machinery/ARES/ARES_interface_apollo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,9 @@
to_chat(id_owner, SPAN_HELPFUL("AI visitation access granted."))
playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0)
return TRUE

/obj/structure/machinery/computer/working_joe/bulky
desc = "The IBM series 10 computer retrofitted to work as a console to facilitate Working Joes and their operation, allowing for easy allocation of resources. While somewhat dated it still serves its purpose."
icon = 'icons/obj/structures/machinery/ares.dmi'
icon_state = "console_bulky"
density = TRUE
9 changes: 8 additions & 1 deletion code/game/machinery/computer/camera_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,19 @@
network = list("NUKE")
circuit = null


/obj/structure/machinery/computer/cameras/almayer
density = FALSE
icon_state = "security_cam"
network = list(CAMERA_NET_ALMAYER)

/obj/structure/machinery/computer/cameras/almayer/bulky
name = "Security Cameras"
icon = 'icons/obj/structures/machinery/computer.dmi'
desc = "The IBM series 10 computer retrofitted to work as a security cameras console for the ship. While somewhat dated it still serves its purpose."
icon_state = "cameras_bulky"
density = TRUE
circuit = null

/obj/structure/machinery/computer/cameras/almayer/containment
name = "Containment Cameras"
network = list(CAMERA_NET_CONTAINMENT)
Expand Down
6 changes: 6 additions & 0 deletions code/game/machinery/computer/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -507,3 +507,9 @@
desc = "Cheap Weyland-Yutani Laptop."
icon_state = "medlaptop"
density = FALSE

/obj/structure/machinery/computer/med_data/bulky
name = "Medical Laptop"
desc = "The IBM series 10 computer retrofitted to be used to check the medical records of all crew. While somewhat dated it still serves its purpose."
icon_state = "medcomp_bulky"
deconstructible = FALSE
6 changes: 6 additions & 0 deletions code/game/supplyshuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
var/reqtime = 0 //Cooldown for requisitions - Quarxink
var/last_viewed_group = "categories"

/obj/structure/machinery/computer/ordercomp/bulky
desc = "The IBM series 10 computer retrofitted to be used as a console for the Automated Storage Retrieval System. While somewhat dated it still serves its purpose."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "request_bulky"
deconstructible = FALSE

/obj/structure/machinery/computer/supply_drop_console
name = "Supply Drop Console"
desc = "An old-fashioned computer hooked into the nearby Supply Drop system."
Expand Down
7 changes: 4 additions & 3 deletions code/modules/cm_marines/altitude_control_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ GLOBAL_VAR_INIT(ship_temp, 0)
GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)

/obj/structure/machinery/computer/altitude_control_console
icon_state = "overwatch"
icon_state = "almayer_altitude"
name = "Altitude Control Console"
desc = "The A.C.C console monitors, regulates, and updates the ships attitude and altitude in relation to the AO. It's not rocket science."
density = TRUE

/obj/structure/machinery/computer/altitude_control_console/attack_hand()
. = ..()
Expand Down Expand Up @@ -54,7 +55,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
continue
current_mob.apply_effect(3, WEAKEN)
shake_camera(current_mob, 10, 2)
ai_silent_announcement("Attention performing high-G maneuverer", ";", TRUE)
ai_silent_announcement("Attention performing high-G maneuver", ";", TRUE)
if(!temperature_change)
switch(GLOB.ship_alt)
if(SHIP_ALT_LOW)
Expand Down Expand Up @@ -128,7 +129,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
continue
current_mob.apply_effect(3, WEAKEN)
shake_camera(current_mob, 10, 2)
ai_silent_announcement("Attention: Performing high-G manoeuvre", ";", TRUE)
ai_silent_announcement("Attention: Performing high-G maneuver", ";", TRUE)

#undef COOLING
#undef OVERHEAT_COOLING
Expand Down
27 changes: 27 additions & 0 deletions code/modules/cm_marines/marines_consoles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,33 @@
icon_state = "cmonitor"
density = FALSE

/obj/structure/machinery/computer/crew/alt/update_icon()
if(stat & BROKEN)
icon_state = "cmonitorb"
else
if(stat & NOPOWER)
icon_state = "cmonitor0"
stat |= NOPOWER
else
icon_state = initial(icon_state)
stat &= ~NOPOWER

/obj/structure/machinery/computer/crew/bulky
desc = "The IBM series 10 computer retrofitted to be used to monitor active health sensors built into the wearer's uniform. While somewhat dated it still serves its purpose."
icon_state = "crew_bulky"
deconstructible = FALSE

/obj/structure/machinery/computer/crew/bulky/update_icon()
if(stat & BROKEN)
icon_state = "crew_bulkyb"
else
if(stat & NOPOWER)
icon_state = "crew_bulky0"
stat |= NOPOWER
else
icon_state = initial(icon_state)
stat &= ~NOPOWER

/obj/structure/machinery/computer/crew/alt/yautja
name = "\improper Yautja health monitor"
desc = "Used to monitor active health sensors of all Yautja in the system. You can see that the console highlights the human's ship areas with BLUE and the hunting locations with RED."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_tech/trees/marine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ GLOBAL_LIST_EMPTY(tech_controls_marine)
/obj/structure/machinery/computer/view_objectives
name = "Intel Database Computer"
desc = "An USCM Intel Computer for consulting the current Intel database."
icon_state = "terminal1_old"
icon_state = "comm"
unslashable = TRUE
unacidable = TRUE

Expand Down
Binary file modified icons/obj/structures/machinery/ares.dmi
Binary file not shown.
Binary file modified icons/obj/structures/machinery/computer.dmi
Binary file not shown.
Loading

0 comments on commit e7db6c6

Please sign in to comment.