From eab6ec1d2809781c3bbb89e87ceab28e9e5fa9f2 Mon Sep 17 00:00:00 2001 From: Werner Date: Sat, 10 Jun 2017 16:23:34 +0200 Subject: [PATCH] Alternative Borg Hypo Fix (#2623) This is a alternative solution for the borg hypospray issue. As suggested by various players, this removes the cooldown again and replaces sleeptoxin with tramadol. That would serve the purpose of reinforcing the behavior that the medical borgs are not designed for combat, but still allow them to operate on patients if they need to. --- .../reagents/reagent_containers/borghydro.dm | 10 ++- ...-BorgHypo.yml => arrow768-borgHypoAlt.yml} | 72 +++++++++---------- 2 files changed, 40 insertions(+), 42 deletions(-) rename html/changelogs/{Printer16-BorgHypo.yml => arrow768-borgHypoAlt.yml} (91%) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index b766c74a71f..6ca904c2991 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -1,5 +1,5 @@ /obj/item/weapon/reagent_containers/borghypo - name = "cyborg chemical injector" + name = "cyborg hypospray" desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment." icon = 'icons/obj/syringe.dmi' item_state = "hypo" @@ -18,7 +18,7 @@ var/list/reagent_names = list() /obj/item/weapon/reagent_containers/borghypo/medical - reagent_ids = list("bicaridine", "inaprovaline", "dexalin", "stoxin", "spaceacillin", "anti_toxin") + reagent_ids = list("bicaridine", "inaprovaline", "dexalin", "tramadol", "spaceacillin", "anti_toxin") /obj/item/weapon/reagent_containers/borghypo/rescue reagent_ids = list("tricordrazine", "inaprovaline", "tramadol") @@ -70,10 +70,8 @@ return if (M.can_inject(user, 1)) - visible_message("[user] starts to inject [M] with their hypospray!", "You start to inject [M] with your hypospray!") - if(do_mob(user, M, 3 SECONDS)) - M << "You feel a tiny prick!" - user <<"You inject [M] with your hypospray!" + visible_message("[user] injects [M] with their hypospray!", "You inject [M] with your hypospray!") + M << "You feel a tiny prick!" if(M.reagents) var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]]) diff --git a/html/changelogs/Printer16-BorgHypo.yml b/html/changelogs/arrow768-borgHypoAlt.yml similarity index 91% rename from html/changelogs/Printer16-BorgHypo.yml rename to html/changelogs/arrow768-borgHypoAlt.yml index 7b17c1a358d..6df053a32aa 100644 --- a/html/changelogs/Printer16-BorgHypo.yml +++ b/html/changelogs/arrow768-borgHypoAlt.yml @@ -1,36 +1,36 @@ -################################ -# 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: Printer16 - -# 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: "Injecting someone with a borg hypospray now takes 3 seconds." +################################ +# 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: Arrow768 + +# 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: "Medial Borg Hypospray: Replaces Sleeptoxin with Tramadol"