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

Revert "Frame Cleanup"

Browse Source
This commit is contained in:
Yoshax
2016-08-06 00:27:03 +01:00
committed by GitHub
parent 9f7b77d933
commit 82722ba42f
69 changed files with 913 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/xenobio2/machinery/core_extractor.dm
View File

@@ -21,6 +21,7 @@
/obj/machinery/slime/extractor/New()
..()
update_light_color()
circuit = new circuit(src)
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

2
code/modules/xenobio2/machinery/gene_manipulators.dm
View File

@@ -125,6 +125,7 @@
/obj/machinery/xenobio/extractor/New()
..()
circuit = new circuit(src)
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
@@ -267,6 +268,7 @@
/obj/machinery/xenobio/editor/New()
..()
circuit = new circuit(src)
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

8
code/modules/xenobio2/machinery/injector.dm
View File

@@ -25,6 +25,7 @@
reagents = R
R.my_atom = src
beaker = new /obj/item/weapon/reagent_containers/glass/beaker(src)
circuit = new circuit(src)
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
@@ -74,7 +75,7 @@
if(occupant)
occupant.forceMove(loc)
occupant = null
/obj/machinery/xenobio2/manualinjector/proc/eject_beaker()
if(beaker)
var/obj/item/weapon/reagent_containers/glass/beaker/B = beaker
@@ -136,9 +137,10 @@
move_into_injector(user,G.affecting)
/obj/item/weapon/circuitboard/xenobioinjectormachine
name = T_BOARD("biological injector")
build_path = /obj/machinery/xenobio2/manualinjector
board_type = /datum/frame/frame_types/machine
build_path = "/obj/machinery/xenobio2/manualinjector"
board_type = "machine"
origin_tech = list() //To be filled,
req_components = list() //To be filled,

5
code/modules/xenobio2/machinery/injector_computer.dm
View File

@@ -61,7 +61,7 @@
if(isxeno(injector.occupant))
var/mob/living/simple_animal/xeno/X = injector.occupant
data["compatible"] = 1
data["instability"] = 100 * (X.mut_level / X.mut_max)
data["instability"] = 100 * (X.mut_level / X.mut_max)
else
data["compatible"] = null
@@ -109,5 +109,6 @@
/obj/item/weapon/circuitboard/xenobio2computer
name = T_BOARD("injector control console")
build_path = /obj/item/weapon/circuitboard/xenobio2computer
build_path = "/obj/item/weapon/circuitboard/xenobio2computer"
board_type = "computer"
origin_tech = list() //To be filled,

1
code/modules/xenobio2/machinery/slime_replicator.dm
View File

@@ -19,6 +19,7 @@
/obj/machinery/slime/replicator/New()
..()
circuit = new circuit(src)
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)