From 09a9c7458fbac5b4eac2f7353fa95b6a429a56fd Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Mon, 14 Jan 2013 21:46:12 +1000 Subject: [PATCH] runtime fixes Signed-off-by: Cael_Aislinn --- code/game/jobs/job_controller.dm | 7 +----- code/modules/reagents/Chemistry-Reagents.dm | 22 +++++++++++++++++++ .../reagent_containers/food/drinks/bottle.dm | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 29fe36dc74a..39c9cbffbc7 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -340,7 +340,6 @@ var/global/datum/controller/occupations/job_master H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." if(job.req_admin_notify) H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." - spawnId(H,rank) if(H.mind.assigned_role == rank && H.mind.role_alt_title) spawnId(H, rank, H.mind.role_alt_title) @@ -375,12 +374,8 @@ var/global/datum/controller/occupations/job_master C.assignment = title C.name = "[C.registered_name]'s ID Card ([C.assignment])" H.equip_to_slot_or_del(C, slot_wear_id) - /* if(prob(50)) - H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_r_store) - else - H.equip_to_slot_or_del(new /obj/item/weapon/pen/blue(H), slot_r_store)*/ H.equip_to_slot_or_del(new /obj/item/device/pda(H), slot_belt) - if(locate(/obj/item/device/pda,H))//I bet this could just use locate. It can --SkyMarshal + if(locate(/obj/item/device/pda,H)) var/obj/item/device/pda/pda = locate(/obj/item/device/pda,H) pda.owner = H.real_name pda.ownjob = C.assignment diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index b070a95c265..ff401e94476 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2810,6 +2810,28 @@ datum ..() return + absinthe + name = "Absinthe" + id = "absinthe" + description = "An anise flavoured spirit famed for it's hallucinogenic properties." + reagent_state = LIQUID + color = "#7E4043" // rgb: 126, 64, 67 + + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + if(data >= 65 && data <125) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + else if(data >= 145 && prob(33)) + M.confused = max(M.confused+2,0) + + if(data >= 65) + if (!M.hallucination) M.hallucination = 1 + M.hallucination += 3 + ..() + return + tonic name = "Tonic Water" id = "tonic" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 27eae0dc38e..36016e92c14 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -238,7 +238,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe name = "Jailbreaker Verte" - desc = "Twenty-fourth century Green Fairy, one sip of this and you just know you're gonna have a good time." + desc = "One sip of this and you just know you're gonna have a good time." icon_state = "absinthebottle" New() ..()