shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35604 from ACCount12/construction_datum_refactor

Browse Source 
Refactors mech construction datums
This commit is contained in:
vuonojenmustaturska
2018-02-17 17:59:54 +02:00
committed by CitadelStationBot
parent b6ad24b9da
commit c64a8a8d6b
4 changed files with 1588 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+1 -2
View File
@@ -206,8 +206,7 @@
/obj/mecha/CheckParts(list/parts_list)
..()
var/obj/item/C = locate(/obj/item/stock_parts/cell) in contents
cell = C
cell = locate(/obj/item/stock_parts/cell) in contents
var/obj/item/stock_parts/scanning_module/SM = locate() in contents
var/obj/item/stock_parts/capacitor/CP = locate() in contents
if(SM)
code/game/mecha/mecha_construction_paths.dm
+1514 -1486
View File
File diff suppressed because it is too large Load Diff
code/game/mecha/mecha_parts.dm
+15 -30
View File
@@ -10,9 +10,15 @@
flags_1 = CONDUCT_1
/obj/item/mecha_parts/chassis
name="Mecha Chassis"
name = "Mecha Chassis"
icon_state = "backbone"
var/datum/construction/construct
var/construct_type
/obj/item/mecha_parts/chassis/Initialize()
. = ..()
if(construct_type)
construct = new construct_type(src)
/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
if(!construct || !construct.action(W, user))
@@ -25,10 +31,7 @@
/obj/item/mecha_parts/chassis/ripley
name = "\improper Ripley chassis"
/obj/item/mecha_parts/chassis/ripley/Initialize()
. = ..()
construct = new /datum/construction/mecha/ripley_chassis(src)
construct_type = /datum/construction/unordered/mecha_chassis/ripley
/obj/item/mecha_parts/part/ripley_torso
name = "\improper Ripley torso"
@@ -59,10 +62,7 @@
/obj/item/mecha_parts/chassis/odysseus
name = "\improper Odysseus chassis"
/obj/item/mecha_parts/chassis/odysseus/Initialize()
. = ..()
construct = new /datum/construction/mecha/odysseus_chassis(src)
construct_type = /datum/construction/unordered/mecha_chassis/odysseus
/obj/item/mecha_parts/part/odysseus_head
name = "\improper Odysseus head"
@@ -98,10 +98,7 @@
/obj/item/mecha_parts/chassis/gygax
name = "\improper Gygax chassis"
/obj/item/mecha_parts/chassis/gygax/Initialize()
. = ..()
construct = new /datum/construction/mecha/gygax_chassis(src)
construct_type = /datum/construction/unordered/mecha_chassis/gygax
/obj/item/mecha_parts/part/gygax_torso
name = "\improper Gygax torso"
@@ -144,10 +141,7 @@
/obj/item/mecha_parts/chassis/durand
name = "\improper Durand chassis"
/obj/item/mecha_parts/chassis/durand/Initialize()
. = ..()
construct = new /datum/construction/mecha/durand_chassis(src)
construct_type = /datum/construction/unordered/mecha_chassis/durand
/obj/item/mecha_parts/part/durand_torso
name = "\improper Durand torso"
@@ -188,21 +182,15 @@
////////// Firefighter
/obj/item/mecha_parts/chassis/firefighter
name = "Firefighter chassis"
/obj/item/mecha_parts/chassis/firefighter/Initialize()
. = ..()
construct = new /datum/construction/mecha/firefighter_chassis(src)
name = "\improper Firefighter chassis"
construct_type = /datum/construction/unordered/mecha_chassis/firefighter
////////// HONK
/obj/item/mecha_parts/chassis/honker
name = "\improper H.O.N.K chassis"
/obj/item/mecha_parts/chassis/honker/Initialize()
. = ..()
construct = new /datum/construction/mecha/honker_chassis(src)
construct_type = /datum/construction/unordered/mecha_chassis/honker
/obj/item/mecha_parts/part/honker_torso
name = "\improper H.O.N.K torso"
@@ -239,10 +227,7 @@
/obj/item/mecha_parts/chassis/phazon
name = "\improper Phazon chassis"
/obj/item/mecha_parts/chassis/phazon/Initialize()
. = ..()
construct = new /datum/construction/mecha/phazon_chassis(src)
construct_type = /datum/construction/unordered/mecha_chassis/phazon
/obj/item/mecha_parts/part/phazon_torso
name="\improper Phazon torso"