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

New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC #6783

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7a7c03b
R.T.S.1
LC4492 Apr 10, 2024
184b45b
Merge branch 'master' of https://github.com/LC4492/CM-Space-Station-13
LC4492 May 23, 2024
ae3caa1
Merge branch 'cmss13-devs:master' into master
LC4492 Jun 13, 2024
066478e
Merge branch 'cmss13-devs:master' into master
LC4492 Jun 27, 2024
5ddbf4a
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 12, 2024
31e22ad
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 20, 2024
e7db6c6
New CIC Bulky Computers
LC4492 Jul 23, 2024
564ecb5
Small fix
LC4492 Jul 23, 2024
e7b3865
Small fix 2x
LC4492 Jul 23, 2024
36349d5
Small Fix 3x
LC4492 Jul 23, 2024
7c67fd1
Merge branch 'master' into New-Computers-and-bug-fixes
LC4492 Jul 23, 2024
1be0bf5
Small Fix 4x
LC4492 Jul 23, 2024
adc830f
Merge branch 'New-Computers-and-bug-fixes' of https://github.com/LC44…
LC4492 Jul 23, 2024
9196473
Small fix 5x
LC4492 Jul 23, 2024
0d6828d
Recommended Fixes
LC4492 Jul 23, 2024
7af5153
Improvements to Altitude Control
LC4492 Jul 23, 2024
da8df33
Extra update
LC4492 Jul 23, 2024
cd0f67d
Commended Changes and etc
LC4492 Jul 24, 2024
4e3f548
Update code/modules/cm_marines/altitude_control_console.dm
LC4492 Jul 28, 2024
8f023f3
Update code/modules/cm_marines/altitude_control_console.dm
LC4492 Jul 28, 2024
796b30b
Commended Changes
LC4492 Jul 28, 2024
9613651
Small fix
LC4492 Jul 28, 2024
82201a0
Merge branch 'cmss13-devs:master' into master
LC4492 Jul 29, 2024
dd0d63b
Commended Fixes
LC4492 Jul 29, 2024
d4b1c2c
Merge branch 'master' into New-Computers-and-bug-fixes
LC4492 Jul 29, 2024
c0356ce
Commended Fixes
LC4492 Jul 30, 2024
0b1beae
Commended fixes 2x
LC4492 Aug 1, 2024
8a5a4ce
Important fixes
LC4492 Aug 1, 2024
c20034c
Extra update
LC4492 Aug 1, 2024
d75ae05
Actually applies boost to dropships / ai_announce bug fix
LC4492 Aug 2, 2024
fc4f670
Small fix
LC4492 Aug 2, 2024
6cd392e
Another small fix
LC4492 Aug 2, 2024
71f595f
Apply duration if optimized and remove recharge change
Drulikar Aug 2, 2024
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
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
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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"
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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 records computer"
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
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "overwatch"
icon_state = "almayer_altitude"
name = "Altitude Control Console"
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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)
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
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)
Drulikar marked this conversation as resolved.
Show resolved Hide resolved

#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
Loading