cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Epi autoinjectors are now a subtype of autoinjectors, the basetype is now empty (#22261)

Browse Source 
* removing the useless feature
Yes this removes it from all autoinjectors
No I am not going to publish this

* WOOOOO REGEX WORKS

* Almost forgot the entire reason of this PR

* Oversight

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Lewc review

* Update code/game/objects/items/weapons/storage/bags.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-09-17 20:15:43 -04:00
committed by GitHub
co-authored by Nathan Winters Henri215
parent 98d7753a5d
commit 3693e6d620
9 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/hypospray.dm
+9 -5
View File
@@ -116,9 +116,9 @@
volume = 100
list_reagents = list("nanites" = 100)
/obj/item/reagent_containers/hypospray/autoinjector
name = "emergency autoinjector"
desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
/obj/item/reagent_containers/hypospray/autoinjector // This is an empty variant
name = "empty autoinjector"
desc = "A rapid and safe way to inject chemicals into humanoids. This one is empty."
icon_state = "autoinjector"
item_state = "autoinjector"
belt_icon = "autoinjector"
@@ -128,7 +128,6 @@
ignore_flags = TRUE //so you can medipen through hardsuits
container_type = DRAWABLE
flags = null
list_reagents = list("epinephrine" = 10)
/obj/item/reagent_containers/hypospray/autoinjector/attack(mob/M, mob/user)
if(!reagents.total_volume)
@@ -156,6 +155,11 @@
else
. += "<span class='notice'>It is spent.</span>"
/obj/item/reagent_containers/hypospray/autoinjector/epinephrine
name = "emergency autoinjector"
desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
list_reagents = list("epinephrine" = 10)
/obj/item/reagent_containers/hypospray/autoinjector/teporone //basilisks
name = "teporone autoinjector"
desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction."
@@ -184,7 +188,7 @@
icon_state = "survpen"
volume = 42
amount_per_transfer_from_this = 42
list_reagents = list("salbutamol" = 10, "teporone" = 15, "epinephrine" = 10, "lavaland_extract" = 2, "weak_omnizine" = 5) //Short burst of healing, followed by minor healing from the saline
list_reagents = list("salbutamol" = 10, "teporone" = 15, "epinephrine" = 10, "lavaland_extract" = 2, "weak_omnizine" = 5)
/obj/item/reagent_containers/hypospray/autoinjector/emergency_nuclear
name = "emergency stabilization medipen"
code/modules/response_team/ert_outfits.dm
+1 -1
View File
@@ -378,7 +378,7 @@
belt = /obj/item/storage/belt/medical //No need for belt defib, they got the built in ones. This gives them some extra storage.
l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
r_pocket = /obj/item/reagent_containers/hypospray/autoinjector
r_pocket = /obj/item/reagent_containers/hypospray/autoinjector/epinephrine
backpack_contents = list(