Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to EZ Autoinjectors #4167

Merged
merged 12 commits into from
Sep 9, 2023
Merged

Changes to EZ Autoinjectors #4167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c4caddf
Automatic changelog for PR #3470 [ci skip]
BeagleGaming1 Jun 20, 2023
19060a1
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 20, 2023
8d5e539
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 Jun 29, 2023
2f04a5f
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 8, 2023
16fd442
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 21, 2023
c438267
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 23, 2023
6818bf0
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 24, 2023
7d6ec07
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Jul 27, 2023
4ec92b2
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 Aug 3, 2023
68d49d6
Merge branch 'cmss13-devs:master' into master
BeagleGaming1 Aug 5, 2023
75eaa87
kill
BeagleGaming1 Aug 11, 2023
4de0c77
injectors
BeagleGaming1 Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
/obj/item/reagent_container/hypospray/autoinjector/oxycodone,
/obj/item/reagent_container/hypospray/autoinjector/tramadol,
/obj/item/reagent_container/hypospray/autoinjector/tricord,
/obj/item/reagent_container/hypospray/autoinjector/emergency,
/obj/item/reagent_container/hypospray/autoinjector/skillless,
/obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol,

Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR),
list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR),
list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR),
list("Autoinjector (Emergency)", 2, /obj/item/reagent_container/hypospray/autoinjector/emergency, null, VENDOR_ITEM_REGULAR),

list("PILL BOTTLES", 0, null, null, null),
list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED),
Expand Down
10 changes: 3 additions & 7 deletions code/game/objects/items/reagent_containers/autoinjectors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,10 @@

/obj/item/reagent_container/hypospray/autoinjector/emergency
name = "emergency autoinjector (CAUTION)"
desc = "An auto-injector loaded with a special cocktail of chemicals, to be used in life-threatening situations. Doesn't require any training to use."
icon_state = "emptyskill"
item_state = "emptyskill"
chemname = "emergency"
desc = "An auto-injector loaded with a special cocktail of chemicals, to be used in life-threatening situations."
amount_per_transfer_from_this = (REAGENTS_OVERDOSE-1)*2 + (MED_REAGENTS_OVERDOSE-1)
volume = (REAGENTS_OVERDOSE-1)*2 + (MED_REAGENTS_OVERDOSE-1)
mixed_chem = TRUE
Expand All @@ -201,12 +203,6 @@
injectVOL = 70//limited-supply emergency injector with v.large injection of drugs. Variable sfx freq sometimes rolls too quiet.
display_maptext = TRUE //see anaesthetic injector
maptext_label = "!!"

/obj/item/reagent_container/hypospray/autoinjector/emergency/skillless
name = "EZ emergency autoinjector (CAUTION)"
desc = "An auto-injector loaded with a special cocktail of chemicals, to be used in life-threatening situations. Doesn't require any training to use."
icon_state = "emptyskill"
item_state = "emptyskill"
skilllock = SKILL_MEDICAL_DEFAULT

/obj/item/reagent_container/hypospray/autoinjector/emergency/Initialize()
Expand Down
12 changes: 6 additions & 6 deletions code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,13 @@
desc = "Contains a painkiller autoinjector, first-aid autoinjector, some ointment, and some bandages."

/obj/item/storage/pouch/firstaid/full/fill_preset_inventory()
new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/bicaridine(src)
new /obj/item/reagent_container/hypospray/autoinjector/kelotane(src)
new /obj/item/reagent_container/hypospray/autoinjector/tramadol(src)
new /obj/item/reagent_container/hypospray/autoinjector/emergency(src)

/obj/item/storage/pouch/firstaid/full/alternate/fill_preset_inventory()
new /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/tricord(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/stack/medical/ointment(src)
new /obj/item/stack/medical/bruise_pack(src)
Expand All @@ -231,7 +231,7 @@
new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/emergency(src)
new /obj/item/stack/medical/bruise_pack(src)


Expand Down
12 changes: 6 additions & 6 deletions code/modules/gear_presets/cmb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET)
Expand Down Expand Up @@ -481,7 +481,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader, WEAR_JACKET)
Expand Down Expand Up @@ -523,7 +523,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl, WEAR_L_EAR)
Expand Down Expand Up @@ -571,7 +571,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET)
Expand All @@ -587,8 +587,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, WEAR_IN_BELT)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription, WEAR_EYES)
Expand Down
1 change: 0 additions & 1 deletion code/modules/vehicles/interior/interactable/vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
/obj/item/reagent_container/hypospray/autoinjector/oxycodone,
/obj/item/reagent_container/hypospray/autoinjector/tramadol,
/obj/item/reagent_container/hypospray/autoinjector/tricord,
/obj/item/reagent_container/hypospray/autoinjector/emergency,
/obj/item/reagent_container/hypospray/autoinjector/skillless,
/obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol,

Expand Down