Skip to content

Commit

Permalink
more error fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
nauticall committed Oct 16, 2024
1 parent 029d016 commit 6da44fc
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 24 deletions.
61 changes: 37 additions & 24 deletions code/modules/cargo/items/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
category = "medical"
name = "first-aid kit"
supplier = "nanotrasen"
description = "It's an emergency medical kit for those serious boo-boos."
price = 150
description = "A basic medical kit for those boo-boos."
price = 250
items = list(
/obj/item/storage/firstaid/regular
)
Expand All @@ -34,7 +34,7 @@
category = "medical"
name = "advanced first-aid kit"
supplier = "nanotrasen"
description = "Contains advanced medical treatments."
description = "An emergency medical kit for general severe injuries."
price = 500
items = list(
/obj/item/storage/firstaid/adv
Expand All @@ -44,11 +44,25 @@
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/advancedfirstaidkit
category = "medical"
name = "advanced first-aid kit"
supplier = "nanotrasen"
description = "A large emergency medical kit for many general severe injuries."
price = 900
items = list(
/obj/item/storage/firstaid/large/adv
)
access = ACCESS_MEDICAL
container_type = "crate"
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/firefirstaidkit
category = "medical"
name = "fire first-aid kit"
supplier = "nanotrasen"
description = "It's an emergency medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
description = "An emergency medical kit for serious burns, either chemical or temperature."
price = 450
items = list(
/obj/item/storage/firstaid/fire
Expand All @@ -62,7 +76,7 @@
category = "medical"
name = "oxygen deprivation first aid"
supplier = "nanotrasen"
description = "A box full of oxygen goodies."
description = "An emergency medical kit for oxygen deprivation, including cardiac arrest."
price = 450
items = list(
/obj/item/storage/firstaid/o2
Expand All @@ -76,8 +90,8 @@
category = "medical"
name = "toxin first aid"
supplier = "nanotrasen"
description = "Used to treat when you have a high amount of toxins in your body."
price = 250
description = "An emergency medical kit for toxin exposure."
price = 450
items = list(
/obj/item/storage/firstaid/toxin
)
Expand All @@ -86,6 +100,20 @@
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/radfirstaid
category = "medical"
name = "radiation first aid"
supplier = "nanotrasen"
description = "An emergency medical kit for severe radiation exposure."
price = 450
items = list(
/obj/item/storage/firstaid/radiation
)
access = ACCESS_MEDICAL
container_type = "crate"
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/bloodpack_ominus
category = "medical"
name = "O- blood pack (x1)"
Expand Down Expand Up @@ -601,7 +629,7 @@
items = list(
/obj/item/surgery/bone_gel
)
access = ACCESS_MEDICAL
access = ACCESS_SURGERY
container_type = "crate"
groupable = TRUE
spawn_amount = 1
Expand All @@ -615,7 +643,7 @@
items = list(
/obj/item/surgery/bonesetter
)
access = ACCESS_MEDICAL
access = ACCESS_SURGERY
container_type = "crate"
groupable = TRUE
spawn_amount = 1
Expand All @@ -634,20 +662,6 @@
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/therapydoll
category = "medical"
name = "therapy doll"
supplier = "virgo"
description = "A toy for therapeutic and recreational purposes."
price = 200
items = list(
/obj/item/toy/plushie/therapy
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/unathilatexgloves
category = "medical"
name = "unathi latex gloves"
Expand All @@ -661,4 +675,3 @@
container_type = "crate"
groupable = TRUE
spawn_amount = 1

14 changes: 14 additions & 0 deletions code/modules/cargo/items/recreation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,20 @@
groupable = TRUE
spawn_amount = 4

/singleton/cargo_item/therapydoll
category = "recreation"
name = "therapy doll"
supplier = "virgo"
description = "A toy for therapeutic and recreational purposes."
price = 120
items = list(
/obj/item/toy/plushie/therapy
)
access = 0
container_type = "crate"
groupable = TRUE
spawn_amount = 1

/singleton/cargo_item/snappop
category = "recreation"
name = "snap pop (x5)"
Expand Down

0 comments on commit 6da44fc

Please sign in to comment.