mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-24 00:51:26 +00:00
Fixes some exosuit stuff (#7511)
-fixes some premade exosuits not getting their gear -fixes some code using new instead of initialize -removes some unused code
This commit is contained in:
@@ -19,6 +19,10 @@
|
||||
if(!material)
|
||||
material = get_material_by_name("steel")
|
||||
. = ..()
|
||||
|
||||
spawn_mech_equipment()
|
||||
|
||||
/mob/living/heavy_vehicle/premade/proc/spawn_mech_equipment()
|
||||
install_system(new /obj/item/mecha_equipment/light(src), HARDPOINT_HEAD)
|
||||
|
||||
/mob/living/heavy_vehicle/premade/random
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
. = ..()
|
||||
|
||||
/mob/living/heavy_vehicle/premade/combat/spawn_mech_equipment()
|
||||
..()
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/taser(src), HARDPOINT_LEFT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/taser/ion(src), HARDPOINT_RIGHT_HAND)
|
||||
|
||||
|
||||
@@ -105,6 +105,8 @@
|
||||
|
||||
. = ..()
|
||||
|
||||
/mob/living/heavy_vehicle/premade/superheavy/spawn_mech_equipment()
|
||||
..()
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/missile(src), HARDPOINT_RIGHT_SHOULDER)
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/pulse(src), HARDPOINT_LEFT_SHOULDER)
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/taser/smg(src), HARDPOINT_RIGHT_HAND)
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
. = ..()
|
||||
|
||||
/mob/living/heavy_vehicle/premade/light/spawn_mech_equipment()
|
||||
..()
|
||||
install_system(new /obj/item/mecha_equipment/catapult(src), HARDPOINT_LEFT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/sleeper(src), HARDPOINT_BACK)
|
||||
install_system(new /obj/item/mecha_equipment/light(src), HARDPOINT_HEAD)
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
. = ..()
|
||||
|
||||
/mob/living/heavy_vehicle/premade/ripley/spawn_mech_equipment()
|
||||
..()
|
||||
install_system(new /obj/item/mecha_equipment/drill(src), HARDPOINT_LEFT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/clamp(src), HARDPOINT_RIGHT_HAND)
|
||||
|
||||
@@ -96,7 +98,7 @@
|
||||
name = "firefighting exosuit"
|
||||
desc = "A mix and match of industrial parts designed to withstand fires."
|
||||
|
||||
/mob/living/heavy_vehicle/premade/firefighter/New()
|
||||
/mob/living/heavy_vehicle/premade/firefighter/Initialize()
|
||||
if(!arms)
|
||||
arms = new /obj/item/mech_component/manipulators/ripley(src)
|
||||
arms.color = "#385b3c"
|
||||
@@ -110,16 +112,17 @@
|
||||
body = new /obj/item/mech_component/chassis/ripley(src)
|
||||
body.color = "#385b3c"
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
material = get_material_by_name("osmium", "carbide", "plasteel")
|
||||
|
||||
/mob/living/heavy_vehicle/premade/firefighter/spawn_mech_equipment()
|
||||
..()
|
||||
install_system(new /obj/item/mecha_equipment/drill(src), HARDPOINT_LEFT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/clamp(src), HARDPOINT_RIGHT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/drill(src), HARDPOINT_LEFT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/extinguisher(src), HARDPOINT_RIGHT_HAND)
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/item/mech_component/sensors/firefighter/prebuild()
|
||||
..()
|
||||
software = new(src)
|
||||
@@ -129,7 +132,7 @@
|
||||
name = "combat APLU \"Ripley\""
|
||||
desc = "A large APLU unit fitted with specialized composite armor and fancy, though old targeting systems."
|
||||
|
||||
/mob/living/heavy_vehicle/premade/combatripley/New()
|
||||
/mob/living/heavy_vehicle/premade/combatripley/Initialize()
|
||||
if(!arms)
|
||||
arms = new /obj/item/mech_component/manipulators/ripley(src)
|
||||
arms.color = "#849bc1"
|
||||
@@ -145,8 +148,10 @@
|
||||
|
||||
body.armour = new /obj/item/robot_parts/robot_component/armour/combat(src)
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/heavy_vehicle/premade/combatripley/spawn_mech_equipment()
|
||||
..()
|
||||
install_system(new /obj/item/mecha_equipment/drill(src), HARDPOINT_LEFT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/taser/laser(src), HARDPOINT_RIGHT_HAND)
|
||||
install_system(new /obj/item/mecha_equipment/mounted_system/grenadeflash(src), HARDPOINT_RIGHT_SHOULDER)
|
||||
|
||||
@@ -313,7 +313,6 @@
|
||||
build_path = /obj/item/mecha_equipment/mounted_system/grenadeflash
|
||||
materials = list(DEFAULT_WALL_MATERIAL = 20000, "gold" = 6000, "phoron" = 6000)
|
||||
|
||||
|
||||
/datum/design/item/mechfab/exosuit/crisisdrone
|
||||
name = "crisis drone"
|
||||
id = "crisis_drone"
|
||||
@@ -333,4 +332,3 @@
|
||||
id = "mech_flare"
|
||||
materials = list(DEFAULT_WALL_MATERIAL = 10000)
|
||||
build_path = /obj/item/mecha_equipment/mounted_system/flarelauncher
|
||||
|
||||
|
||||
6
html/changelogs/alberyk-mech.yml
Normal file
6
html/changelogs/alberyk-mech.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
author: Alberyk
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- tweak: "Fixed some exosuits not spawning with the right gear."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Reference in New Issue
Block a user