Cuts out all the old weapon/module code

Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
This commit is contained in:
Crazylemon
2015-10-13 21:13:49 -07:00
parent a61191ad1f
commit 3c3f51401b
12 changed files with 40 additions and 55 deletions
@@ -12,7 +12,8 @@
/obj/item/weapon/firealarm_electronics,
/obj/item/weapon/airalarm_electronics,
/obj/item/weapon/airlock_electronics,
/obj/item/weapon/module/power_control,
/obj/item/weapon/intercom_electronics
/obj/item/weapon/apc_electronics,
/obj/item/weapon/stock_parts,
/obj/item/mounted/frame/light_fixture,
/obj/item/mounted/frame/apc_frame,
@@ -366,4 +367,4 @@
stack = stack_plastic
stack.amount++
decompiler.stored_comms[type]--;
decompiler.stored_comms[type]--;
+13 -4
View File
@@ -105,6 +105,15 @@
/obj/machinery/power/apc/noalarm
report_power_alarm = 0
/obj/item/weapon/apc_electronics
name = "power control module"
desc = "Heavy-duty switching circuits for power control."
icon = 'icons/obj/module.dmi'
icon_state = "power_mod"
w_class = 2.0
item_state = "electronic"
flags = CONDUCT
/obj/machinery/power/apc/connect_to_network()
//Override because the APC does not directly connect to the network; it goes through a terminal.
//The terminal is what the power computer looks for anyway.
@@ -421,7 +430,7 @@
user.visible_message(\
"<span class='warning'>[user.name] has removed the power control board from [src.name]!</span>",\
"<span class='notice'>You remove the power control board.</span>")
new /obj/item/weapon/module/power_control(loc)
new /obj/item/weapon/apc_electronics(loc)
else if (opened!=2) //cover isn't removed
opened = 0
update_icon()
@@ -532,7 +541,7 @@
new /obj/item/stack/cable_coil(loc,10)
user << "<span class='notice'>You cut the cables and dismantle the power terminal.</span>"
qdel(terminal) // qdel
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
user << "You trying to insert the power control board into the frame..."
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10, target = src))
@@ -540,7 +549,7 @@
has_electronics = 1
user << "<span class='notice'>You place the power control board inside the frame.</span>"
qdel(W) // qdel
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
user << "<span class='warning'>You cannot put the board inside, the frame is damaged.</span>"
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal)
@@ -1357,4 +1366,4 @@
else
return 0
#undef APC_UPDATE_ICON_COOLDOWN
#undef APC_UPDATE_ICON_COOLDOWN
@@ -122,6 +122,14 @@
build_path = /obj/item/weapon/airlock_electronics
category = list("initial", "Electronics")
/datum/design/apc_electronics
name="Power Control Module"
id = "apc_electronics"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
build_path = /obj/item/weapon/apc_electronics
category = list("initial", "Electronics")
/datum/design/intercom_electronics
name = "Intercom Electronics"
id = "intercom_electronics"