diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 5b92d2ca8e7..bd636f54a26 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -80,6 +80,9 @@ var/obj/screen/robot_inventory mymob.hands.name = "module" mymob.hands.screen_loc = ui_borg_module + if(r.module) + mymob.hands.icon_state = lowertext(r.mod_type) + //Module Panel using = new /obj/screen() using.name = "panel" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index eddf1c47988..94521fa71e8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -335,7 +335,7 @@ proc/get_ghosts(var/notify = 0,var/what = 2, var/client/C = null) R.uneq_all() R.mod_type = initial(R.mod_type) - R.hands.icon_state = initial(R.hands.icon_state) + R.hands.icon_state = "nomod" R.module.Reset(R) QDEL_NULL(R.module) diff --git a/code/modules/mob/living/silicon/robot/gripper.dm b/code/modules/mob/living/silicon/robot/gripper.dm index d0c390922f5..fa2cba06f46 100644 --- a/code/modules/mob/living/silicon/robot/gripper.dm +++ b/code/modules/mob/living/silicon/robot/gripper.dm @@ -213,6 +213,9 @@ /obj/item/stock_parts, /obj/item/device/mmi, /obj/item/robot_parts, + /obj/item/mech_component, + /obj/item/mecha_equipment, + /obj/item/device/radio/exosuit, /obj/item/borg/upgrade, /obj/item/device/flash, //to build borgs, /obj/item/organ/internal/brain, //to insert into MMIs, diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 35cb5cea503..17a3b452e21 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -731,8 +731,17 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/gripper/no_use/loader(src) src.modules += new /obj/item/device/robotanalyzer(src) src.modules += new /obj/item/card/robot(src) + + var/datum/matter_synth/wire = new /datum/matter_synth/wire(15) + synths += wire + var/obj/item/stack/cable_coil/cyborg/C = new /obj/item/stack/cable_coil/cyborg(src) + C.synths = list(wire) + src.modules += C + + src.modules += new /obj/item/weldingtool/experimental(src) src.modules += new /obj/item/wrench/robotic(src) src.modules += new /obj/item/screwdriver(src) + src.modules += new /obj/item/wirecutters/robotic(src) src.modules += new /obj/item/surgery/scalpel(src) src.modules += new /obj/item/surgery/circular_saw(src) src.modules += new /obj/item/reagent_containers/syringe(src) diff --git a/html/changelogs/geeves-sci_borg_buff.yml b/html/changelogs/geeves-sci_borg_buff.yml new file mode 100644 index 00000000000..3ac7243de28 --- /dev/null +++ b/html/changelogs/geeves-sci_borg_buff.yml @@ -0,0 +1,10 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Reconnecting as a borg will now display you with the correct module on your HUD." + - bugfix: "Being reset by an admin as a borg will now show you the right 'nomod' module on your HUD." + - rscadd: "Scientific grippers can now grip enough stuff to be able to build mechs." + - rscadd: "Science borgs now get cable coils, an experimental welding tool, and wirecutters." + - rscadd: "Science borgs now get a fancy new module sprite, sprited by myself, with love." \ No newline at end of file diff --git a/icons/mob/screen/robot.dmi b/icons/mob/screen/robot.dmi index 9630b598536..a309afb2cad 100644 Binary files a/icons/mob/screen/robot.dmi and b/icons/mob/screen/robot.dmi differ