cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Medical Priority Rewards : take 3 (#29367)

Browse Source 
* medical priority rewards

* perish

* Does the fixes Sonix didn't want to do

* further outfit fixes

* tweaks

* oops

Co-authored-by: SonixApache <SoniixApache@hotmail.com>
Co-authored-by: SonixApache <SonixApache@users.noreply.github.com>
This commit is contained in:
ShiftyRail
2021-05-06 10:17:35 +02:00
committed by GitHub
parent 0b3feae221
commit b6b55bb110
4 changed files with 77 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/datums/outfit/medical.dm
View File

@@ -64,7 +64,11 @@
H.put_in_hands(new /obj/item/weapon/storage/firstaid/regular(get_turf(H)))
/datum/outfit/cmo/pre_equip_priority(var/mob/living/carbon/human/H, var/species)
var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/randomcan = pick(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo)
items_to_collect[randomcan] = SURVIVAL_BOX
items_to_collect[/obj/item/weapon/storage/belt/medical] = GRASP_LEFT_HAND
items_to_collect[/obj/item/clothing/suit/straight_jacket] = GRASP_RIGHT_HAND
items_to_collect[/obj/item/weapon/storage/pill_bottle/lollipops] = SURVIVAL_BOX
return ..()
// -- Doctor
@@ -181,7 +185,10 @@
H.put_in_hands(new /obj/item/weapon/storage/firstaid/regular(get_turf(H)))
/datum/outfit/doctor/pre_equip_priority(var/mob/living/carbon/human/H, var/species)
var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/randomcan = pick(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo)
items_to_collect[/obj/item/weapon/storage/belt/medical] = GRASP_LEFT_HAND
items_to_collect[/obj/item/weapon/storage/pill_bottle/lollipops] = SURVIVAL_BOX
items_to_collect[randomcan] = GRASP_RIGHT_HAND
return ..()
// -- Chemist
@@ -249,7 +256,12 @@
id_type = /obj/item/weapon/card/id/medical
/datum/outfit/chemist/pre_equip_priority(var/mob/living/carbon/human/H, var/species)
items_to_collect[/obj/item/weapon/storage/bag/chem] = GRASP_LEFT_HAND
var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/randomcan = pick(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo)
items_to_collect[/obj/item/weapon/storage/bag/chem] = SURVIVAL_BOX
items_to_collect[/obj/item/weapon/reagent_containers/food/drinks/soda_cans/mannsdrink] = SURVIVAL_BOX //apparently they like this stuff
items_to_collect[/obj/item/weapon/storage/box/chemistry_kit] = GRASP_RIGHT_HAND
items_to_collect[/obj/item/weapon/storage/pill_bottle/lollipops] = SURVIVAL_BOX
items_to_collect[randomcan] = GRASP_LEFT_HAND
return ..()
// -- Paramedic
@@ -328,6 +340,7 @@
/datum/outfit/paramedic/pre_equip_priority(var/mob/living/carbon/human/H, var/species)
items_to_collect[/obj/item/weapon/storage/belt/medical] = GRASP_LEFT_HAND
items_to_collect[/obj/item/tool/FixOVein/clot] = GRASP_RIGHT_HAND
return ..()
// -- Geneticist
@@ -387,7 +400,13 @@
id_type = /obj/item/weapon/card/id/medical
/datum/outfit/geneticist/pre_equip_priority(var/mob/living/carbon/human/H, var/species)
var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/randomcan = pick(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo)
var/obj/item/weapon/dnainjector/nofail/randominjector = pick(/obj/item/weapon/dnainjector/nofail/remotesay, /obj/item/weapon/dnainjector/nofail/runfast, /obj/item/weapon/dnainjector/nofail/strong)
items_to_collect[randomcan] = GRASP_RIGHT_HAND
items_to_collect[randominjector] = SURVIVAL_BOX
items_to_collect[/obj/item/weapon/storage/belt/medical] = GRASP_LEFT_HAND
items_to_collect[/obj/item/weapon/dnainjector/nofail/remotesay] = SURVIVAL_BOX
items_to_collect[/obj/item/weapon/storage/pill_bottle/lollipops] = SURVIVAL_BOX
return ..()
// -- Virologist
@@ -452,5 +471,7 @@
H.put_in_hands(new /obj/item/weapon/book/manual/virology_guide(H))
/datum/outfit/virologist/pre_equip_priority(var/mob/living/carbon/human/H, var/species)
items_to_collect[/obj/item/weapon/virusdish/random] = GRASP_LEFT_HAND
var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/randomcan = pick(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo)
items_to_collect[randomcan] = GRASP_RIGHT_HAND
items_to_collect[/obj/item/weapon/virusdish/random] = SURVIVAL_BOX
return ..()

12
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -1478,3 +1478,15 @@
..()
for(var/i = 1 to 6)
new /obj/item/weapon/reagent_containers/food/snacks/risenshiny(src)
/obj/item/weapon/storage/box/chemistry_kit
name = "basic chemistry set"
desc = "A box containing the basics for chemistry."
/obj/item/weapon/storage/box/chemistry_kit/New()
new /obj/item/weapon/reagent_containers/glass/beaker/erlenmeyer(src)
new /obj/item/weapon/reagent_containers/glass/beaker/erlenmeyer(src)
new /obj/item/weapon/electrolyzer(src)
new /obj/item/weapon/cell/high(src)
new /obj/item/weapon/reagent_containers/glass/beaker/large/plasma(src)
..()

43
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -973,7 +973,48 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cannedcopcoffee/New()
..()
reagents.add_reagent(SECCOFFEE, 50)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white
name = "Picomed: White edition"
desc = "Good for the body and good for the bones."
icon_state = "lifeline_white"
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_white/New()
..()
reagents.add_reagent(MEDCOFFEE, 48)
reagents.add_reagent(MILK, 2)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red
name = "Picomed: Red edition"
desc = "I need 50ccs of coffee, stat!"
icon_state = "lifeline_red"
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_red/New()
..()
reagents.add_reagent(MEDCOFFEE, 48)
reagents.add_reagent(REDTEA, 2)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo
name = "Picomed: Cryo edition"
desc = "Remember to strip before consuming."
icon_state = "lifeline_cryo"
var/list/tubeoverlay = list()
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo/on_reagent_change()
..()
for(var/image/ol in tubeoverlay)
overlays -= ol
tubeoverlay -= ol
var/remaining = Ceiling(reagents.total_volume/reagents.maximum_volume*100,20)
var/image/status_overlay = image("icon" = 'icons/obj/drinks.dmi', "icon_state" = "cryoverlay_[remaining]")
overlays += status_overlay
tubeoverlay += status_overlay
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lifeline_cryo/New()
..()
reagents.add_reagent(MEDCOFFEE, 48)
reagents.add_reagent(LEPORAZINE, 1)
reagents.add_reagent(FROSTOIL, 1)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/bear
name = "Bear Arms Beer"

BIN
icons/obj/drinks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 110 KiB