cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

ERT Medkit Revision (#20658)

Browse Source 
* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* Seperated the Red and Gamma Patch Packs
Changed some colors for the patch packs/pill bottles

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* adjustments to patch packs

* format fix

* inheritance adjustment

* adjusted medince to reflect changes to SR

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Burzah
2023-04-15 21:59:19 +02:00
committed by GitHub
co-authored by Contrabang Adri
parent 87d69f93b4
commit e85094ed32
3 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/firstaid.dm
+29 -8
View File
@@ -225,9 +225,10 @@
new /obj/item/stack/medical/splint(src)
new /obj/item/reagent_containers/applicator/dual(src)
new /obj/item/stack/medical/ointment/advanced(src)
new /obj/item/stack/medical/ointment/advanced(src)
new /obj/item/stack/medical/bruise_pack/advanced(src)
new /obj/item/storage/pill_bottle/ert(src)
new /obj/item/storage/pill_bottle/patch_pack/ert(src)
new /obj/item/stack/medical/bruise_pack/advanced(src)
/obj/item/storage/firstaid/ert_amber
name = "amber ert first-aid kit"
@@ -302,17 +303,18 @@
else
return ..()
/obj/item/storage/pill_bottle/ert
wrapper_color = COLOR_MAROON
/obj/item/storage/pill_bottle/ert_red
wrapper_color = COLOR_NT_RED
/obj/item/storage/pill_bottle/ert/populate_contents()
/obj/item/storage/pill_bottle/ert_red/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/pill/pentetic(src)
new /obj/item/reagent_containers/food/pill/ironsaline(src)
new /obj/item/reagent_containers/food/pill/salicylic(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
/obj/item/storage/pill_bottle/ert_amber
wrapper_color = COLOR_AMBER
wrapper_color = COLOR_ORANGE
/obj/item/storage/pill_bottle/ert_amber/populate_contents()
for(var/I in 1 to 6)
@@ -320,6 +322,18 @@
new /obj/item/reagent_containers/food/pill/charcoal(src)
new /obj/item/reagent_containers/food/pill/salicylic(src)
/obj/item/storage/pill_bottle/ert_gamma
wrapper_color = COLOR_YELLOW_GRAY
/obj/item/storage/pill_bottle/ert_gamma/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/pill/pentetic(src)
new /obj/item/reagent_containers/food/pill/ironsaline(src)
new /obj/item/reagent_containers/food/pill/hydrocodone(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
new /obj/item/reagent_containers/food/pill/lazarus_reagent(src)
new /obj/item/reagent_containers/food/pill/rezadone(src)
/obj/item/storage/pill_bottle/MouseDrop(obj/over_object) // Best utilized if you're a cantankerous doctor with a Vicodin habit.
if(iscarbon(over_object))
var/mob/living/carbon/C = over_object
@@ -380,8 +394,9 @@
new /obj/item/reagent_containers/food/pill/fakedeath(src)
/obj/item/storage/pill_bottle/patch_pack/ert
name = "ert patch pack"
desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT medics."
name = "ert red patch pack"
desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Red level medics."
wrapper_color = COLOR_NT_RED
/obj/item/storage/pill_bottle/patch_pack/ert/populate_contents()
for(var/I in 1 to 5)
@@ -389,9 +404,15 @@
new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src)
new /obj/item/reagent_containers/food/pill/patch/styptic(src)
/obj/item/storage/pill_bottle/patch_pack/ert/gamma
name = "ert gamma patch pack"
desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Gamma level medics."
wrapper_color = COLOR_YELLOW_GRAY
/obj/item/storage/pill_bottle/patch_pack/ert_amber
name = "ert amber patch pack"
desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Amber level medics"
wrapper_color = COLOR_ORANGE
/obj/item/storage/pill_bottle/patch_pack/ert_amber/populate_contents()
for(var/I in 1 to 5)
code/modules/reagents/reagent_containers/pill.dm
+12
View File
@@ -158,3 +158,15 @@
desc = "Used to help with blood loss."
icon_state = "pill2"
list_reagents = list("iron" = 10, "salglu_solution" = 10)
/obj/item/reagent_containers/food/pill/lazarus_reagent
name = "\improper Lazarus Reagent pill"
desc = "Miraculous drug used for revival. Use with caution. Improper use may cause bodies to violently blow apart."
icon_state = "pill9"
list_reagents = list("lazarus_reagent" = 1)
/obj/item/reagent_containers/food/pill/rezadone
name = "\improper Rezadone pill"
desc = "Used to rapidly repair cellular defects within a subject's cell structure."
icon_state = "pill10"
list_reagents = list("rezadone" = 1)
code/modules/response_team/ert_outfits.dm
+5
View File
@@ -357,6 +357,8 @@
/obj/item/roller/holo = 1,
/obj/item/bodyanalyzer = 1,
/obj/item/handheld_defibrillator = 1,
/obj/item/storage/pill_bottle/ert_red = 1,
/obj/item/storage/pill_bottle/patch_pack/ert = 1,
/obj/item/soap/nanotrasen = 1
)
@@ -388,6 +390,9 @@
/obj/item/extinguisher/mini = 1,
/obj/item/roller/holo = 1,
/obj/item/handheld_defibrillator = 1,
/obj/item/storage/box/autoinjectors = 1,
/obj/item/storage/pill_bottle/ert_gamma = 1,
/obj/item/storage/pill_bottle/patch_pack/ert/gamma = 1
)
cybernetic_implants = list(