cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Surgeon/Research/Medimerc borg fixes. (#4751)

Browse Source 
* Surgeon borg fixes.

* Merc combat medic borgs too.

* No med stacks

* chembags

* no chem bags (sorry, I tried!)
This commit is contained in:
mistyLuminescence
2018-02-08 20:44:41 +00:00
committed by Anewbe
parent f25da053a7
commit 4e4ba35444
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/silicon/robot/drone/drone_items.dm
View File

@@ -58,7 +58,8 @@
/obj/item/weapon/reagent_containers/glass, /obj/item/weapon/reagent_containers/glass,
/obj/item/weapon/storage/pill_bottle, /obj/item/weapon/storage/pill_bottle,
/obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/pill,
/obj/item/weapon/reagent_containers/blood /obj/item/weapon/reagent_containers/blood,
/obj/item/stack/material/phoron
) )
/obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc /obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc

23
code/modules/mob/living/silicon/robot/robot_modules/station.dm
View File

@@ -245,10 +245,19 @@ var/global/list/robot_modules = list(
src.modules += N src.modules += N
src.modules += B src.modules += B
/obj/item/weapon/robot_module/medical/robot/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) /obj/item/weapon/robot_module/robot/medical/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
S.reagents.clear_reagents()
S.mode = initial(S.mode)
S.desc = initial(S.desc)
S.update_icon()
if(src.emag) if(src.emag)
var/obj/item/weapon/reagent_containers/spray/PS = src.emag var/obj/item/weapon/reagent_containers/spray/PS = src.emag
PS.reagents.add_reagent("pacid", 2 * amount) PS.reagents.add_reagent("pacid", 2 * amount)
..() ..()
/obj/item/weapon/robot_module/robot/medical/crisis /obj/item/weapon/robot_module/robot/medical/crisis
@@ -749,6 +758,18 @@ var/global/list/robot_modules = list(
C.synths = list(wire) C.synths = list(wire)
src.modules += C src.modules += C
/obj/item/weapon/robot_module/robot/research/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
S.reagents.clear_reagents()
S.mode = initial(S.mode)
S.desc = initial(S.desc)
S.update_icon()
..()
/obj/item/weapon/robot_module/robot/security/combat /obj/item/weapon/robot_module/robot/security/combat
name = "combat robot module" name = "combat robot module"
hide_on_manifest = 1 hide_on_manifest = 1

10
code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm
View File

@@ -182,3 +182,13 @@
src.modules += O src.modules += O
src.modules += B src.modules += B
src.modules += S src.modules += S
/obj/item/weapon/robot_module/robot/syndicate/combat_medic/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
S.reagents.clear_reagents()
S.mode = initial(S.mode)
S.desc = initial(S.desc)
S.update_icon()
..()