From 5d91bf1698c6ff21de97a28e66421765de37cf2d Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Wed, 7 Sep 2016 09:11:10 +0100 Subject: [PATCH] Medical/Cyborg Tweaks (#864) 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" --- code/global.dm | 4 +- .../living/silicon/robot/drone/drone_items.dm | 4 +- .../mob/living/silicon/robot/robot_modules.dm | 32 ++++++++------- .../reagents/reagent_containers/borghydro.dm | 6 +-- html/changelogs/Nanako-MediborgTweaks.yml | 39 +++++++++++++++++++ 5 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 html/changelogs/Nanako-MediborgTweaks.yml diff --git a/code/global.dm b/code/global.dm index 0692a3d2b5e..21f0061b152 100644 --- a/code/global.dm +++ b/code/global.dm @@ -210,8 +210,8 @@ var/list/cheartstopper = list("potassium_chloride") // Thi // Used by robots and robot preferences. var/list/robot_module_types = list( - "Standard", "Engineering", "Construction", "Surgeon", "Crisis", - "Miner", "Janitor", "Service", "Clerical", "Security", + "Standard", "Engineering", "Construction", "Medical", "Rescue", + "Miner", "Custodial", "Service", "Clerical", "Security", "Research" ) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index ea2815236bf..f885933a259 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -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" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 85b292c9979..96552b0ead8 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index dfd64fdff01..19c42f0ef38 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -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() diff --git a/html/changelogs/Nanako-MediborgTweaks.yml b/html/changelogs/Nanako-MediborgTweaks.yml new file mode 100644 index 00000000000..ac0d9347ecd --- /dev/null +++ b/html/changelogs/Nanako-MediborgTweaks.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nanako + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +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" + \ No newline at end of file