Skip to content

Commit

Permalink
Merge pull request #5863 from AMcilraith/firstaid
Browse files Browse the repository at this point in the history
Soteria Branded First Aid Kit
  • Loading branch information
Trilbyspaceclone authored Nov 23, 2024
2 parents ceca0ee + bf56cff commit f48a4d8
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
6 changes: 4 additions & 2 deletions code/game/machinery/vendor/medical_vendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
/obj/item/stack/medical/ointment = 4,
/obj/item/stack/medical/ointment/soteria = 4,
/obj/item/stack/medical/splint = 10,
/obj/item/storage/firstaid/regular/si = 2,

/obj/item/reagent_containers/hypospray/autoinjector = 4,
/obj/item/reagent_containers/hypospray/autoinjector/antitoxin = 4,
Expand All @@ -72,12 +73,13 @@

/obj/item/stack/medical/bruise_pack/handmade = 25,
/obj/item/stack/medical/bruise_pack = 50,
/obj/item/stack/medical/bruise_pack/soteria = 700,
/obj/item/stack/medical/bruise_pack/soteria = 250,
/obj/item/stack/medical/ointment/handmade = 25,
/obj/item/stack/medical/ointment = 35,
/obj/item/stack/medical/ointment/soteria = 700,
/obj/item/stack/medical/ointment/soteria = 250,
/obj/item/stack/medical/splint/improvised = 5,
/obj/item/stack/medical/splint = 10,
/obj/item/storage/firstaid/regular/si = 750,

/obj/item/reagent_containers/hypospray/autoinjector/antitoxin = 50,
/obj/item/reagent_containers/hypospray/autoinjector/tricordrazine = 75,
Expand Down
19 changes: 19 additions & 0 deletions code/game/objects/items/weapons/storage/firstaid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,25 @@
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/device/scanner/health(src)

/obj/item/storage/firstaid/regular/si
name = "soteria branded first-aid kit"
desc = "A soteria-branded emergency medical kit for those serious boo-boos. Contains more advanced and more expensive gauze and salves."
icon_state = "purplefirstaid"
item_state = "firstaid-purplefirstaid"

/obj/item/storage/firstaid/regular/si/empty
empty = TRUE

/obj/item/storage/firstaid/regular/si/populate_contents()
if (empty) return
new /obj/item/stack/medical/bruise_pack/soteria(src)
new /obj/item/stack/medical/bruise_pack/soteria(src)
new /obj/item/stack/medical/ointment/soteria(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/device/scanner/health(src)


/obj/item/storage/firstaid/fire
name = "fire first-aid kit"
desc = "It's an emergency medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
Expand Down

0 comments on commit f48a4d8

Please sign in to comment.