diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index a548499b2fc..655562db84a 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -76244,6 +76244,7 @@
/obj/item/robotanalyzer,
/obj/item/mmi/robotic_brain,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/item/mecha_parts/core,
/turf/simulated/floor/plasteel/white,
/area/assembly/robotics)
"dwr" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 05a0de86203..595fc34cdce 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -76230,6 +76230,7 @@
pixel_x = 7;
pixel_y = 4
},
+/obj/item/mecha_parts/core,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"oBh" = (
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 216a1e3ca9d..6549bdb8a32 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -81431,6 +81431,7 @@
name = "north bump";
pixel_y = 24
},
+/obj/item/mecha_parts/core,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index ad41c7b3619..a0c7f1e37e8 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -1036,6 +1036,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
/obj/item/vending_refill/genedrobe,)
containername = "science clothing vendor crate"
+/datum/supply_packs/science/mechcore
+ name = "Mech power core crate"
+ contains = list(/obj/item/mecha_parts/core)
+ cost = 250
+ containertype = /obj/structure/closet/crate/secure/scisec
+ containername = "mech power core crate"
+ access = ACCESS_RD
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 6836c91420c..793d79c994a 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -305,17 +305,17 @@
"backkey"=TOOL_CROWBAR,
"desc"="Internal armor is installed."),
//6
- list("key"=/obj/item/stack/sheet/metal,
- "backkey"=TOOL_SCREWDRIVER,
- "desc"="Advanced capacitor is secured."),
+ list("key" = /obj/item/stack/sheet/metal,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "Mech power core is secured."),
//7
- list("key"=TOOL_SCREWDRIVER,
- "backkey"=TOOL_CROWBAR,
- "desc"="Advanced capacitor is installed."),
+ list("key" = TOOL_SCREWDRIVER,
+ "backkey" = TOOL_CROWBAR,
+ "desc" = "Mech power core is installed."),
//8
- list("key"=/obj/item/stock_parts/capacitor/adv,
- "backkey"=TOOL_SCREWDRIVER,
- "desc"="Advanced scanner module is secured."),
+ list("key" = /obj/item/mecha_parts/core,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "Mech power core is secured."),
//9
list("key"=TOOL_SCREWDRIVER,
"backkey"=TOOL_CROWBAR,
@@ -375,155 +375,155 @@
//TODO: better messages.
switch(index)
if(20)
- user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.")
+ user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.")
holder.icon_state = "gygax1"
if(19)
if(diff==FORWARD)
- user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.")
+ user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.")
holder.icon_state = "gygax2"
else
- user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.")
+ user.visible_message("[user] disconnects the [holder] hydraulic systems.", "You disconnect the [holder] hydraulic systems.")
holder.icon_state = "gygax0"
if(18)
if(diff==FORWARD)
- user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].")
+ user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].")
holder.icon_state = "gygax3"
else
- user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.")
+ user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.")
holder.icon_state = "gygax1"
if(17)
if(diff==FORWARD)
- user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].")
+ user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].")
holder.icon_state = "gygax4"
else
- user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].")
+ user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].")
var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder))
coil.amount = 4
holder.icon_state = "gygax2"
if(16)
if(diff==FORWARD)
- user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].")
+ user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].")
qdel(used_atom)
holder.icon_state = "gygax5"
else
- user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].")
+ user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].")
holder.icon_state = "gygax3"
if(15)
if(diff==FORWARD)
- user.visible_message("[user] secures the mainboard.", "You secure the mainboard.")
+ user.visible_message("[user] secures the mainboard.", "You secure the mainboard.")
holder.icon_state = "gygax6"
else
- user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].")
+ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].")
new /obj/item/circuitboard/mecha/gygax/main(get_turf(holder))
holder.icon_state = "gygax4"
if(14)
if(diff==FORWARD)
- user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].")
+ user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].")
qdel(used_atom)
holder.icon_state = "gygax7"
else
- user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.")
+ user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.")
holder.icon_state = "gygax5"
if(13)
if(diff==FORWARD)
- user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.")
+ user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.")
holder.icon_state = "gygax8"
else
- user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].")
+ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].")
new /obj/item/circuitboard/mecha/gygax/peripherals(get_turf(holder))
holder.icon_state = "gygax6"
if(12)
if(diff==FORWARD)
- user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].")
+ user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].")
qdel(used_atom)
holder.icon_state = "gygax9"
else
- user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.")
+ user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.")
holder.icon_state = "gygax7"
if(11)
if(diff==FORWARD)
- user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.")
+ user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.")
holder.icon_state = "gygax10"
else
- user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].")
+ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].")
new /obj/item/circuitboard/mecha/gygax/targeting(get_turf(holder))
holder.icon_state = "gygax8"
if(10)
if(diff==FORWARD)
- user.visible_message("[user] installs advanced scanner module to the [holder].", "You install advanced scanner module to the [holder].")
+ user.visible_message("[user] installs advanced scanner module to the [holder].", "You install advanced scanner module to the [holder].")
qdel(used_atom)
holder.icon_state = "gygax11"
else
- user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.")
+ user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.")
holder.icon_state = "gygax9"
if(9)
if(diff==FORWARD)
- user.visible_message("[user] secures the advanced scanner module.", "You secure the advanced scanner module.")
+ user.visible_message("[user] secures the advanced scanner module.", "You secure the advanced scanner module.")
holder.icon_state = "gygax12"
else
- user.visible_message("[user] removes the advanced scanner module from the [holder].", "You remove the advanced scanner module from the [holder].")
+ user.visible_message("[user] removes the advanced scanner module from the [holder].", "You remove the advanced scanner module from the [holder].")
new /obj/item/stock_parts/scanning_module/adv(get_turf(holder))
holder.icon_state = "gygax10"
if(8)
if(diff==FORWARD)
- user.visible_message("[user] installs advanced capacitor to the [holder].", "You install advanced capacitor to the [holder].")
+ user.visible_message("[user] installs a mech power core into the [holder].", "You install a mech power core into the [holder].")
qdel(used_atom)
holder.icon_state = "gygax13"
else
- user.visible_message("[user] unfastens the advanced scanner module.", "You unfasten the advanced scanner module.")
+ user.visible_message("[user] unfastens the advanced scanner module.", "You unfasten the advanced scanner module.")
holder.icon_state = "gygax11"
if(7)
- if(diff==FORWARD)
- user.visible_message("[user] secures the advanced capacitor.", "You secure the advanced capacitor.")
+ if(diff == FORWARD)
+ user.visible_message("[user] secures the mech power core.", "You secure the mech power core.")
holder.icon_state = "gygax14"
else
- user.visible_message("[user] removes the advanced capacitor from the [holder].", "You remove the advanced capacitor from the [holder].")
- new /obj/item/stock_parts/capacitor/adv(get_turf(holder))
+ user.visible_message("[user] removes the mech power core from the [holder].", "You remove the mech power core from the [holder].")
+ new /obj/item/mecha_parts/core(get_turf(holder))
holder.icon_state = "gygax12"
if(6)
if(diff==FORWARD)
- user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].")
+ user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].")
holder.icon_state = "gygax15"
else
- user.visible_message("[user] unfastens the advanced capacitor.", "You unfasten the advanced capacitor.")
+ user.visible_message("[user] unfastens the advanced capacitor.", "You unfasten the advanced capacitor.")
holder.icon_state = "gygax13"
if(5)
if(diff==FORWARD)
- user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.")
+ user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.")
holder.icon_state = "gygax16"
else
- user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].")
+ user.visible_message("[user] pries the internal armor layer from the [holder].", "You pry the internal armor layer from the [holder].")
var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder))
MS.amount = 5
holder.icon_state = "gygax14"
if(4)
if(diff==FORWARD)
- user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].")
+ user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].")
holder.icon_state = "gygax17"
else
- user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.")
+ user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.")
holder.icon_state = "gygax15"
if(3)
if(diff==FORWARD)
- user.visible_message("[user] installs Gygax Armor Plates to the [holder].", "You install Gygax Armor Plates to the [holder].")
+ user.visible_message("[user] installs the Gygax Armor Plates to the [holder].", "You install the Gygax Armor Plates to the [holder].")
qdel(used_atom)
holder.icon_state = "gygax18"
else
- user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].")
+ user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].")
holder.icon_state = "gygax16"
if(2)
if(diff==FORWARD)
- user.visible_message("[user] secures Gygax Armor Plates.", "You secure Gygax Armor Plates.")
+ user.visible_message("[user] secures the Gygax Armor Plates.", "You secure the Gygax Armor Plates.")
holder.icon_state = "gygax19"
else
- user.visible_message("[user] pries Gygax Armor Plates from the [holder].", "You pry Gygax Armor Plates from the [holder].")
+ user.visible_message("[user] pries the Gygax Armor Plates from the [holder].", "You pry the Gygax Armor Plates from the [holder].")
new /obj/item/mecha_parts/part/gygax_armour(get_turf(holder))
holder.icon_state = "gygax17"
if(1)
if(diff==FORWARD)
- user.visible_message("[user] welds Gygax Armor Plates to the [holder].", "You weld Gygax Armor Plates to the [holder].")
+ user.visible_message("[user] welds the Gygax Armor Plates to the [holder].", "You weld the Gygax Armor Plates to the [holder].")
else
- user.visible_message("[user] unfastens Gygax Armor Plates.", "You unfasten Gygax Armor Plates.")
+ user.visible_message("[user] unfastens the Gygax Armor Plates.", "You unfasten the Gygax Armor Plates.")
holder.icon_state = "gygax18"
return 1
@@ -946,13 +946,13 @@
//6
list("key"=/obj/item/stack/sheet/metal,
"backkey"=TOOL_SCREWDRIVER,
- "desc"="Super capacitor is secured."),
+ "desc"="Mech power core is secured."),
//7
list("key"=TOOL_SCREWDRIVER,
"backkey"=TOOL_CROWBAR,
- "desc"="Super capacitor is installed."),
+ "desc"="Mech power core is installed."),
//8
- list("key"=/obj/item/stock_parts/capacitor/super,
+ list("key"=/obj/item/mecha_parts/core,
"backkey"=TOOL_SCREWDRIVER,
"desc"="Phasic scanner module is secured."),
//9
@@ -1015,155 +1015,155 @@
//TODO: better messages.
switch(index)
if(20)
- user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.")
+ user.visible_message("[user] connects the [holder] hydraulic systems.", "You connect the [holder] hydraulic systems.")
holder.icon_state = "durand1"
if(19)
if(diff==FORWARD)
- user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.")
+ user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.")
holder.icon_state = "durand2"
else
- user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.")
+ user.visible_message("[user] disconnects the [holder] hydraulic systems.", "You disconnect the [holder] hydraulic systems.")
holder.icon_state = "durand0"
if(18)
if(diff==FORWARD)
- user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].")
+ user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].")
holder.icon_state = "durand3"
else
- user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.")
+ user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.")
holder.icon_state = "durand1"
if(17)
if(diff==FORWARD)
- user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].")
+ user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].")
holder.icon_state = "durand4"
else
- user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].")
+ user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].")
var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder))
coil.amount = 4
holder.icon_state = "durand2"
if(16)
if(diff==FORWARD)
- user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].")
+ user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].")
qdel(used_atom)
holder.icon_state = "durand5"
else
- user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].")
+ user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].")
holder.icon_state = "durand3"
if(15)
if(diff==FORWARD)
- user.visible_message("[user] secures the mainboard.", "You secure the mainboard.")
+ user.visible_message("[user] secures the mainboard.", "You secure the mainboard.")
holder.icon_state = "durand6"
else
- user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].")
+ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].")
new /obj/item/circuitboard/mecha/durand/main(get_turf(holder))
holder.icon_state = "durand4"
if(14)
if(diff==FORWARD)
- user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].")
+ user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].")
qdel(used_atom)
holder.icon_state = "durand7"
else
- user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.")
+ user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.")
holder.icon_state = "durand5"
if(13)
if(diff==FORWARD)
- user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.")
+ user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.")
holder.icon_state = "durand8"
else
- user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].")
+ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].")
new /obj/item/circuitboard/mecha/durand/peripherals(get_turf(holder))
holder.icon_state = "durand6"
if(12)
if(diff==FORWARD)
- user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].")
+ user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].")
qdel(used_atom)
holder.icon_state = "durand9"
else
- user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.")
+ user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.")
holder.icon_state = "durand7"
if(11)
if(diff==FORWARD)
- user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.")
+ user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.")
holder.icon_state = "durand10"
else
- user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].")
+ user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].")
new /obj/item/circuitboard/mecha/durand/targeting(get_turf(holder))
holder.icon_state = "durand8"
if(10)
if(diff==FORWARD)
- user.visible_message("[user] installs phasic scanner module to the [holder].", "You install phasic scanner module to the [holder].")
+ user.visible_message("[user] installs phasic scanner module to the [holder].", "You install phasic scanner module to the [holder].")
qdel(used_atom)
holder.icon_state = "durand11"
else
- user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.")
+ user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.")
holder.icon_state = "durand9"
if(9)
if(diff==FORWARD)
- user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.")
+ user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.")
holder.icon_state = "durand12"
else
- user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the phasic scanner module from the [holder].")
+ user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the phasic scanner module from the [holder].")
new /obj/item/stock_parts/scanning_module/phasic(get_turf(holder))
holder.icon_state = "durand10"
if(8)
- if(diff==FORWARD)
- user.visible_message("[user] installs super capacitor to the [holder].", "You install super capacitor to the [holder].")
+ if(diff == FORWARD)
+ user.visible_message("[user] installs the mech power core to the [holder].", "You install the mech power core to the [holder].")
qdel(used_atom)
holder.icon_state = "durand13"
else
- user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.")
+ user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.")
holder.icon_state = "durand11"
if(7)
- if(diff==FORWARD)
- user.visible_message("[user] secures the super capacitor.", "You secure the super capacitor.")
+ if(diff == FORWARD)
+ user.visible_message("[user] secures the mech power core.", "You secure the mech power core.")
holder.icon_state = "durand14"
else
- user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the super capacitor from the [holder].")
- new /obj/item/stock_parts/capacitor/super(get_turf(holder))
+ user.visible_message("[user] removes the mech power core from the [holder].", "You remove the mech power core from the [holder].")
+ new /obj/item/mecha_parts/core(get_turf(holder))
holder.icon_state = "durand12"
if(6)
- if(diff==FORWARD)
- user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].")
+ if(diff == FORWARD)
+ user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].")
holder.icon_state = "durand15"
else
- user.visible_message("[user] unfastens the super capacitor.", "You unfasten the super capacitor.")
+ user.visible_message("[user] unfastens the mech power core.", "You unfasten the mech power core.")
holder.icon_state = "durand13"
if(5)
if(diff==FORWARD)
- user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.")
+ user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.")
holder.icon_state = "durand16"
else
- user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].")
+ user.visible_message("[user] pries the internal armor layer from the [holder].", "You pry the internal armor layer from the [holder].")
var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder))
MS.amount = 5
holder.icon_state = "durand14"
if(4)
if(diff==FORWARD)
- user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].")
+ user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].")
holder.icon_state = "durand17"
else
- user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.")
+ user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.")
holder.icon_state = "durand15"
if(3)
if(diff==FORWARD)
- user.visible_message("[user] installs Durand Armor Plates to the [holder].", "You install Durand Armor Plates to the [holder].")
+ user.visible_message("[user] installs the Durand Armor Plates to the [holder].", "You install the Durand Armor Plates to the [holder].")
qdel(used_atom)
holder.icon_state = "durand18"
else
- user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].")
+ user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].")
holder.icon_state = "durand16"
if(2)
if(diff==FORWARD)
- user.visible_message("[user] secures Durand Armor Plates.", "You secure Durand Armor Plates.")
+ user.visible_message("[user] secures the Durand Armor Plates.", "You secure the Durand Armor Plates.")
holder.icon_state = "durand19"
else
- user.visible_message("[user] pries Durand Armor Plates from the [holder].", "You pry Durand Armor Plates from the [holder].")
+ user.visible_message("[user] pries the Durand Armor Plates from the [holder].", "You pry the Durand Armor Plates from the [holder].")
new /obj/item/mecha_parts/part/durand_armor(get_turf(holder))
holder.icon_state = "durand17"
if(1)
if(diff==FORWARD)
- user.visible_message("[user] welds Durand Armor Plates to the [holder].", "You weld Durand Armor Plates to the [holder].")
+ user.visible_message("[user] welds the Durand Armor Plates to the [holder].", "You weld the Durand Armor Plates to the [holder].")
else
- user.visible_message("[user] unfastens Durand Armor Plates.", "You unfasten Durand Armor Plates.")
+ user.visible_message("[user] unfastens the Durand Armor Plates.", "You unfasten the Durand Armor Plates.")
holder.icon_state = "durand18"
return 1
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index d56ecae4290..c7532f04960 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -10,6 +10,12 @@
flags = CONDUCT
origin_tech = "programming=2;materials=2;engineering=2"
+/obj/item/mecha_parts/core
+ name = "mech power core"
+ icon = 'icons/obj/assemblies/new_assemblies.dmi'
+ icon_state = "anomaly_core"
+ desc = "A complex piece of electronics used to regulate the large amounts of power used by a combat mech's delicate components."
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/mecha_parts/chassis
name = "mecha chassis"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 5703b256726..de9de23212d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -37,6 +37,7 @@
new /obj/item/radio/headset/headset_sci(src)
new /obj/item/radio/headset/headset_sci(src)
+
/obj/structure/closet/secure_closet/RD
name = "research director's locker"
req_access = list(ACCESS_RD)
@@ -60,6 +61,7 @@
new /obj/item/clothing/accessory/medal/science(src)
new /obj/item/clothing/glasses/welding/superior(src)
+
/obj/structure/closet/secure_closet/research_reagents
name = "research chemical storage closet"
desc = "Store dangerous chemicals in here."