cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2796 from Cyantime/hypo

Browse Source 
Removes redundant hypospray
This commit is contained in:
Arokha Sieyes
2018-01-20 22:46:20 -05:00
committed by GitHub
parent 45d3381f93 84c3154b2b
commit b76a3c7f5b
6 changed files with 22 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -279,7 +279,7 @@
/obj/item/weapon/storage/fancy/vials/New()
..()
for(var/i=1 to 6)
new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr(src) //VOREStation Edit - Better vials
new /obj/item/weapon/reagent_containers/glass/beaker/vial(src)
return
/obj/item/weapon/storage/lockbox/vials
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -2
View File
@@ -204,9 +204,8 @@
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/device/radio/headset/heads/cmo/alt(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/hypospray/vr(src) //VOREStation Edit - MKII Hypospray
new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr(src) //VOREStation Edit - A vial for hypo
new /obj/item/weapon/reagent_containers/hypospray/vial(src)
new /obj/item/weapon/reagent_containers/glass/beaker/vial(src) //VOREStation Edit - An extra vial for the hypo
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/weapon/storage/box/freezer(src)
code/modules/reagents/reagent_containers/glass_vr.dm
+12 -16
View File
@@ -1,54 +1,50 @@
/obj/item/weapon/reagent_containers/glass/beaker/neurotoxin
prefill = list("neurotoxin" = 50)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr
possible_transfer_amounts = list(5,10,15,30) //Dunno why there was no '30' option before.
w_class = ITEMSIZE_SMALL //Why would it be the same size as a beaker?
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/bicaridine
/obj/item/weapon/reagent_containers/glass/beaker/vial/bicaridine
name = "vial (bicaridine)"
prefill = list("bicaridine" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dylovene
/obj/item/weapon/reagent_containers/glass/beaker/vial/dylovene
name = "vial (dylovene)"
prefill = list("dylovene" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dermaline
/obj/item/weapon/reagent_containers/glass/beaker/vial/dermaline
name = "vial (dermaline)"
prefill = list("dermaline" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/kelotane
/obj/item/weapon/reagent_containers/glass/beaker/vial/kelotane
name = "vial (kelotane)"
prefill = list("kelotane" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/inaprovaline
/obj/item/weapon/reagent_containers/glass/beaker/vial/inaprovaline
name = "vial (inaprovaline)"
prefill = list("inaprovaline" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalin
/obj/item/weapon/reagent_containers/glass/beaker/vial/dexalin
name = "vial (dexalin)"
prefill = list("dexalin" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalinplus
/obj/item/weapon/reagent_containers/glass/beaker/vial/dexalinplus
name = "vial (dexalinp)"
prefill = list("dexalinp" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/tricordrazine
/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine
name = "vial (tricordrazine)"
prefill = list("tricordrazine" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/alkysine
/obj/item/weapon/reagent_containers/glass/beaker/vial/alkysine
name = "vial (alkysine)"
prefill = list("alkysine" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/imidazoline
/obj/item/weapon/reagent_containers/glass/beaker/vial/imidazoline
name = "vial (imidazoline)"
prefill = list("imidazoline" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/peridaxon
/obj/item/weapon/reagent_containers/glass/beaker/vial/peridaxon
name = "vial (peridaxon)"
prefill = list("peridaxon" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/hyronalin
/obj/item/weapon/reagent_containers/glass/beaker/vial/hyronalin
name = "vial (hyronalin)"
prefill = list("hyronalin" = 30)
code/modules/reagents/reagent_containers/hypospray_vr.dm
-52
View File
@@ -1,54 +1,3 @@
//A vial-loaded hypospray. Cartridge-based!
/obj/item/weapon/reagent_containers/hypospray/vr
name = "hypospray mkII"
desc = "A new development from DeForest Medical, this new hypospray takes 30-unit vials as the drug supply for easy swapping."
var/obj/item/weapon/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name.
volume = 0
/obj/item/weapon/reagent_containers/hypospray/vr/New()
..()
loaded_vial = new /obj/item/weapon/reagent_containers/glass/beaker/vial/vr(src) //Comes with an empty vial
volume = loaded_vial.volume
reagents.maximum_volume = loaded_vial.reagents.maximum_volume
/obj/item/weapon/reagent_containers/hypospray/vr/attack_hand(mob/user as mob)
if(user.get_inactive_hand() == src)
if(loaded_vial)
reagents.trans_to_holder(loaded_vial.reagents,volume)
reagents.maximum_volume = 0
loaded_vial.update_icon()
user.put_in_hands(loaded_vial)
loaded_vial = null
user << "<span class='notice'>You remove the vial from the [src].</span>"
update_icon()
playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1)
return
..()
else
return ..()
/obj/item/weapon/reagent_containers/hypospray/vr/attackby(obj/item/weapon/W, mob/user as mob)
if(istype(W, /obj/item/weapon/reagent_containers/glass/beaker/vial))
if(!loaded_vial)
user.visible_message("<span class='notice'>[user] begins loading [W] into \the [src].</span>","<span class='notice'>You start loading [W] into \the [src].</span>")
if(!do_after(user,30) || loaded_vial || !(W in user))
return 0
if(W.is_open_container())
W.flags ^= OPENCONTAINER
W.update_icon()
user.drop_item()
W.loc = src
loaded_vial = W
reagents.maximum_volume = loaded_vial.reagents.maximum_volume
loaded_vial.reagents.trans_to_holder(reagents,volume)
user.visible_message("<span class='notice'>[user] has loaded [W] into \the [src].</span>","<span class='notice'>You have loaded [W] into \the [src].</span>")
update_icon()
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
else
user << "<span class='notice'>\The [src] already has a vial.</span>"
else
..()
/obj/item/weapon/reagent_containers/hypospray/autoinjector/beltminer
name = "Emergency trauma injector"
desc = "A rapid injector for emergency treatment of injuries. The warning label advises that it is not a substitute for proper medical treatment."
@@ -63,7 +12,6 @@
reagents.add_reagent("tricordrazine", 3)
reagents.add_reagent("tramadol", 2)
update_icon()
return
/obj/item/weapon/storage/box/traumainjectors
name = "box of emergency trauma injectors"
code/modules/vore/fluffstuff/custom_items_vr.dm
+7 -7
View File
@@ -363,32 +363,32 @@
H.update_inv_glasses()
//arokha:Aronai Kadigan - Fluff hypospray
/obj/item/weapon/reagent_containers/hypospray/vr/fluff/aronai
/obj/item/weapon/reagent_containers/hypospray/vial/fluff/aronai
name = "worn hypospray"
desc = "This hypospray seems a bit well-used. The blue band indicates it's from the CentCom medical division. There's an 'A' scratched into the bottom."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "aro_hypo"
/obj/item/weapon/reagent_containers/hypospray/vr/fluff/aronai/New()
/obj/item/weapon/reagent_containers/hypospray/vial/fluff/aronai/New()
..()
loaded_vial.name = "[initial(loaded_vial.name)] (tricord)"
loaded_vial.desc = "30 Tricordrazine"
reagents.add_reagent("tricordrazine", 30)
//arokha:Aronai Kadigan - Vials to go with mk2 hypo
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_st
/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_st
name = "vial (stabilize)"
desc = "10 Tricordrazine, 10 Dexalin Plus, 5 Tramadol, 5 Inaprovaline"
prefill = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bt
/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_bt
name = "vial (brute)"
desc = "25 Bicaridine, 5 Tricordrazine"
prefill = list("bicaridine"=25,"tricordrazine"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bu
/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_bu
name = "vial (burn)"
desc = "10 Kelotane, 15 Dermaline, 5 Tricordrazine"
prefill = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_tx
/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_tx
name = "vial (toxins)"
desc = "25 Dylovene, 2 Hyronalin, 3 Tricordrazine"
prefill = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3)
@@ -659,7 +659,7 @@
return
//WickedTempest: Chakat Tempest
/obj/item/weapon/reagent_containers/hypospray/vr/tempest
/obj/item/weapon/reagent_containers/hypospray/vial/tempest
name = "Tempest's Hypospray"
desc = "A custom-made MKII hypospray belonging to Chakat Tempest. There's small print engraved on the handle: A medicine-cat has no time for doubt. Act now, act swiftly."
icon = 'icons/vore/custom_items_vr.dmi'