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

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 19:24:25 -07:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/combat/combat.dm
+2 -2
View File
@@ -5,8 +5,8 @@
/obj/mecha/combat/CheckParts(list/parts_list)
..()
var/obj/item/weapon/stock_parts/capacitor/C = locate() in contents
var/obj/item/weapon/stock_parts/scanning_module/SM = locate() in contents
var/obj/item/stock_parts/capacitor/C = locate() in contents
var/obj/item/stock_parts/scanning_module/SM = locate() in contents
step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best
armor["energy"] += (C.rating * 10) //Each level of capacitor protects the mech against emp by 10%
qdel(C)
code/game/mecha/combat/gygax.dm
+1 -1
View File
@@ -39,7 +39,7 @@
ME.attach(src)
return
/obj/mecha/combat/gygax/dark/add_cell(obj/item/weapon/stock_parts/cell/C=null)
/obj/mecha/combat/gygax/dark/add_cell(obj/item/stock_parts/cell/C=null)
if(C)
C.forceMove(src)
cell = C
code/game/mecha/equipment/tools/medical_tools.dm
+6 -6
View File
@@ -296,10 +296,10 @@
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/action(atom/movable/target)
if(!action_checks(target))
return
if(istype(target, /obj/item/weapon/reagent_containers/syringe))
if(istype(target, /obj/item/reagent_containers/syringe))
return load_syringe(target)
if(istype(target, /obj/item/weapon/storage))//Loads syringes from boxes
for(var/obj/item/weapon/reagent_containers/syringe/S in target.contents)
if(istype(target, /obj/item/storage))//Loads syringes from boxes
for(var/obj/item/reagent_containers/syringe/S in target.contents)
load_syringe(S)
return
if(mode)
@@ -311,7 +311,7 @@
occupant_message("<span class=\"alert\">No available reagents to load syringe with.</span>")
return
var/turf/trg = get_turf(target)
var/obj/item/weapon/reagent_containers/syringe/mechsyringe = syringes[1]
var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1]
mechsyringe.forceMove(get_turf(chassis))
reagents.trans_to(mechsyringe, min(mechsyringe.volume, reagents.total_volume))
syringes -= mechsyringe
@@ -456,7 +456,7 @@
output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] - <a href=\"?src=\ref[src];purge_all=1\">Purge All</a>"
return output || "None"
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/weapon/reagent_containers/syringe/S)
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S)
if(syringes.len<max_syringes)
if(get_dist(src,S) >= 2)
occupant_message("The syringe is too far away.")
@@ -536,7 +536,7 @@
range = MELEE|RANGED
equip_cooldown = 0
origin_tech = "combat=5;materials=6;powerstorage=7;biotech=6"
var/obj/item/weapon/gun/medbeam/mech/medigun
var/obj/item/gun/medbeam/mech/medigun
materials = list(MAT_METAL = 15000, MAT_GLASS = 8000, MAT_PLASMA = 3000, MAT_GOLD = 8000, MAT_DIAMOND = 2000)
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/New()
code/game/mecha/equipment/weapons/weapons.dm
+5 -5
View File
@@ -327,7 +327,7 @@
desc = "A weapon for combat exosuits. Launches primed flashbangs."
icon_state = "mecha_grenadelnchr"
origin_tech = "combat=4;engineering=4"
projectile = /obj/item/weapon/grenade/flashbang
projectile = /obj/item/grenade/flashbang
fire_sound = 'sound/weapons/grenadelaunch.ogg'
projectiles = 6
missile_speed = 1.5
@@ -335,18 +335,18 @@
equip_cooldown = 60
var/det_time = 20
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/weapon/grenade/flashbang/F)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/grenade/flashbang/F)
var/turf/T = get_turf(src)
message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_COORDJMP(T)]",0,1)
log_game("[key_name(chassis.occupant)] fired a [src] [COORD(T)]")
addtimer(CALLBACK(F, /obj/item/weapon/grenade/flashbang.proc/prime), det_time)
addtimer(CALLBACK(F, /obj/item/grenade/flashbang.proc/prime), det_time)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
name = "\improper SOB-3 grenade launcher"
desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster."
origin_tech = "combat=4;materials=4"
projectiles = 3
projectile = /obj/item/weapon/grenade/clusterbuster
projectile = /obj/item/grenade/clusterbuster
projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher.
equip_cooldown = 90
@@ -354,7 +354,7 @@
name = "banana mortar"
desc = "Equipment for clown exosuits. Launches banana peels."
icon_state = "mecha_bananamrtr"
projectile = /obj/item/weapon/grown/bananapeel
projectile = /obj/item/grown/bananapeel
fire_sound = 'sound/items/bikehorn.ogg'
projectiles = 15
missile_speed = 1.5
code/game/mecha/mech_bay.dm
+3 -3
View File
@@ -17,7 +17,7 @@
dir = EAST
icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_port"
circuit = /obj/item/weapon/circuitboard/machine/mech_recharger
circuit = /obj/item/circuitboard/machine/mech_recharger
var/obj/mecha/recharging_mech
var/obj/machinery/computer/mech_bay_power_console/recharge_console
var/max_charge = 50
@@ -31,7 +31,7 @@
/obj/machinery/mech_bay_recharge_port/RefreshParts()
var/MC
for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)
for(var/obj/item/stock_parts/capacitor/C in component_parts)
MC += C.rating
max_charge = MC * 25
@@ -74,7 +74,7 @@
desc = "Used to control mechbay power ports."
icon_screen = "recharge_comp"
icon_keyboard = "rd_key"
circuit = /obj/item/weapon/circuitboard/computer/mech_bay_power_console
circuit = /obj/item/circuitboard/computer/mech_bay_power_console
var/obj/machinery/mech_bay_recharge_port/recharge_port
light_color = LIGHT_COLOR_PINK
code/game/mecha/mech_fabricator.dm
+6 -6
View File
@@ -9,7 +9,7 @@
idle_power_usage = 20
active_power_usage = 5000
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/weapon/circuitboard/machine/mechfab
circuit = /obj/item/circuitboard/machine/mechfab
var/time_coeff = 1
var/component_coeff = 1
var/datum/material_container/materials
@@ -44,24 +44,24 @@
var/T = 0
//maximum stocking amount (default 300000, 600000 at T4)
for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
T += M.rating
materials.max_amount = (200000 + (T*50000))
//resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55)
T = 1.15
for(var/obj/item/weapon/stock_parts/micro_laser/Ma in component_parts)
for(var/obj/item/stock_parts/micro_laser/Ma in component_parts)
T -= Ma.rating*0.15
component_coeff = T
//building time adjustment coefficient (1 -> 0.8 -> 0.6)
T = -1
for(var/obj/item/weapon/stock_parts/manipulator/Ml in component_parts)
for(var/obj/item/stock_parts/manipulator/Ml in component_parts)
T += Ml.rating
time_coeff = round(initial(time_coeff) - (initial(time_coeff)*(T))/5,0.01)
/obj/machinery/mecha_part_fabricator/check_access(obj/item/weapon/card/id/I)
/obj/machinery/mecha_part_fabricator/check_access(obj/item/card/id/I)
if(istype(I, /obj/item/device/pda))
var/obj/item/device/pda/pda = I
I = pda.id
@@ -441,7 +441,7 @@
updateUsrDialog()
else if(istype(W, /obj/item/weapon/ore/bluespace_crystal))
else if(istype(W, /obj/item/ore/bluespace_crystal))
if(!is_insertion_ready(user))
return 1
code/game/mecha/mecha.dm
+2 -2
View File
@@ -34,7 +34,7 @@
var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act.
armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
var/list/facing_modifiers = list(FRONT_ARMOUR = 1.5, SIDE_ARMOUR = 1, BACK_ARMOUR = 0.5)
var/obj/item/weapon/stock_parts/cell/cell
var/obj/item/stock_parts/cell/cell
var/state = 0
var/list/log = new
var/last_message = 0
@@ -210,7 +210,7 @@
internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
return internal_tank
/obj/mecha/proc/add_cell(var/obj/item/weapon/stock_parts/cell/C=null)
/obj/mecha/proc/add_cell(var/obj/item/stock_parts/cell/C=null)
if(C)
C.forceMove(src)
cell = C
code/game/mecha/mecha_construction_paths.dm
+234 -234
View File
@@ -3,22 +3,22 @@
////////////////////////////////
/datum/construction/mecha/custom_action(step, atom/used_atom, mob/user)
if(istype(used_atom, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = used_atom
if(istype(used_atom, /obj/item/weldingtool))
var/obj/item/weldingtool/W = used_atom
if (W.remove_fuel(0, user))
playsound(holder, 'sound/items/welder2.ogg', 50, 1)
else
return 0
else if(istype(used_atom, /obj/item/weapon/wrench))
var/obj/item/weapon/W = used_atom
else if(istype(used_atom, /obj/item/wrench))
var/obj/item/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/weapon/screwdriver))
var/obj/item/weapon/W = used_atom
else if(istype(used_atom, /obj/item/screwdriver))
var/obj/item/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/weapon/wirecutters))
var/obj/item/weapon/W = used_atom
else if(istype(used_atom, /obj/item/wirecutters))
var/obj/item/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/stack/cable_coil))
@@ -38,22 +38,22 @@
return 1
/datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user)
if(istype(used_atom, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = used_atom
if(istype(used_atom, /obj/item/weldingtool))
var/obj/item/weldingtool/W = used_atom
if (W.remove_fuel(0, user))
playsound(holder, 'sound/items/welder2.ogg', 50, 1)
else
return 0
else if(istype(used_atom, /obj/item/weapon/wrench))
var/obj/item/weapon/W = used_atom
else if(istype(used_atom, /obj/item/wrench))
var/obj/item/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/weapon/screwdriver))
var/obj/item/weapon/W = used_atom
else if(istype(used_atom, /obj/item/screwdriver))
var/obj/item/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/weapon/wirecutters))
var/obj/item/weapon/W = used_atom
else if(istype(used_atom, /obj/item/wirecutters))
var/obj/item/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/stack/cable_coil))
@@ -105,59 +105,59 @@
result = "/obj/mecha/working/ripley"
steps = list(
//1
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="External armor is wrenched."),
//2
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="External armor is installed."),
//3
list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weldingtool,
"desc"="Internal armor is welded."),
//4
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="Internal armor is wrenched."),
//5
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="Internal armor is installed."),
//6
list("key"=/obj/item/stack/sheet/metal,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="Peripherals control module is secured."),
//7
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Peripherals control module is installed."),
//8
list("key"=/obj/item/weapon/circuitboard/mecha/ripley/peripherals,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/ripley/peripherals,
"backkey"=/obj/item/screwdriver,
"desc"="Central control module is secured."),
//9
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Central control module is installed."),
//10
list("key"=/obj/item/weapon/circuitboard/mecha/ripley/main,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/ripley/main,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is adjusted."),
//11
list("key"=/obj/item/weapon/wirecutters,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/wirecutters,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is added."),
//12
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The hydraulic systems are active."),
//13
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wrench,
"desc"="The hydraulic systems are connected."),
//14
list("key"=/obj/item/weapon/wrench,
list("key"=/obj/item/wrench,
"desc"="The hydraulic systems are disconnected.")
)
@@ -210,7 +210,7 @@
holder.icon_state = "ripley6"
else
user.visible_message("[user] removes the central control module from the [holder].", "<span class='notice'>You remove the central computer mainboard from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/ripley/main(get_turf(holder))
new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder))
holder.icon_state = "ripley4"
if(8)
if(diff==FORWARD)
@@ -226,7 +226,7 @@
holder.icon_state = "ripley8"
else
user.visible_message("[user] removes the peripherals control module from the [holder].", "<span class='notice'>You remove the peripherals control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/ripley/peripherals(get_turf(holder))
new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder))
holder.icon_state = "ripley6"
if(6)
if(diff==FORWARD)
@@ -314,83 +314,83 @@
result = "/obj/mecha/combat/gygax"
steps = list(
//1
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="External armor is wrenched."),
//2
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="External armor is installed."),
//3
list("key"=/obj/item/mecha_parts/part/gygax_armor,
"backkey"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weldingtool,
"desc"="Internal armor is welded."),
//4
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="Internal armor is wrenched."),
//5
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="Internal armor is installed."),
//6
list("key"=/obj/item/stack/sheet/metal,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="Advanced capacitor is secured."),
//7
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Advanced capacitor is installed."),
//8
list("key"=/obj/item/weapon/stock_parts/capacitor,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/stock_parts/capacitor,
"backkey"=/obj/item/screwdriver,
"desc"="Advanced scanner module is secured."),
//9
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Advanced scanner module is installed."),
//10
list("key"=/obj/item/weapon/stock_parts/scanning_module,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/stock_parts/scanning_module,
"backkey"=/obj/item/screwdriver,
"desc"="Weapon control module is secured."),
//11
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Weapon control module is installed."),
//12
list("key"=/obj/item/weapon/circuitboard/mecha/gygax/targeting,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/gygax/targeting,
"backkey"=/obj/item/screwdriver,
"desc"="Peripherals control module is secured."),
//13
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Peripherals control module is installed."),
//14
list("key"=/obj/item/weapon/circuitboard/mecha/gygax/peripherals,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/gygax/peripherals,
"backkey"=/obj/item/screwdriver,
"desc"="Central control module is secured."),
//15
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Central control module is installed."),
//16
list("key"=/obj/item/weapon/circuitboard/mecha/gygax/main,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/gygax/main,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is adjusted."),
//17
list("key"=/obj/item/weapon/wirecutters,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/wirecutters,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is added."),
//18
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The hydraulic systems are active."),
//19
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wrench,
"desc"="The hydraulic systems are connected."),
//20
list("key"=/obj/item/weapon/wrench,
list("key"=/obj/item/wrench,
"desc"="The hydraulic systems are disconnected.")
)
@@ -443,7 +443,7 @@
holder.icon_state = "gygax6"
else
user.visible_message("[user] removes the central control module from the [holder].", "<span class='notice'>You remove the central computer mainboard from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/gygax/main(get_turf(holder))
new /obj/item/circuitboard/mecha/gygax/main(get_turf(holder))
holder.icon_state = "gygax4"
if(14)
if(diff==FORWARD)
@@ -459,7 +459,7 @@
holder.icon_state = "gygax8"
else
user.visible_message("[user] removes the peripherals control module from the [holder].", "<span class='notice'>You remove the peripherals control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/gygax/peripherals(get_turf(holder))
new /obj/item/circuitboard/mecha/gygax/peripherals(get_turf(holder))
holder.icon_state = "gygax6"
if(12)
if(diff==FORWARD)
@@ -475,7 +475,7 @@
holder.icon_state = "gygax10"
else
user.visible_message("[user] removes the weapon control module from the [holder].", "<span class='notice'>You remove the weapon control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/gygax/targeting(get_turf(holder))
new /obj/item/circuitboard/mecha/gygax/targeting(get_turf(holder))
holder.icon_state = "gygax8"
if(10)
if(diff==FORWARD)
@@ -492,7 +492,7 @@
holder.icon_state = "gygax12"
else
user.visible_message("[user] removes the advanced scanner module from the [holder].", "<span class='notice'>You remove the scanner module from the [holder].</span>")
var/obj/item/I = locate(/obj/item/weapon/stock_parts/scanning_module) in holder
var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder
I.loc = get_turf(holder)
holder.icon_state = "gygax10"
if(8)
@@ -510,7 +510,7 @@
holder.icon_state = "gygax14"
else
user.visible_message("[user] removes the capacitor from the [holder].", "<span class='notice'>You remove the capacitor from the [holder].</span>")
var/obj/item/I = locate(/obj/item/weapon/stock_parts/capacitor) in holder
var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder
I.loc = get_turf(holder)
holder.icon_state = "gygax12"
if(6)
@@ -599,64 +599,64 @@
result = "/obj/mecha/working/ripley/firefighter"
steps = list(
//1
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="External armor is wrenched."),
//2
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="External armor is installed."),
//3
list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/crowbar,
"backkey"=/obj/item/crowbar,
"desc"="External armor is being installed."),
//4
list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weldingtool,
"desc"="Internal armor is welded."),
//5
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="Internal armor is wrenched."),
//6
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="Internal armor is installed."),
//7
list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="Peripherals control module is secured."),
//8
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Peripherals control module is installed."),
//9
list("key"=/obj/item/weapon/circuitboard/mecha/ripley/peripherals,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/ripley/peripherals,
"backkey"=/obj/item/screwdriver,
"desc"="Central control module is secured."),
//10
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Central control module is installed."),
//11
list("key"=/obj/item/weapon/circuitboard/mecha/ripley/main,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/ripley/main,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is adjusted."),
//12
list("key"=/obj/item/weapon/wirecutters,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/wirecutters,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is added."),
//13
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The hydraulic systems are active."),
//14
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wrench,
"desc"="The hydraulic systems are connected."),
//15
list("key"=/obj/item/weapon/wrench,
list("key"=/obj/item/wrench,
"desc"="The hydraulic systems are disconnected.")
)
@@ -709,7 +709,7 @@
holder.icon_state = "fireripley6"
else
user.visible_message("[user] removes the central control module from the [holder].", "<span class='notice'>You remove the central computer mainboard from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/ripley/main(get_turf(holder))
new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder))
holder.icon_state = "fireripley4"
if(9)
if(diff==FORWARD)
@@ -725,7 +725,7 @@
holder.icon_state = "fireripley8"
else
user.visible_message("[user] removes the peripherals control module from the [holder].", "<span class='notice'>You remove the peripherals control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/ripley/peripherals(get_turf(holder))
new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder))
holder.icon_state = "fireripley6"
if(7)
if(diff==FORWARD)
@@ -819,17 +819,17 @@
/datum/construction/mecha/honker
result = "/obj/mecha/combat/honker"
steps = list(list("key"=/obj/item/weapon/bikehorn), //1
steps = list(list("key"=/obj/item/bikehorn), //1
list("key"=/obj/item/clothing/shoes/clown_shoes), //2
list("key"=/obj/item/weapon/bikehorn), //3
list("key"=/obj/item/bikehorn), //3
list("key"=/obj/item/clothing/mask/gas/clown_hat), //4
list("key"=/obj/item/weapon/bikehorn), //5
list("key"=/obj/item/weapon/circuitboard/mecha/honker/targeting), //6
list("key"=/obj/item/weapon/bikehorn), //7
list("key"=/obj/item/weapon/circuitboard/mecha/honker/peripherals), //8
list("key"=/obj/item/weapon/bikehorn), //9
list("key"=/obj/item/weapon/circuitboard/mecha/honker/main), //10
list("key"=/obj/item/weapon/bikehorn), //11
list("key"=/obj/item/bikehorn), //5
list("key"=/obj/item/circuitboard/mecha/honker/targeting), //6
list("key"=/obj/item/bikehorn), //7
list("key"=/obj/item/circuitboard/mecha/honker/peripherals), //8
list("key"=/obj/item/bikehorn), //9
list("key"=/obj/item/circuitboard/mecha/honker/main), //10
list("key"=/obj/item/bikehorn), //11
)
/datum/construction/mecha/honker/action(atom/used_atom,mob/user)
@@ -839,7 +839,7 @@
if(!..())
return 0
if(istype(used_atom, /obj/item/weapon/bikehorn))
if(istype(used_atom, /obj/item/bikehorn))
playsound(holder, 'sound/items/bikehorn.ogg', 50, 1)
user.visible_message("HONK!")
@@ -898,83 +898,83 @@
result = "/obj/mecha/combat/durand"
steps = list(
//1
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="External armor is wrenched."),
//2
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="External armor is installed."),
//3
list("key"=/obj/item/mecha_parts/part/durand_armor,
"backkey"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weldingtool,
"desc"="Internal armor is welded."),
//4
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="Internal armor is wrenched."),
//5
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="Internal armor is installed."),
//6
list("key"=/obj/item/stack/sheet/metal,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="Super capacitor is secured."),
//7
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Super capacitor is installed."),
//8
list("key"=/obj/item/weapon/stock_parts/capacitor,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/stock_parts/capacitor,
"backkey"=/obj/item/screwdriver,
"desc"="Phasic scanner module is secured."),
//9
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Phasic scanner module is installed."),
//10
list("key"=/obj/item/weapon/stock_parts/scanning_module,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/stock_parts/scanning_module,
"backkey"=/obj/item/screwdriver,
"desc"="Weapon control module is secured."),
//11
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Weapon control module is installed."),
//12
list("key"=/obj/item/weapon/circuitboard/mecha/durand/targeting,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/durand/targeting,
"backkey"=/obj/item/screwdriver,
"desc"="Peripherals control module is secured."),
//13
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Peripherals control module is installed."),
//14
list("key"=/obj/item/weapon/circuitboard/mecha/durand/peripherals,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/durand/peripherals,
"backkey"=/obj/item/screwdriver,
"desc"="Central control module is secured."),
//15
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Central control module is installed."),
//16
list("key"=/obj/item/weapon/circuitboard/mecha/durand/main,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/durand/main,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is adjusted."),
//17
list("key"=/obj/item/weapon/wirecutters,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/wirecutters,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is added."),
//18
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The hydraulic systems are active."),
//19
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wrench,
"desc"="The hydraulic systems are connected."),
//20
list("key"=/obj/item/weapon/wrench,
list("key"=/obj/item/wrench,
"desc"="The hydraulic systems are disconnected.")
)
@@ -1028,7 +1028,7 @@
holder.icon_state = "durand6"
else
user.visible_message("[user] removes the central control module from the [holder].", "<span class='notice'>You remove the central computer mainboard from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/durand/main(get_turf(holder))
new /obj/item/circuitboard/mecha/durand/main(get_turf(holder))
holder.icon_state = "durand4"
if(14)
if(diff==FORWARD)
@@ -1044,7 +1044,7 @@
holder.icon_state = "durand8"
else
user.visible_message("[user] removes the peripherals control module from the [holder].", "<span class='notice'>You remove the peripherals control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/durand/peripherals(get_turf(holder))
new /obj/item/circuitboard/mecha/durand/peripherals(get_turf(holder))
holder.icon_state = "durand6"
if(12)
if(diff==FORWARD)
@@ -1060,7 +1060,7 @@
holder.icon_state = "durand10"
else
user.visible_message("[user] removes the weapon control module from the [holder].", "<span class='notice'>You remove the weapon control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/durand/targeting(get_turf(holder))
new /obj/item/circuitboard/mecha/durand/targeting(get_turf(holder))
holder.icon_state = "durand8"
if(10)
if(diff==FORWARD)
@@ -1077,7 +1077,7 @@
holder.icon_state = "durand12"
else
user.visible_message("[user] removes the scanner module from the [holder].", "<span class='notice'>You remove the scanner module from the [holder].</span>")
var/obj/item/I = locate(/obj/item/weapon/stock_parts/scanning_module) in holder
var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder
I.loc = get_turf(holder)
holder.icon_state = "durand10"
if(8)
@@ -1095,7 +1095,7 @@
holder.icon_state = "durand14"
else
user.visible_message("[user] removes the super capacitor from the [holder].", "<span class='notice'>You remove the capacitor from the [holder].</span>")
var/obj/item/I = locate(/obj/item/weapon/stock_parts/capacitor) in holder
var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder
I.loc = get_turf(holder)
holder.icon_state = "durand12"
if(6)
@@ -1191,95 +1191,95 @@
"desc"="Anomaly core socket is open and awaiting connection."),
//2
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="External armor is wrenched."),
//3
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="External armor is installed."),
//4
list("key"=/obj/item/mecha_parts/part/phazon_armor,
"backkey"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weldingtool,
"desc"="Phase armor is welded."),
//5
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="Phase armor is wrenched."),
//6
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="Phase armor is installed."),
//7
list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The bluespace crystal is engaged."),
//8
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wirecutters,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wirecutters,
"desc"="The bluespace crystal is connected."),
//9
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/crowbar,
"backkey"=/obj/item/crowbar,
"desc"="The bluespace crystal is installed."),
//10
list("key"=/obj/item/weapon/ore/bluespace_crystal,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/ore/bluespace_crystal,
"backkey"=/obj/item/screwdriver,
"desc"="Super capacitor is secured."),
//12
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Super capacitor is installed."),
//12
list("key"=/obj/item/weapon/stock_parts/capacitor,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/stock_parts/capacitor,
"backkey"=/obj/item/screwdriver,
"desc"="Phasic scanner module is secured."),
//13
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Phasic scanner module is installed."),
//14
list("key"=/obj/item/weapon/stock_parts/scanning_module,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/stock_parts/scanning_module,
"backkey"=/obj/item/screwdriver,
"desc"="Weapon control module is secured."),
//15
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Weapon control is installed."),
//16
list("key"=/obj/item/weapon/circuitboard/mecha/phazon/targeting,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/phazon/targeting,
"backkey"=/obj/item/screwdriver,
"desc"="Peripherals control module is secured."),
//17
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Peripherals control module is installed"),
//18
list("key"=/obj/item/weapon/circuitboard/mecha/phazon/peripherals,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/phazon/peripherals,
"backkey"=/obj/item/screwdriver,
"desc"="Central control module is secured."),
//19
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Central control module is installed."),
//20
list("key"=/obj/item/weapon/circuitboard/mecha/phazon/main,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/phazon/main,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is adjusted."),
//21
list("key"=/obj/item/weapon/wirecutters,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/wirecutters,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is added."),
//22
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The hydraulic systems are active."),
//23
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wrench,
"desc"="The hydraulic systems are connected."),
//24
list("key"=/obj/item/weapon/wrench,
list("key"=/obj/item/wrench,
"desc"="The hydraulic systems are disconnected.")
)
@@ -1333,7 +1333,7 @@
holder.icon_state = "phazon6"
else
user.visible_message("[user] removes the central control module from the [holder].", "<span class='notice'>You remove the central computer mainboard from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/phazon/main(get_turf(holder))
new /obj/item/circuitboard/mecha/phazon/main(get_turf(holder))
holder.icon_state = "phazon4"
if(18)
if(diff==FORWARD)
@@ -1349,7 +1349,7 @@
holder.icon_state = "phazon8"
else
user.visible_message("[user] removes the peripherals control module from the [holder].", "<span class='notice'>You remove the peripherals control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/phazon/peripherals(get_turf(holder))
new /obj/item/circuitboard/mecha/phazon/peripherals(get_turf(holder))
holder.icon_state = "phazon6"
if(16)
if(diff==FORWARD)
@@ -1365,7 +1365,7 @@
holder.icon_state = "phazon10"
else
user.visible_message("[user] removes the weapon control module from the [holder].", "<span class='notice'>You remove the weapon control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/phazon/targeting(get_turf(holder))
new /obj/item/circuitboard/mecha/phazon/targeting(get_turf(holder))
holder.icon_state = "phazon8"
if(14)
if(diff==FORWARD)
@@ -1382,7 +1382,7 @@
holder.icon_state = "phazon12"
else
user.visible_message("[user] removes the phasic scanner module from the [holder].", "<span class='notice'>You remove the scanner module from the [holder].</span>")
var/obj/item/I = locate(/obj/item/weapon/stock_parts/scanning_module) in holder
var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder
I.loc = get_turf(holder)
holder.icon_state = "phazon10"
if(12)
@@ -1400,7 +1400,7 @@
holder.icon_state = "phazon14"
else
user.visible_message("[user] removes the super capacitor from the [holder].", "<span class='notice'>You remove the capacitor from the [holder].</span>")
var/obj/item/I = locate(/obj/item/weapon/stock_parts/capacitor) in holder
var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder
I.loc = get_turf(holder)
holder.icon_state = "phazon12"
if(10)
@@ -1417,7 +1417,7 @@
holder.icon_state = "phazon16"
else
user.visible_message("[user] removes the bluespace crystal from the [holder].", "<span class='notice'>You remove the bluespace crystal from the [holder].</span>")
new /obj/item/weapon/ore/bluespace_crystal(get_turf(holder))
new /obj/item/ore/bluespace_crystal(get_turf(holder))
holder.icon_state = "phazon14"
if(8)
if(diff==FORWARD)
@@ -1518,59 +1518,59 @@
result = "/obj/mecha/medical/odysseus"
steps = list(
//1
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="External armor is wrenched."),
//2
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="External armor is installed."),
//3
list("key"=/obj/item/stack/sheet/plasteel,
"backkey"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weldingtool,
"desc"="Internal armor is welded."),
//4
list("key"=/obj/item/weapon/weldingtool,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/weldingtool,
"backkey"=/obj/item/wrench,
"desc"="Internal armor is wrenched."),
//5
list("key"=/obj/item/weapon/wrench,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/wrench,
"backkey"=/obj/item/crowbar,
"desc"="Internal armor is installed."),
//6
list("key"=/obj/item/stack/sheet/metal,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="Peripherals control module is secured."),
//7
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Peripherals control module is installed."),
//8
list("key"=/obj/item/weapon/circuitboard/mecha/odysseus/peripherals,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals,
"backkey"=/obj/item/screwdriver,
"desc"="Central control module is secured."),
//9
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/crowbar,
"desc"="Central control module is installed."),
//10
list("key"=/obj/item/weapon/circuitboard/mecha/odysseus/main,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/circuitboard/mecha/odysseus/main,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is adjusted."),
//11
list("key"=/obj/item/weapon/wirecutters,
"backkey"=/obj/item/weapon/screwdriver,
list("key"=/obj/item/wirecutters,
"backkey"=/obj/item/screwdriver,
"desc"="The wiring is added."),
//12
list("key"=/obj/item/stack/cable_coil,
"backkey"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/screwdriver,
"desc"="The hydraulic systems are active."),
//13
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/wrench,
list("key"=/obj/item/screwdriver,
"backkey"=/obj/item/wrench,
"desc"="The hydraulic systems are connected."),
//14
list("key"=/obj/item/weapon/wrench,
list("key"=/obj/item/wrench,
"desc"="The hydraulic systems are disconnected.")
)
@@ -1623,7 +1623,7 @@
holder.icon_state = "odysseus6"
else
user.visible_message("[user] removes the central control module from the [holder].", "<span class='notice'>You remove the central computer mainboard from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/odysseus/main(get_turf(holder))
new /obj/item/circuitboard/mecha/odysseus/main(get_turf(holder))
holder.icon_state = "odysseus4"
if(8)
if(diff==FORWARD)
@@ -1639,7 +1639,7 @@
holder.icon_state = "odysseus8"
else
user.visible_message("[user] removes the peripherals control module from the [holder].", "<span class='notice'>You remove the peripherals control module from the [holder].</span>")
new /obj/item/weapon/circuitboard/mecha/odysseus/peripherals(get_turf(holder))
new /obj/item/circuitboard/mecha/odysseus/peripherals(get_turf(holder))
holder.icon_state = "odysseus6"
if(6)
if(diff==FORWARD)
code/game/mecha/mecha_control_console.dm
+3 -3
View File
@@ -4,7 +4,7 @@
icon_screen = "mecha"
icon_keyboard = "tech_key"
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/weapon/circuitboard/computer/mecha_control
circuit = /obj/item/circuitboard/computer/mecha_control
var/list/located = list()
var/screen = 0
var/stored_data
@@ -123,10 +123,10 @@
ai_beacon = TRUE
/obj/item/weapon/storage/box/mechabeacons
/obj/item/storage/box/mechabeacons
name = "exosuit tracking beacons"
/obj/item/weapon/storage/box/mechabeacons/New()
/obj/item/storage/box/mechabeacons/New()
..()
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
code/game/mecha/mecha_defense.dm
+9 -9
View File
@@ -171,8 +171,8 @@
if(W.GetID())
if(add_req_access || maint_access)
if(internals_access_allowed(user))
var/obj/item/weapon/card/id/id_card
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/card/id/id_card
if(istype(W, /obj/item/card/id))
id_card = W
else
var/obj/item/device/pda/pda = W
@@ -183,7 +183,7 @@
to_chat(user, "<span class='warning'>Invalid ID: Access denied.</span>")
else
to_chat(user, "<span class='warning'>Maintenance protocols disabled by operator.</span>")
else if(istype(W, /obj/item/weapon/wrench))
else if(istype(W, /obj/item/wrench))
if(state==1)
state = 2
to_chat(user, "<span class='notice'>You undo the securing bolts.</span>")
@@ -191,7 +191,7 @@
state = 1
to_chat(user, "<span class='notice'>You tighten the securing bolts.</span>")
return
else if(istype(W, /obj/item/weapon/crowbar))
else if(istype(W, /obj/item/crowbar))
if(state==2)
state = 3
to_chat(user, "<span class='notice'>You open the hatch to the power unit.</span>")
@@ -208,7 +208,7 @@
else
to_chat(user, "<span class='warning'>You need two lengths of cable to fix this mech!</span>")
return
else if(istype(W, /obj/item/weapon/screwdriver) && user.a_intent != INTENT_HARM)
else if(istype(W, /obj/item/screwdriver) && user.a_intent != INTENT_HARM)
if(internal_damage & MECHA_INT_TEMP_CONTROL)
clearInternalDamage(MECHA_INT_TEMP_CONTROL)
to_chat(user, "<span class='notice'>You repair the damaged temperature controller.</span>")
@@ -223,12 +223,12 @@
to_chat(user, "<span class='notice'>You screw the cell in place.</span>")
return
else if(istype(W, /obj/item/weapon/stock_parts/cell))
else if(istype(W, /obj/item/stock_parts/cell))
if(state==4)
if(!cell)
if(!user.drop_item())
return
var/obj/item/weapon/stock_parts/cell/C = W
var/obj/item/stock_parts/cell/C = W
to_chat(user, "<span class='notice'>You install the powercell.</span>")
C.forceMove(src)
cell = C
@@ -237,9 +237,9 @@
to_chat(user, "<span class='notice'>There's already a powercell installed.</span>")
return
else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM)
else if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(obj_integrity<max_integrity)
if (WT.remove_fuel(0,user))
if (internal_damage & MECHA_INT_TANK_BREACH)
code/game/mecha/mecha_parts.dm
+23 -23
View File
@@ -306,7 +306,7 @@
///////// Circuitboards
/obj/item/weapon/circuitboard/mecha
/obj/item/circuitboard/mecha
name = "exosuit circuit board"
icon = 'icons/obj/module.dmi'
icon_state = "std_mod"
@@ -320,85 +320,85 @@
throw_speed = 3
throw_range = 7
/obj/item/weapon/circuitboard/mecha/ripley
/obj/item/circuitboard/mecha/ripley
origin_tech = "programming=2"
/obj/item/weapon/circuitboard/mecha/ripley/peripherals
/obj/item/circuitboard/mecha/ripley/peripherals
name = "Ripley Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/ripley/main
/obj/item/circuitboard/mecha/ripley/main
name = "Ripley Central Control module (Exosuit Board)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/gygax
/obj/item/circuitboard/mecha/gygax
origin_tech = "programming=4;combat=3;engineering=3"
/obj/item/weapon/circuitboard/mecha/gygax/peripherals
/obj/item/circuitboard/mecha/gygax/peripherals
name = "Gygax Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/gygax/targeting
/obj/item/circuitboard/mecha/gygax/targeting
name = "Gygax Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"
origin_tech = "programming=4;combat=4"
/obj/item/weapon/circuitboard/mecha/gygax/main
/obj/item/circuitboard/mecha/gygax/main
name = "Gygax Central Control module (Exosuit Board)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/durand
/obj/item/circuitboard/mecha/durand
origin_tech = "programming=4;combat=3;engineering=3"
/obj/item/weapon/circuitboard/mecha/durand/peripherals
/obj/item/circuitboard/mecha/durand/peripherals
name = "Durand Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/durand/targeting
/obj/item/circuitboard/mecha/durand/targeting
name = "Durand Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"
origin_tech = "programming=4;combat=4;engineering=3"
/obj/item/weapon/circuitboard/mecha/durand/main
/obj/item/circuitboard/mecha/durand/main
name = "Durand Central Control module (Exosuit Board)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/honker
/obj/item/circuitboard/mecha/honker
origin_tech = "programming=3;engineering=3"
/obj/item/weapon/circuitboard/mecha/honker/peripherals
/obj/item/circuitboard/mecha/honker/peripherals
name = "H.O.N.K Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/honker/targeting
/obj/item/circuitboard/mecha/honker/targeting
name = "H.O.N.K Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/honker/main
/obj/item/circuitboard/mecha/honker/main
name = "H.O.N.K Central Control module (Exosuit Board)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/odysseus
/obj/item/circuitboard/mecha/odysseus
origin_tech = "programming=3;biotech=3"
/obj/item/weapon/circuitboard/mecha/odysseus/peripherals
/obj/item/circuitboard/mecha/odysseus/peripherals
name = "Odysseus Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/odysseus/main
/obj/item/circuitboard/mecha/odysseus/main
name = "Odysseus Central Control module (Exosuit Board)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/phazon
/obj/item/circuitboard/mecha/phazon
origin_tech = "programming=5;plasmatech=4"
/obj/item/weapon/circuitboard/mecha/phazon/peripherals
/obj/item/circuitboard/mecha/phazon/peripherals
name = "Phazon Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/phazon/targeting
/obj/item/circuitboard/mecha/phazon/targeting
name = "Phazon Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/phazon/main
/obj/item/circuitboard/mecha/phazon/main
name = "Phazon Central Control module (Exosuit Board)"
code/game/mecha/mecha_topic.dm
+2 -2
View File
@@ -157,7 +157,7 @@
/obj/mecha/proc/output_access_dialog(obj/item/weapon/card/id/id_card, mob/user)
/obj/mecha/proc/output_access_dialog(obj/item/card/id/id_card, mob/user)
if(!id_card || !user) return
. = {"<html>
<head><style>
@@ -183,7 +183,7 @@
onclose(user, "exosuit_add_access")
/obj/mecha/proc/output_maintenance_dialog(obj/item/weapon/card/id/id_card,mob/user)
/obj/mecha/proc/output_maintenance_dialog(obj/item/card/id/id_card,mob/user)
if(!id_card || !user) return
. = {"<html>
<head>
code/game/mecha/mecha_wreckage.dm
+4 -4
View File
@@ -33,11 +33,11 @@
to_chat(user, "<span class='notice'>The AI recovery beacon is active.</span>")
/obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
if(istype(I, /obj/item/weldingtool))
if(salvage_num <= 0)
to_chat(user, "<span class='warning'>You don't see anything that can be cut with [I]!</span>")
return
var/obj/item/weapon/weldingtool/WT = I
var/obj/item/weldingtool/WT = I
if(welder_salvage && welder_salvage.len && WT.remove_fuel(0, user))
var/type = prob(70) ? pick(welder_salvage) : null
if(type)
@@ -51,7 +51,7 @@
else
return
else if(istype(I, /obj/item/weapon/wirecutters))
else if(istype(I, /obj/item/wirecutters))
if(salvage_num <= 0)
to_chat(user, "<span class='warning'>You don't see anything that can be cut with [I]!</span>")
return
@@ -64,7 +64,7 @@
else
to_chat(user, "<span class='warning'>You fail to salvage anything valuable from [src]!</span>")
else if(istype(I, /obj/item/weapon/crowbar))
else if(istype(I, /obj/item/crowbar))
if(crowbar_salvage && crowbar_salvage.len)
var/obj/S = pick(crowbar_salvage)
if(S)
code/game/mecha/working/ripley.dm
+1 -1
View File
@@ -26,7 +26,7 @@
if(locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in cargo
if(ore_box)
for(var/obj/item/weapon/ore/ore in range(1, src))
for(var/obj/item/ore/ore in range(1, src))
if(ore.Adjacent(src) && ((get_dir(src, ore) & dir) || ore.loc == loc)) //we can reach it and it's in front of us? grab it!
ore.forceMove(ore_box)