Skip to content

Commit

Permalink
kill
Browse files Browse the repository at this point in the history
  • Loading branch information
@BeagleGaming1
BeagleGaming1 committed Aug 11, 2023
1 parent 68d49d6 commit 75eaa87
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 18 deletions.
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/medical.dm
View file
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
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
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
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/pouch.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,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)

/obj/item/storage/pouch/firstaid/full/alternate/fill_preset_inventory()
new /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless(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
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
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

0 comments on commit 75eaa87

Please sign in to comment.