cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Medical/Cyborg Tweaks (#864)

Browse Source 
changes:

tweak: "Surgeon and Crisis cyborg modules renamed to Medical and Rescue, Janitor cyborg module renamed to Custodial."
tweak: "Tweaked equipment of cyborg modules."
rscadd: "Grippers can now grab valid items inside any unsecure container"
This commit is contained in:
NanakoAC
2016-09-07 10:11:10 +02:00
committed by skull132
parent b6ba43bdf4
commit 5d91bf1698
5 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/drone/drone_items.dm
+2 -2
View File
@@ -199,11 +199,11 @@
wrapped = null
return
else if (istype(target, /obj/item/weapon/storage/box))
else if (istype(target, /obj/item/weapon/storage) && !istype(target, /obj/item/weapon/storage/secure))
for (var/obj/item/C in target.contents)
for(var/typepath in can_hold)
if(istype(C,typepath))
user << "You grab the [C] from inside the box."
user << "You grab the [C] from inside the [target.name]."
C.loc = src
return
user << "There is nothing inside the box that your gripper can collect"
code/modules/mob/living/silicon/robot/robot_modules.dm
+19 -13
View File
@@ -4,13 +4,13 @@ var/global/list/robot_modules = list(
"Clerical" = /obj/item/weapon/robot_module/clerical/general,
"Research" = /obj/item/weapon/robot_module/research,
"Miner" = /obj/item/weapon/robot_module/miner,
"Crisis" = /obj/item/weapon/robot_module/medical/crisis,
"Surgeon" = /obj/item/weapon/robot_module/medical/surgeon,
"Rescue" = /obj/item/weapon/robot_module/medical/rescue,
"Medical" = /obj/item/weapon/robot_module/medical/general,
"Security" = /obj/item/weapon/robot_module/security/general,
"Combat" = /obj/item/weapon/robot_module/combat,
"Engineering" = /obj/item/weapon/robot_module/engineering/general,
"Construction" = /obj/item/weapon/robot_module/engineering/construction,
"Janitor" = /obj/item/weapon/robot_module/janitor
"Custodial" = /obj/item/weapon/robot_module/janitor
)
/obj/item/weapon/robot_module
@@ -180,8 +180,8 @@ var/global/list/robot_modules = list(
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
can_be_pushed = 0
/obj/item/weapon/robot_module/medical/surgeon
name = "surgeon robot module"
/obj/item/weapon/robot_module/medical/general
name = "medical robot module"
sprites = list(
"Basic" = "Medbot",
"Standard" = "surgeon",
@@ -190,11 +190,11 @@ var/global/list/robot_modules = list(
"Drone" = "drone-surgery"
)
/obj/item/weapon/robot_module/medical/surgeon/New()
/obj/item/weapon/robot_module/medical/general/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/medical(src)
src.modules += new /obj/item/weapon/scalpel(src)
src.modules += new /obj/item/weapon/hemostat(src)
src.modules += new /obj/item/weapon/retractor(src)
@@ -205,6 +205,9 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/circular_saw(src)
src.modules += new /obj/item/weapon/surgicaldrill(src)
src.modules += new /obj/item/weapon/gripper/chemistry(src)
src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src)
src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
src.modules += new /obj/item/device/reagent_scanner/adv(src)
src.emag = new /obj/item/weapon/reagent_containers/spray(src)
src.emag.reagents.add_reagent("pacid", 250)
src.emag.name = "Polyacid spray"
@@ -225,14 +228,14 @@ var/global/list/robot_modules = list(
return
/obj/item/weapon/robot_module/medical/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
/obj/item/weapon/robot_module/medical/general/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
if(src.emag)
var/obj/item/weapon/reagent_containers/spray/PS = src.emag
PS.reagents.add_reagent("pacid", 2 * amount)
..()
/obj/item/weapon/robot_module/medical/crisis
name = "crisis robot module"
/obj/item/weapon/robot_module/medical/rescue
name = "rescue robot module"
sprites = list(
"Basic" = "Medbot",
"Standard" = "surgeon",
@@ -243,17 +246,19 @@ var/global/list/robot_modules = list(
)
supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack)
/obj/item/weapon/robot_module/medical/crisis/New()
/obj/item/weapon/robot_module/medical/rescue/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/hud/med(src)
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/device/reagent_scanner/adv(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/roller_holder(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/crisis(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/rescue(src)
src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src)
src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
src.modules += new /obj/item/weapon/extinguisher/mini(src)
src.modules += new /obj/item/borg/sight/meson(src)
src.emag = new /obj/item/weapon/reagent_containers/spray(src)
src.emag.reagents.add_reagent("pacid", 250)
src.emag.name = "Polyacid spray"
@@ -279,7 +284,7 @@ var/global/list/robot_modules = list(
return
/obj/item/weapon/robot_module/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
/obj/item/weapon/robot_module/medical/rescue/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()
@@ -612,6 +617,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/extinguisher/mini(src)
src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
src.modules += new /obj/item/weapon/gripper/chemistry(src)
src.modules += new /obj/item/weapon/extinguisher(src)
src.emag = new /obj/item/weapon/hand_tele(src)
var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000)
code/modules/reagents/reagent_containers/borghydro.dm
+3 -3
View File
@@ -17,10 +17,10 @@
var/list/reagent_volumes = list()
var/list/reagent_names = list()
/obj/item/weapon/reagent_containers/borghypo/surgeon
reagent_ids = list("bicaridine", "inaprovaline", "dexalin", "stoxin")
/obj/item/weapon/reagent_containers/borghypo/medical
reagent_ids = list("bicaridine", "inaprovaline", "dexalin", "stoxin", "spaceacillin", "anti_toxin")
/obj/item/weapon/reagent_containers/borghypo/crisis
/obj/item/weapon/reagent_containers/borghypo/rescue
reagent_ids = list("tricordrazine", "inaprovaline", "tramadol")
/obj/item/weapon/reagent_containers/borghypo/New()