cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix

Browse Source 
Switches equipped mechs to use initialize instead of new
This commit is contained in:
Anewbe
2019-10-30 20:59:09 -04:00
committed by VirgoBot
parent 9eb9fd4b51
commit 52ea82ae2c
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/mecha/combat/gorilla.dm
View File

@@ -87,7 +87,7 @@
max_universal_equip = 5 max_universal_equip = 5
max_special_equip = 2 max_special_equip = 2
/obj/mecha/combat/gorilla/New() /obj/mecha/combat/gorilla/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) // This thing basically cannot function without an external power supply. var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) // This thing basically cannot function without an external power supply.
ME.attach(src) ME.attach(src)

2
code/game/mecha/combat/gygax.dm
View File

@@ -45,7 +45,7 @@
max_universal_equip = 1 max_universal_equip = 1
max_special_equip = 2 max_special_equip = 2
/obj/mecha/combat/gygax/dark/New() /obj/mecha/combat/gygax/dark/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
ME.attach(src) ME.attach(src)

4
code/game/mecha/combat/marauder.dm
View File

@@ -55,7 +55,7 @@
wreckage = /obj/effect/decal/mecha_wreckage/mauler wreckage = /obj/effect/decal/mecha_wreckage/mauler
mech_faction = MECH_FACTION_SYNDI mech_faction = MECH_FACTION_SYNDI
/obj/mecha/combat/marauder/New() /obj/mecha/combat/marauder/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
ME.attach(src) ME.attach(src)
@@ -69,7 +69,7 @@
src.smoke_system.attach(src) src.smoke_system.attach(src)
return return
/obj/mecha/combat/marauder/seraph/New() /obj/mecha/combat/marauder/seraph/Initialize()
..()//Let it equip whatever is needed. ..()//Let it equip whatever is needed.
var/obj/item/mecha_parts/mecha_equipment/ME var/obj/item/mecha_parts/mecha_equipment/ME
if(equipment.len)//Now to remove it and equip anew. if(equipment.len)//Now to remove it and equip anew.

2
code/game/mecha/combat/phazon.dm
View File

@@ -27,7 +27,7 @@
max_universal_equip = 3 max_universal_equip = 3
max_special_equip = 4 max_special_equip = 4
/obj/mecha/combat/phazon/equipped/New() /obj/mecha/combat/phazon/equipped/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/rcd var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/rcd
ME.attach(src) ME.attach(src)

2
code/game/mecha/medical/odysseus.dm
View File

@@ -123,7 +123,7 @@
C.images += holder C.images += holder
*/ */
/obj/mecha/medical/odysseus/loaded/New() /obj/mecha/medical/odysseus/loaded/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/sleeper var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/sleeper
ME.attach(src) ME.attach(src)

4
code/game/mecha/space/hoverpod.dm
View File

@@ -105,7 +105,7 @@
max_universal_equip = 1 max_universal_equip = 1
max_special_equip = 1 max_special_equip = 1
/obj/mecha/working/hoverpod/combatpod/New() /obj/mecha/working/hoverpod/combatpod/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
ME.attach(src) ME.attach(src)
@@ -116,7 +116,7 @@
/obj/mecha/working/hoverpod/shuttlepod /obj/mecha/working/hoverpod/shuttlepod
desc = "Who knew a tiny ball could fit three people?" desc = "Who knew a tiny ball could fit three people?"
/obj/mecha/working/hoverpod/shuttlepod/New() /obj/mecha/working/hoverpod/shuttlepod/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger
ME.attach(src) ME.attach(src)

4
code/game/mecha/working/ripley.dm
View File

@@ -54,7 +54,7 @@
max_universal_equip = 1 max_universal_equip = 1
max_special_equip = 1 max_special_equip = 1
/obj/mecha/working/ripley/deathripley/New() /obj/mecha/working/ripley/deathripley/Initialize()
..() ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/safety_clamp var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/safety_clamp
ME.attach(src) ME.attach(src)
@@ -64,7 +64,7 @@
desc = "An old, dusty mining ripley." desc = "An old, dusty mining ripley."
name = "APLU \"Miner\"" name = "APLU \"Miner\""
/obj/mecha/working/ripley/mining/New() /obj/mecha/working/ripley/mining/Initialize()
..() ..()
//Attach drill //Attach drill
if(prob(25)) //Possible diamond drill... Feeling lucky? if(prob(25)) //Possible diamond drill... Feeling lucky?