cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +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)
code/modules/reagents/reagent_containers/patch.dm
+6
View File
@@ -67,3 +67,9 @@
desc = "Helps with brute injuries if the affected person is a clown, otherwise inflicts various annoying effects."
icon_state = "bandaid_clown"
list_reagents = list("jestosterone" = 20)
/obj/item/reagent_containers/food/pill/patch/perfluorodecalin
name = "perfluorodecalin patch"
desc = "Incredibly potent respiratory aid drug, may cause shortness of breath if used in large amounts."
icon_state = "bandaid_med"
list_reagents = list("perfluorodecalin" = 10)
code/modules/reagents/reagent_containers/pill.dm
+12
View File
@@ -146,3 +146,15 @@
desc = "Used to treat cranial swelling."
icon_state = "pill19"
list_reagents = list("mannitol" = 10)
/obj/item/reagent_containers/food/pill/pentetic
name ="\improper Pentetic pill"
desc = "Used to purge substances and radiation."
icon_state = "pill7"
list_reagents = list("pen_acid" = 5)
/obj/item/reagent_containers/food/pill/ironsaline
name = "\improper Iron saline pill"
desc = "Used to help with blood loss."
icon_state = "pill2"
list_reagents = list("iron" = 10, "salglu_solution" = 10)
code/modules/response_team/ert_outfits.dm
+5 -14
View File
@@ -311,6 +311,7 @@
/datum/outfit/job/centcom/response_team/medic/amber
name = "RT Medic (Amber)"
head = /obj/item/clothing/head/helmet/ert/medical
shoes = /obj/item/clothing/shoes/white
suit = /obj/item/clothing/suit/armor/vest/ert/medical
suit_store = /obj/item/gun/energy/gun/mini
@@ -324,13 +325,10 @@
l_hand = /obj/item/defibrillator/loaded
backpack_contents = list(
/obj/item/clothing/head/helmet/ert/medical = 1,
/obj/item/clothing/mask/surgical = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/firstaid/doctor = 1,
/obj/item/storage/firstaid/ert_amber = 1,
/obj/item/storage/box/autoinjectors = 1,
/obj/item/roller/holo = 1,
/obj/item/storage/pill_bottle/ert = 1,
/obj/item/flashlight = 1,
/obj/item/handheld_defibrillator = 1,
/obj/item/soap/nanotrasen = 1
@@ -339,7 +337,7 @@
/datum/outfit/job/centcom/response_team/medic/red
name = "RT Medic (Red)"
rt_mob_job = "ERT Medical"
shoes = /obj/item/clothing/shoes/white
shoes = /obj/item/clothing/shoes/magboots
suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
suit_store = /obj/item/gun/energy/gun
@@ -354,15 +352,11 @@
backpack_contents = list(
/obj/item/clothing/mask/surgical = 1,
/obj/item/storage/firstaid/toxin = 1,
/obj/item/storage/firstaid/doctor = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/firstaid/ert = 1,
/obj/item/storage/box/autoinjectors = 1,
/obj/item/roller/holo = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/bodyanalyzer = 1,
/obj/item/handheld_defibrillator = 1,
/obj/item/storage/pill_bottle/painkillers = 1,
/obj/item/soap/nanotrasen = 1
)
@@ -390,13 +384,10 @@
backpack_contents = list(
/obj/item/bodyanalyzer/advanced = 1,
/obj/item/storage/firstaid/toxin = 1,
/obj/item/storage/firstaid/doctor = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/firstaid/ert = 1,
/obj/item/extinguisher/mini = 1,
/obj/item/roller/holo = 1,
/obj/item/handheld_defibrillator = 1,
/obj/item/storage/pill_bottle/painkillers = 1
)
cybernetic_implants = list(