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.

Sign up for GitHub

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

[MIRROR] Premade exosuits now actually spawn with boards #2361

Merged
merged 2 commits into from
Aug 9, 2024
Merged

[MIRROR] Premade exosuits now actually spawn with boards #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a5eab
[MIRROR] Premade exosuits now actually spawn with boards
Merlin1230 Jun 16, 2024
b032cb2
Merge branch 'dev-sierra' into upstream-pr-34665
UEDCommander Aug 9, 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
29 changes: 9 additions & 20 deletions code/modules/mechs/components/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
var/obj/item/robot_parts/robot_component/radio/radio
var/obj/item/robot_parts/robot_component/camera/camera
var/obj/item/mech_component/control_module/software
/// Takes /obj/item/circuitboard/exosystem type paths for what boards get put in for prefabs
var/list/prebuilt_software = list()
has_hardpoints = list(HARDPOINT_HEAD)
var/active_sensors = 0
power_use = 15
Expand All @@ -32,6 +34,9 @@
/obj/item/mech_component/sensors/prebuild()
radio = new(src)
camera = new(src)
software = new(src)
for(var/board in prebuilt_software)
software.install_software(new board)

/obj/item/mech_component/sensors/update_components()
radio = locate() in src
Expand Down Expand Up @@ -162,11 +167,7 @@
desc = "A primitive set of sensors designed to work in tandem with most MKI Eyeball platforms."
max_damage = 100
power_use = 0

/obj/item/mech_component/sensors/powerloader/prebuild()
..()
software = new(src)
software.installed_software = list(MECH_SOFTWARE_UTILITY, MECH_SOFTWARE_ENGINEERING)
prebuilt_software = list(/obj/item/circuitboard/exosystem/utility, /obj/item/circuitboard/exosystem/engineering)

/obj/item/mech_component/sensors/light
name = "light sensors"
Expand All @@ -178,11 +179,7 @@
see_invisible = SEE_INVISIBLE_NOLIGHTING
power_use = 50
desc = "A series of high resolution optical sensors. They can overlay several images to give the pilot a sense of location even in total darkness. "

/obj/item/mech_component/sensors/light/prebuild()
..()
software = new(src)
software.installed_software = list(MECH_SOFTWARE_UTILITY, MECH_SOFTWARE_MEDICAL)
prebuilt_software = list(/obj/item/circuitboard/exosystem/medical, /obj/item/circuitboard/exosystem/utility)

/obj/item/mech_component/sensors/heavy
name = "heavy sensors"
Expand All @@ -191,11 +188,7 @@
icon_state = "heavy_head"
max_damage = 120
power_use = 0

/obj/item/mech_component/sensors/heavy/prebuild()
..()
software = new(src)
software.installed_software = list(MECH_SOFTWARE_WEAPONS)
prebuilt_software = list(/obj/item/circuitboard/exosystem/weapons)

/obj/item/mech_component/sensors/combat
name = "combat sensors"
Expand All @@ -205,8 +198,4 @@
vision_flags = SEE_MOBS
see_invisible = SEE_INVISIBLE_NOLIGHTING
power_use = 200

/obj/item/mech_component/sensors/combat/prebuild()
..()
software = new(src)
software.installed_software = list(MECH_SOFTWARE_WEAPONS)
prebuilt_software = list(/obj/item/circuitboard/exosystem/weapons)
5 changes: 0 additions & 5 deletions code/modules/mechs/premade/powerloader.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@
install_system(new /obj/item/mech_equipment/mounted_system/extinguisher(src), HARDPOINT_RIGHT_HAND)
install_system(new /obj/item/mech_equipment/atmos_shields(src), HARDPOINT_BACK)

/obj/item/mech_component/sensors/firefighter/prebuild()
..()
software = new(src)
software.installed_software = list(MECH_SOFTWARE_UTILITY, MECH_SOFTWARE_ENGINEERING)

/mob/living/exosuit/premade/powerloader/old
name = "weathered power loader"
desc = "An ancient, but well-liked cargo handling exosuit. The paint is starting to flake. Perhaps some maintenance is in order?"
Expand Down
5 changes: 2 additions & 3 deletions maps/away/scavver/scavver_gantry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@
"Desperado" = list("nav_gantry_desperado")
)

/obj/item/mech_component/sensors/light/salvage/prebuild()
..()
software.installed_software = list(MECH_SOFTWARE_UTILITY, MECH_SOFTWARE_ENGINEERING)
/obj/item/mech_component/sensors/light/salvage
prebuilt_software = list(/obj/item/circuitboard/exosystem/utility, /obj/item/circuitboard/exosystem/engineering)

/mob/living/exosuit/premade/salvage_gantry
name = "\improper Carrion Crawler"
Expand Down