Did those mech changes I wanted to do a while ago, reverted gamma armory to old behavior.

This commit is contained in:
ZomgPonies
2014-07-17 16:50:55 -04:00
parent 58803b7b83
commit 12b228b799
4 changed files with 12841 additions and 12840 deletions
+4 -14
View File
@@ -178,7 +178,7 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.dock_target_offsite = "research_outpost_dock"
shuttles["Research"] = shuttle
process_shuttles += shuttle
shuttle = new()
shuttle.warmup_time = 10
shuttle.area_offsite = locate(/area/shuttle/siberia/outpost)
@@ -202,17 +202,7 @@ var/global/datum/shuttle_controller/shuttle_controller
ERT.dock_target_offsite = "specops_centcom_dock"
shuttles["Special Operations"] = ERT
process_shuttles += ERT
//Gamma Shuttle
shuttle = new()
shuttle.location = 1
shuttle.warmup_time = 10
shuttle.area_offsite = locate(/area/shuttle/gamma/space)
shuttle.area_station = locate(/area/shuttle/gamma/station)
shuttle.docking_controller_tag = "gamma_shuttle"
shuttle.dock_target_station = "gamma_shuttle_dock"
shuttles["Gamma"] = shuttle
process_shuttles += shuttle
//Vox Shuttle.
var/datum/shuttle/multi_shuttle/VS = new/datum/shuttle/multi_shuttle()
@@ -292,12 +282,12 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle = dock_controller_map[C.id_tag]
shuttle.docking_controller = C.program
dock_controller_map -= C.id_tag
//escape pods
if(istype(C, /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod) && istype(shuttle, /datum/shuttle/ferry/escape_pod))
var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/EPC = C
EPC.pod = shuttle
if (C.id_tag in dock_controller_map_station)
multidock = dock_controller_map_station[C.id_tag]
if (istype(multidock))
+7 -6
View File
@@ -15,14 +15,15 @@
var/defence_deflect = 35
wreckage = /obj/effect/decal/mecha_wreckage/durand
/*
/obj/mecha/combat/durand/New()
/obj/mecha/combat/durand/loaded/New()
..()
weapons += new /datum/mecha_weapon/ballistic/lmg(src)
weapons += new /datum/mecha_weapon/ballistic/scattershot(src)
selected_weapon = weapons[1]
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
ME.attach(src)
return
*/
/obj/mecha/combat/durand/relaymove(mob/user,direction)
if(defence)
+9
View File
@@ -15,6 +15,15 @@
wreckage = /obj/effect/decal/mecha_wreckage/gygax
internal_damage_threshold = 35
max_equip = 3
force = 10
/obj/mecha/combat/gygax/loaded/New()
..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang
ME.attach(src)
return
/obj/mecha/combat/gygax/dark
desc = "A lightweight exosuit used by Nanotrasen Death Squads. A significantly upgraded Gygax security mech."
+12821 -12820
View File
File diff suppressed because it is too large Load Diff