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

Ert medic kit rework (#20561)

Browse Source 
* First commit for ERT medic kit rework

* Value adjustment for pill bottles and patch pack
This was intended for the first commit

* removes the empty containers previously created

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

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

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

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

* Merge conflict resolution

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Burzah
2023-03-13 22:53:47 +01:00
committed by GitHub
co-authored by Henri215
parent cf835c8d7b
commit 30e461f60a
4 changed files with 81 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/firstaid.dm
+58 -1
View File
@@ -215,6 +215,34 @@
new /obj/item/surgicaldrill(src)
new /obj/item/circular_saw(src)
/obj/item/storage/firstaid/ert
name = "ert first-aid kit"
icon_state = "bezerk"
desc = "A medical kit used by Nanotrasen emergency response team personnel."
/obj/item/storage/firstaid/ert/populate_contents()
new /obj/item/healthanalyzer/advanced(src)
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/bruise_pack/advanced(src)
new /obj/item/storage/pill_bottle/ert(src)
new /obj/item/storage/pill_bottle/patch_pack/ert(src)
/obj/item/storage/firstaid/ert_amber
name = "amber ert first-aid kit"
icon_state = "firstaid"
desc = "A medical kit used by Amber level emergency response team personnel."
/obj/item/storage/firstaid/ert_amber/populate_contents()
new /obj/item/healthanalyzer/advanced(src)
new /obj/item/reagent_containers/applicator/brute(src)
new /obj/item/reagent_containers/applicator/burn(src)
new /obj/item/stack/medical/bruise_pack/advanced(src)
new /obj/item/stack/medical/ointment/advanced(src)
new /obj/item/storage/pill_bottle/ert_amber(src)
new /obj/item/storage/pill_bottle/patch_pack/ert_amber(src)
/*
* Pill Bottles
*/
@@ -278,9 +306,19 @@
wrapper_color = COLOR_MAROON
/obj/item/storage/pill_bottle/ert/populate_contents()
for(var/I in 1 to 3)
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)
/obj/item/storage/pill_bottle/ert_amber
wrapper_color = COLOR_AMBER
/obj/item/storage/pill_bottle/ert_amber/populate_contents()
for(var/I in 1 to 6)
new /obj/item/reagent_containers/food/pill/salbutamol(src)
new /obj/item/reagent_containers/food/pill/charcoal(src)
new /obj/item/reagent_containers/food/pill/salicylic(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))
@@ -340,3 +378,22 @@
new /obj/item/reagent_containers/food/pill/fakedeath(src)
new /obj/item/reagent_containers/food/pill/fakedeath(src)
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."
/obj/item/storage/pill_bottle/patch_pack/ert/populate_contents()
for(var/I in 1 to 5)
new /obj/item/reagent_containers/food/pill/patch/perfluorodecalin(src)
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_amber
name = "ert amber patch pack"
desc = "A patch pack containing medical patches. Issued to Nanotrasen ERT Amber level medics"
/obj/item/storage/pill_bottle/patch_pack/ert_amber/populate_contents()
for(var/I in 1 to 5)
new /obj/item/reagent_containers/food/pill/patch/silver_sulf/small(src)
new /obj/item/reagent_containers/food/pill/patch/styptic/small(src)