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

Alternative Borg Hypo Fix (#2623)

Browse Source 
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.
This commit is contained in:
Werner
2017-06-10 17:23:34 +03:00
committed by skull132
parent 4cf407ea33
commit eab6ec1d28
2 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/borghydro.dm
+4 -6
View File
@@ -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("<span class='notice'>[user] starts to inject [M] with their hypospray!</span>", "<span class='notice'>You start to inject [M] with your hypospray!</span>")
if(do_mob(user, M, 3 SECONDS))
M << "<span class='notice'>You feel a tiny prick!</span>"
user <<"<span class='notice'>You inject [M] with your hypospray!</span>"
visible_message("<span class='notice'>[user] injects [M] with their hypospray!</span>", "<span class='notice'>You inject [M] with your hypospray!</span>")
M << "<span class='notice'>You feel a tiny prick!</span>"
if(M.reagents)
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
html/changelogs/Printer16-BorgHypo.yml → html/changelogs/arrow768-borgHypoAlt.yml
+36 -36
View File
@@ -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"