cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypospray fix (again) (#30560)

Browse Source 
* fixes accidental hypospray revert. again.

* a little cleanup
This commit is contained in:
Apogee-dev
2021-09-06 16:41:19 -07:00
committed by GitHub
parent d1bbeba01f
commit e06f6d6f74
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -13,21 +13,20 @@
possible_transfer_amounts = null possible_transfer_amounts = null
flags = FPRINT | OPENCONTAINER flags = FPRINT | OPENCONTAINER
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/list/refill_reagent_list = list(DOCTORSDELIGHT = 30)
/obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob) /obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob)
return src.attack_hand(user) return src.attack_hand(user)
/obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty //or just empty the reagent list idk
/obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
..() ..()
reagents.add_reagent(DOCTORSDELIGHT, 30) reagent_refill()
return
/obj/item/weapon/reagent_containers/hypospray/creatine/New() // TESTING! /obj/item/weapon/reagent_containers/hypospray/proc/reagent_refill()
..() if(refill_reagent_list.len)
reagents.remove_reagent(DOCTORSDELIGHT, 30) for(var/R in refill_reagent_list)
reagents.add_reagent(CREATINE, 30) reagents.add_reagent(R, refill_reagent_list[R])
return update_icon()
/obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob) /obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob)
if(!reagents.total_volume) if(!reagents.total_volume)
@@ -77,6 +76,10 @@
return return
/obj/item/weapon/reagent_containers/hypospray/creatine // TESTING!
name = "creatine hypospray"
refill_reagent_list = list(CREATINE = 30)
/obj/item/weapon/reagent_containers/hypospray/autoinjector /obj/item/weapon/reagent_containers/hypospray/autoinjector
name = "autoinjector" name = "autoinjector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel." desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
@@ -112,12 +115,7 @@
amount_per_transfer_from_this = 15 amount_per_transfer_from_this = 15
volume = 15 volume = 15
flags = FPRINT flags = FPRINT
refill_reagent_list = list(BIOFOAM = 15)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biofoam_injector/New()
..()
reagents.remove_reagent(DOCTORSDELIGHT, 30)
reagents.add_reagent(BIOFOAM, 15)
return
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biofoam_injector/update_icon() /obj/item/weapon/reagent_containers/hypospray/autoinjector/biofoam_injector/update_icon()
if(reagents.total_volume > 0) if(reagents.total_volume > 0)
@@ -130,17 +128,24 @@
desc = "A small, single-use device used to administer small amounts of paralytic agent." desc = "A small, single-use device used to administer small amounts of paralytic agent."
icon_state = "paralytic1" icon_state = "paralytic1"
item_state = "paralytic" item_state = "paralytic"
amount_per_transfer_from_this = 15 amount_per_transfer_from_this = 10
volume = 15 volume = 10
flags = FPRINT flags = FPRINT
refill_reagent_list = list(SUX = 10)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/paralytic_injector/New()
..()
reagents.remove_reagent(DOCTORSDELIGHT, 30)
reagents.add_reagent(SUX, 10)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/paralytic_injector/update_icon() /obj/item/weapon/reagent_containers/hypospray/autoinjector/paralytic_injector/update_icon()
if(reagents.total_volume > 0) if(reagents.total_volume > 0)
icon_state = "paralytic1" icon_state = "paralytic1"
else else
icon_state = "paralytic0" icon_state = "paralytic0"
/obj/item/weapon/reagent_containers/hypospray/autoinjector/admin // TESTING!
name = "dummy autoinjector"
desc = "Why? why would a test dummy ever need something like this?"
mech_flags = MECH_SCAN_FAIL
refill_reagent_list = list(ADMINORDRAZINE = 5)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/admin/afterattack(obj/target, mob/user, adjacency_flag, click_params)
. = ..()
if(!reagents.total_volume)
reagent_refill()