Skip to content

Commit

Permalink
Added in additional wait time if target is wearing a voidsuit as requ…
Browse files Browse the repository at this point in the history
…ested by Kenzie the great devourer.

Gave the hypokits 60u of the base chems so that people dont just cannibalize the mk2's for their chems leaving empty kits in the locker.
  • Loading branch information
crossexonar committed Jan 8, 2025
1 parent f5bf6ac commit 7c2b566
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
12 changes: 6 additions & 6 deletions code/game/objects/items/weapons/storage/firstaid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -246,18 +246,18 @@
icon_state = "vialcaselight"
slot_flags = SLOT_BELT
max_storage_space = ITEMSIZE_COST_SMALL * 7
starts_with = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/tramadol,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/bicaridine,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/antitoxin,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/keloderma,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/dexalin)
starts_with = list(/obj/item/weapon/revised_hypospray,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/bicaridine = 2,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/antitoxin = 2,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/keloderma = 2,
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/dexalin = 2)
can_hold = list(/obj/item/weapon/revised_hypospray, /obj/item/weapon/reagent_containers/glass/beaker/vial)
//can fit vials, and the mk.I hyospray.

/obj/item/weapon/storage/firstaid/mkIhypokit/cmo
name = "Deluxe iHypo Kit"
desc = "Contains a Deluxe WolfApple iHypo and its vials and its hypovials, can hold bottles."
icon_state = "vialcasedark"
icon_state = "vialcaselight"
max_storage_space = ITEMSIZE_COST_SMALL * 10
starts_with = list(/obj/item/weapon/revised_hypospray/CMO,
/obj/item/weapon/reagent_containers/glass/bottle/preloaded/tramadol,
Expand Down
8 changes: 6 additions & 2 deletions code/modules/reagents/reagent_containers/hypospray_rs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@

if(!vial || !proximity || !isliving(target) || ((swapping || injecting)))
return
var/mob/living/L = target
var/mob/living/carbon/human/L = target

if(!L.reagents)
return
Expand Down Expand Up @@ -204,6 +204,10 @@
add_attack_logs(user, L, "[user] attemped to use [src] on [L] which had [contained]")
injecting = 1
if(!upgraded)
if(L.wear_suit)
if(istype(L.wear_suit, /obj/item/clothing/suit/space))
to_chat(user, "<span class='notice'>[L] is wearing a voidsuit, searching for an injection port.</span>")
inject_wait_me += 60
if(amount_per_transfer_from_this == "vial") //use vial transfer rate
inject_wait_me += vial.amount_per_transfer_from_this * 1.5
else
Expand Down Expand Up @@ -289,7 +293,7 @@
*/


//Hypo mkI vials, will be moved later
//preloaded vials
/obj/item/weapon/reagent_containers/glass/beaker/vial/preloaded/bicaridine
name = "Bicaridine bottle"
icon_state = "vial"
Expand Down

0 comments on commit 7c2b566

Please sign in to comment.