From f9c6acf7643b272216275e4dfa2e75fc7752b4d5 Mon Sep 17 00:00:00 2001 From: DHA Date: Sat, 9 Mar 2019 08:27:38 -0800 Subject: [PATCH 1/2] Added Tricord --- code/game/machinery/Sleeper.dm | 2 +- vorestation.dme | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 002999d623..22370283c4 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -155,7 +155,7 @@ anchored = 1 circuit = /obj/item/weapon/circuitboard/sleeper var/mob/living/carbon/human/occupant = null - var/list/available_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin") + var/list/available_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin", "tricordrazine" = "Tricordrazine") var/obj/item/weapon/reagent_containers/glass/beaker = null var/filtering = 0 var/obj/machinery/sleep_console/console diff --git a/vorestation.dme b/vorestation.dme index b11a9b8855..e8af4b73df 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2156,13 +2156,13 @@ #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm" #include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\drone.dm" -#include "code\modules\mob\living\silicon\robot\drone\drone_unify.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_console.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_damage.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm" +#include "code\modules\mob\living\silicon\robot\drone\drone_unify.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm" @@ -2173,7 +2173,6 @@ #include "code\modules\mob\living\simple_animal\corpse.dm" #include "code\modules\mob\living\simple_animal\simple_animal.dm" #include "code\modules\mob\living\simple_animal\simple_animal_vr.dm" -#include "code\modules\mob\living\simple_animal\mobject\mobjects.dm" #include "code\modules\mob\living\simple_animal\simple_hud.dm" #include "code\modules\mob\living\simple_animal\aliens\alien.dm" #include "code\modules\mob\living\simple_animal\aliens\creature.dm" @@ -2213,10 +2212,10 @@ #include "code\modules\mob\living\simple_animal\animals\snake_vr.dm" #include "code\modules\mob\living\simple_animal\animals\spiderbot.dm" #include "code\modules\mob\living\simple_animal\animals\synx.dm" +#include "code\modules\mob\living\simple_animal\animals\tarrasque.dm" #include "code\modules\mob\living\simple_animal\animals\tomato.dm" #include "code\modules\mob\living\simple_animal\animals\tree.dm" #include "code\modules\mob\living\simple_animal\animals\worm.dm" -#include "code\modules\mob\living\simple_animal\animals\tarrasque.dm" #include "code\modules\mob\living\simple_animal\animals\sif_wildlife\diyaab.dm" #include "code\modules\mob\living\simple_animal\animals\sif_wildlife\savik.dm" #include "code\modules\mob\living\simple_animal\animals\sif_wildlife\shantak.dm" @@ -2233,6 +2232,7 @@ #include "code\modules\mob\living\simple_animal\humanoids\pirate.dm" #include "code\modules\mob\living\simple_animal\humanoids\russian.dm" #include "code\modules\mob\living\simple_animal\humanoids\syndicate.dm" +#include "code\modules\mob\living\simple_animal\mobject\mobjects.dm" #include "code\modules\mob\living\simple_animal\slime\ai.dm" #include "code\modules\mob\living\simple_animal\slime\combat.dm" #include "code\modules\mob\living\simple_animal\slime\death.dm" From 35a82fb09fe32f5b918b1be2e82af3629c96c64f Mon Sep 17 00:00:00 2001 From: DHA Date: Sat, 9 Mar 2019 10:03:11 -0800 Subject: [PATCH 2/2] First aid --- code/datums/outfits/jobs/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index 1fdd020fcf..9875e8be8f 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -23,7 +23,7 @@ name = OUTFIT_JOB_NAME("Medical Doctor") uniform = /obj/item/clothing/under/rank/medical suit = /obj/item/clothing/suit/storage/toggle/labcoat - l_hand = /obj/item/weapon/storage/firstaid/regular + l_hand = /obj/item/weapon/storage/firstaid/adv r_pocket = /obj/item/device/flashlight/pen id_type = /obj/item/weapon/card/id/medical/doctor