From 6da44fc6f4b296cd4ec59dde3a849c052bed4ff1 Mon Sep 17 00:00:00 2001 From: naut Date: Wed, 16 Oct 2024 21:38:24 +0800 Subject: [PATCH] more error fixing --- code/modules/cargo/items/medical.dm | 61 ++++++++++++++++---------- code/modules/cargo/items/recreation.dm | 14 ++++++ 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/code/modules/cargo/items/medical.dm b/code/modules/cargo/items/medical.dm index fcce9fef56f..22b89742914 100644 --- a/code/modules/cargo/items/medical.dm +++ b/code/modules/cargo/items/medical.dm @@ -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 ) @@ -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 @@ -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 -spontaneously- burns down." + description = "An emergency medical kit for serious burns, either chemical or temperature." price = 450 items = list( /obj/item/storage/firstaid/fire @@ -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 @@ -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 ) @@ -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)" @@ -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 @@ -615,7 +643,7 @@ items = list( /obj/item/surgery/bonesetter ) - access = ACCESS_MEDICAL + access = ACCESS_SURGERY container_type = "crate" groupable = TRUE spawn_amount = 1 @@ -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" @@ -661,4 +675,3 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 - diff --git a/code/modules/cargo/items/recreation.dm b/code/modules/cargo/items/recreation.dm index beefdc68160..f36a1d7eaad 100644 --- a/code/modules/cargo/items/recreation.dm +++ b/code/modules/cargo/items/recreation.dm @@ -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)"