diff --git a/baystation12.dme b/baystation12.dme index dd3963c19ca..a8614ff3811 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1163,6 +1163,16 @@ #include "code\modules\surgery\ribcage.dm" #include "code\modules\surgery\robolimbs.dm" #include "code\modules\surgery\surgery.dm" +#include "code\unused\computer2\airlock_control.dm" +#include "code\unused\computer2\arcade.dm" +#include "code\unused\computer2\base_program.dm" +#include "code\unused\computer2\buildandrepair.dm" +#include "code\unused\computer2\computerII.dm" +#include "code\unused\computer2\filebrowse.dm" +#include "code\unused\computer2\med_rec.dm" +#include "code\unused\computer2\messenger.dm" +#include "code\unused\computer2\peripherals.dm" +#include "code\unused\computer2\records.dm" #include "code\WorkInProgress\autopsy.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" @@ -1197,6 +1207,12 @@ #include "code\WorkInProgress\Cael_Aislinn\Supermatter\SuperMatter.dm" #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm" #include "code\WorkInProgress\Chinsky\ashtray.dm" +#include "code\WorkInProgress\Chinsky\ccomputer\applications.dm" +#include "code\WorkInProgress\Chinsky\ccomputer\ccomputer.dm" +#include "code\WorkInProgress\Chinsky\ccomputer\devices.dm" +#include "code\WorkInProgress\Chinsky\ccomputer\applications\records-med.dm" +#include "code\WorkInProgress\Chinsky\ccomputer\applications\records-sec.dm" +#include "code\WorkInProgress\Chinsky\ccomputer\applications\records.dm" #include "code\WorkInProgress\Ported\policetape.dm" #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm" #include "code\WorkInProgress\Susan\susan_desert_turfs.dm" @@ -1220,8 +1236,4 @@ #include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.1.0.0.1.dmm" -#include "maps\RandomZLevels\Academy.dm" -#include "maps\RandomZLevels\challenge.dm" -#include "maps\RandomZLevels\stationCollision.dm" -#include "maps\RandomZLevels\wildwest.dm" // END_INCLUDE diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index b988cf24470..da377f25131 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -9,7 +9,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" config_tag = "changeling" restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") - required_players = 15 + required_players = 2 + required_players_secret = 5 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index d8afb69ed0f..12a5525428e 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -3,7 +3,8 @@ config_tag = "traitorchan" traitors_possible = 3 //hard limit on traitors if scaling is turned off restricted_jobs = list("AI", "Cyborg") - required_players = 20 + required_players = 3 + required_players_secret = 10 required_enemies = 2 recommended_enemies = 3 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 98012439623..b20f4eb7abf 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -22,7 +22,8 @@ config_tag = "cult" restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") protected_jobs = list() - required_players = 15 + required_players = 5 + required_players_secret = 15 required_enemies = 3 recommended_enemies = 4 diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 03cc1104e28..0d4a20ff2fe 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -1,7 +1,8 @@ /datum/game_mode/epidemic name = "epidemic" config_tag = "epidemic" - required_players = 6 + required_players = 1 + required_players_secret = 15 var/const/waittime_l = 300 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 600 //upper bound on time before intercept arrives (in tenths of seconds) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index fccb79cdbf5..f0d1a2da472 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -52,7 +52,7 @@ possibleEvents["Appendicitis"] = medical_count * 50 if(security_count >= 1) possibleEvents["Prison Break"] = security_count * 50 - possibleEvents["Space Ninja"] = security_count * 10 // very low chance for space ninja event + //possibleEvents["Space Ninja"] = security_count * 10 // very low chance for space ninja event var/picked_event = pick(possibleEvents) var/chance = possibleEvents[picked_event] @@ -657,4 +657,4 @@ proc/number_active_with_role(role) if("Cyborg") if(M.mind.assigned_role == "Cyborg") count++ - return count \ No newline at end of file + return count diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 3329af0ee0e..ecac47c66df 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -24,6 +24,7 @@ var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist var/list/protected_jobs = list() // Jobs that can't be tratiors because var/required_players = 0 + var/required_players_secret = 0 //Minimum number of players for that game mode to be chose in Secret var/required_enemies = 0 var/recommended_enemies = 0 var/uplink_welcome = "Syndicate Uplink Console:" @@ -84,8 +85,13 @@ Implants; for(var/mob/new_player/player in player_list) if((player.client)&&(player.ready)) playerC++ - if(playerC >= required_players) - return 1 + + if(master_mode=="secret") + if(playerC >= required_players_secret) + return 1 + else + if(playerC >= required_players) + return 1 return 0 diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 3ae48074642..9905e1b821e 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -4,7 +4,8 @@ /datum/game_mode/malfunction name = "AI malfunction" config_tag = "malfunction" - required_players = 20 + required_players = 2 + required_players_secret = 15 required_enemies = 1 recommended_enemies = 1 diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index 30bb4e1d43f..0f9bb44babe 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -5,7 +5,8 @@ /datum/game_mode/meme name = "Memetic Anomaly" config_tag = "meme" - required_players = 6 + required_players = 3 + required_players_secret = 10 restricted_jobs = list("AI", "Cyborg") recommended_enemies = 2 // need at least a meme and a host votable = 0 // temporarily disable this mode for voting diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 71f41ca1279..efa216c2ee1 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -5,7 +5,8 @@ /datum/game_mode/nuclear name = "nuclear emergency" config_tag = "nuclear" - required_players = 20 // 20 players - 5 players to be the nuke ops = 15 players remaining + required_players = 6 + required_players_secret = 15 // 15 players - 5 players to be the nuke ops = 10 players remaining required_enemies = 5 recommended_enemies = 5 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index bba325296ec..e94baa3ede0 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -15,7 +15,8 @@ name = "revolution" config_tag = "revolution" restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") - required_players = 20 + required_players = 4 + required_players_secret = 15 required_enemies = 3 recommended_enemies = 3 diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 893d68749f7..296792808d1 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -3,7 +3,8 @@ /datum/game_mode/revolution/rp_revolution name = "rp-revolution" config_tag = "rp-revolution" - required_players = 12 + required_players = 4 + required_players_secret = 12 required_enemies = 3 recommended_enemies = 3 diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index deb4e05d24c..d086a7f6b0b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -5,7 +5,8 @@ /datum/game_mode/wizard name = "wizard" config_tag = "wizard" - required_players = 20 + required_players = 2 + required_players_secret = 10 required_enemies = 1 recommended_enemies = 1 diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index aec6290da79..2223f06fe33 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -712,6 +712,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].") weedlevel = 0 updateicon() + src.updateicon() else user << "\red This plot is completely devoid of weeds. It doesn't need uprooting." diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index ff401e94476..6c76764b8b4 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1,6 +1,8 @@ #define SOLID 1 #define LIQUID 2 #define GAS 3 +#define REAGENTS_OVERDOSE 30 +#define FOOD_METABOLISM 0.4 //The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent) //so that it can continue working when the reagent is deleted while the proc is still active. @@ -12,7 +14,7 @@ datum var/description = "" var/datum/reagents/holder = null var/reagent_state = SOLID - var/list/data = null + var/data = null var/volume = 0 var/nutriment_factor = 0 //var/list/viruses = list() @@ -73,24 +75,24 @@ datum on_update(var/atom/A) return - slimejelly - name = "Slime Jelly" - id = "slimejelly" + rorojelly + name = "Roro Jelly" + id = "rorojelly" description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." reagent_state = LIQUID color = "#801E28" // rgb: 128, 30, 40 on_mob_life(var/mob/living/M as mob) if(prob(10)) M << "\red Your insides are burning!" - M.adjustToxLoss(rand(20,60)) + M.adjustToxLoss(rand(20,60)*REAGENTS_EFFECT_MULTIPLIER) else if(prob(40)) - M.heal_organ_damage(5,0) + M.heal_organ_damage(5*REAGENTS_EFFECT_MULTIPLIER,0) ..() return blood - data = new/list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null) + data = new/list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"virus2"=null,"antibodies"=null ) name = "Blood" id = "blood" reagent_state = LIQUID @@ -99,17 +101,38 @@ datum reaction_mob(var/mob/M, var/method=TOUCH, var/volume) var/datum/reagent/blood/self = src src = null - if(self.data && self.data["viruses"]) - for(var/datum/disease/D in self.data["viruses"]) - //var/datum/disease/virus = new D.type(0, D, 1) - // We don't spread. - if(D.spread_type == SPECIAL || D.spread_type == NON_CONTAGIOUS) continue + for(var/datum/disease/D in self.data["viruses"]) + var/datum/disease/virus = new D.type + if(method == TOUCH) + M.contract_disease(virus) - if(method == TOUCH) - M.contract_disease(D) - else //injected - M.contract_disease(D, 1, 0) + else //injected + M.contract_disease(virus, 1, 0) + if(self.data["virus2"]) + if(method == TOUCH) + infect_virus2(M,self.data["virus2"]) + else + infect_virus2(M,self.data["virus2"],1) + + if(istype(M,/mob/living/carbon)) + // add the host's antibodies to their blood + self.data["antibodies"] |= M:antibodies + + // check if the blood has antibodies that cure our disease + if (M:virus2) if((self.data["antibodies"] & M:virus2.antigen) && prob(10)) + M:virus2.dead = 1 + + /* + if(self.data["virus"]) + var/datum/disease/V = self.data["virus"] + if(M.resistances.Find(V.type)) return + if(method == TOUCH)//respect all protective clothing... + M.contract_disease(V) + else //injected + M.contract_disease(V, 1, 0) + return + */ reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place @@ -125,7 +148,7 @@ datum blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"] for(var/datum/disease/D in self.data["viruses"]) - var/datum/disease/newVirus = D.Copy(1) + var/datum/disease/newVirus = new D.type blood_prop.viruses += newVirus newVirus.holder = blood_prop @@ -136,19 +159,32 @@ datum blood_prop = new(T) blood_prop.blood_DNA["Non-Human DNA"] = "A+" for(var/datum/disease/D in self.data["viruses"]) - var/datum/disease/newVirus = D.Copy(1) + var/datum/disease/newVirus = new D.type blood_prop.viruses += newVirus newVirus.holder = blood_prop + /* + if(T.density==0) + newVirus.spread_type = CONTACT_FEET + else + newVirus.spread_type = CONTACT_HANDS + */ + else if(istype(self.data["donor"], /mob/living/carbon/alien)) var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T if(!blood_prop) blood_prop = new(T) blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*" for(var/datum/disease/D in self.data["viruses"]) - var/datum/disease/newVirus = D.Copy(1) + var/datum/disease/newVirus = new D.type blood_prop.viruses += newVirus newVirus.holder = blood_prop + /* + if(T.density==0) + newVirus.spread_type = CONTACT_FEET + else + newVirus.spread_type = CONTACT_HANDS + */ return /* Must check the transfering of reagents and their data first. They all can point to one disease datum. @@ -171,13 +207,8 @@ datum src = null if(self.data&&method == INGEST) for(var/datum/disease/D in M.viruses) - if(istype(D, /datum/disease/advance)) - var/datum/disease/advance/A = D - if(A.GetDiseaseID() == self.data) - D.cure() - else - if(D.type == self.data) - D.cure() + if(D.type == self.data) + D.cure() M.resistances += self.data return @@ -210,13 +241,24 @@ datum T.overlays -= T.wet_overlay T.wet_overlay = null - for(var/mob/living/carbon/slime/M in T) + for(var/mob/living/carbon/metroid/M in T) M.adjustToxLoss(rand(15,20)) var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) - lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) + var/excess_temp = lowertemp.temperature - WATER_BOIL_TEMP + if(excess_temp > 0) + while(T.wet > 0) + T.wet -= 0 + excess_temp /= 2 + if(T.wet_overlay) + if(prob(10)) + T.visible_message("\icon[T.wet_overlay] You hear something [pick("hissing","sizzling")]!", "", "\icon[T.wet_overlay] You hear something [pick("hissing","sizzling")]!") + T.overlays -= T.wet_overlay + T.wet_overlay = null + lowertemp.temperature = WATER_BOIL_TEMP + excess_temp + //lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) del(hotspot) @@ -267,29 +309,29 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.drowsyness = max(M.drowsyness-2, 0) + M.drowsyness = max(M.drowsyness-2*REAGENTS_EFFECT_MULTIPLIER, 0) if(holder.has_reagent("toxin")) - holder.remove_reagent("toxin", 2) + holder.remove_reagent("toxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("stoxin")) - holder.remove_reagent("stoxin", 2) + holder.remove_reagent("stoxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("plasma")) - holder.remove_reagent("plasma", 1) + holder.remove_reagent("plasma", 10*REAGENTS_METABOLISM) if(holder.has_reagent("sacid")) - holder.remove_reagent("sacid", 1) + holder.remove_reagent("sacid", 10*REAGENTS_METABOLISM) if(holder.has_reagent("cyanide")) - holder.remove_reagent("cyanide", 1) + holder.remove_reagent("cyanide", 10*REAGENTS_METABOLISM) if(holder.has_reagent("amatoxin")) - holder.remove_reagent("amatoxin", 2) + holder.remove_reagent("amatoxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("chloralhydrate")) - holder.remove_reagent("chloralhydrate", 5) + holder.remove_reagent("chloralhydrate", 10*REAGENTS_METABOLISM) if(holder.has_reagent("carpotoxin")) - holder.remove_reagent("carpotoxin", 1) + holder.remove_reagent("carpotoxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("zombiepowder")) - holder.remove_reagent("zombiepowder", 0.5) + holder.remove_reagent("zombiepowder", 10*REAGENTS_METABOLISM) if(holder.has_reagent("mindbreaker")) - holder.remove_reagent("mindbreaker", 2) - M.hallucination = max(0, M.hallucination - 5) - M.adjustToxLoss(-2) + holder.remove_reagent("mindbreaker", 10*REAGENTS_METABOLISM) + M.hallucination = max(0, M.hallucination - 5*REAGENTS_EFFECT_MULTIPLIER) + M.adjustToxLoss(-2*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -302,7 +344,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(1.5) + M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -315,9 +357,11 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(3) - M.adjustOxyLoss(3) + M.adjustToxLoss(3*REAGENTS_EFFECT_MULTIPLIER) + M.adjustOxyLoss(3*REAGENTS_EFFECT_MULTIPLIER) M.sleeping += 1 + // Sleep toxins should always be consumed pretty fast + holder.remove_reagent(src.id, 0.1) ..() return @@ -335,59 +379,6 @@ datum ..() return - slimetoxin - name = "Mutation Toxin" - id = "mutationtoxin" - description = "A corruptive toxin produced by slimes." - reagent_state = LIQUID - color = "#13BC5E" // rgb: 19, 188, 94 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(ishuman(M)) - var/mob/living/carbon/human/human = M - if(human.dna.mutantrace == null) - M << "\red Your flesh rapidly mutates!" - human.dna.mutantrace = "slime" - human.update_mutantrace() - ..() - return - - aslimetoxin - name = "Advanced Mutation Toxin" - id = "amutationtoxin" - description = "An advanced corruptive toxin produced by slimes." - reagent_state = LIQUID - color = "#13BC5E" // rgb: 19, 188, 94 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(istype(M, /mob/living/carbon) && M.stat != DEAD) - M << "\red Your flesh rapidly mutates!" - if(M.monkeyizing) return - M.monkeyizing = 1 - M.canmove = 0 - M.icon = null - M.overlays.Cut() - M.invisibility = 101 - for(var/obj/item/W in M) - if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something - del(W) - continue - W.layer = initial(W.layer) - W.loc = M.loc - W.dropped(M) - var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc) - new_mob.a_intent = "hurt" - new_mob.universal_speak = 1 - if(M.mind) - M.mind.transfer_to(new_mob) - else - new_mob.key = M.key - del(M) - ..() - return - stoxin name = "Sleep Toxin" id = "stoxin" @@ -399,11 +390,11 @@ datum if(!M) M = holder.my_atom if(!data) data = 1 switch(data) - if(1 to 15) + if(10 to 20) M.eye_blurry = max(M.eye_blurry, 10) - if(15 to 25) + if(20 to 30) M.drowsyness = max(M.drowsyness, 20) - if(25 to INFINITY) + if(30 to INFINITY) M.Paralyse(20) M.drowsyness = max(M.drowsyness, 30) data++ @@ -440,6 +431,8 @@ datum M.stuttering = 0 M.confused = 0 M.jitteriness = 0 + // Sleep toxins should always be consumed pretty fast + holder.remove_reagent(src.id, 0.1) ..() return @@ -454,7 +447,7 @@ datum if(!M) M = holder.my_atom if(M.losebreath >= 10) M.losebreath = max(10, M.losebreath-5) - holder.remove_reagent(src.id, 0.2) + holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) return space_drugs @@ -471,7 +464,7 @@ datum if(M.canmove) if(prob(10)) step(M, pick(cardinal)) if(prob(7)) M.emote(pick("twitch","drool","moan","giggle")) - holder.remove_reagent(src.id, 0.2) + holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) return serotrotium @@ -484,7 +477,7 @@ datum on_mob_life(var/mob/living/M as mob) if(ishuman(M)) if(prob(7)) M.emote(pick("twitch","drool","moan","gasp")) - holder.remove_reagent(src.id, 0.1) + holder.remove_reagent(src.id, 0.25 * REAGENTS_METABOLISM) return /* silicate @@ -600,7 +593,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.take_organ_damage(1, 0) + M.take_organ_damage(1*REAGENTS_EFFECT_MULTIPLIER, 0) ..() return @@ -613,7 +606,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(1) + M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -654,7 +647,7 @@ datum color = "#808080" // rgb: 128, 128, 128 on_mob_life(var/mob/living/M as mob) - M.nutrition += 1 + M.nutrition += 1*REAGENTS_EFFECT_MULTIPLIER ..() return @@ -667,8 +660,8 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(1) - M.take_organ_damage(0, 1) + M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) + M.take_organ_damage(0, 1*REAGENTS_EFFECT_MULTIPLIER) ..() return reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) @@ -740,7 +733,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(1) + M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -761,7 +754,7 @@ datum return if(H.head) - if(prob(15) && !H.head.unacidable) + if(!H.head.unacidable) del(H.head) H.update_inv_head() H << "\red Your helmet melts away but protects you from the acid" @@ -833,6 +826,15 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.apply_effect(2,IRRADIATE,0) + + // radium may increase your chances to cure a disease + if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs + if(M:virus2 && prob(5)) + if(prob(50)) + M.radiation += 50 // curing it that way may kill you instead + M.adjustToxLoss(100) + M:antibodies |= M:virus2.antigen + ..() return @@ -880,7 +882,7 @@ datum if(volume >= 5) if(istype(T, /turf/simulated/wall)) T:thermite = 1 - T.overlays.Cut() + T.overlays = null T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite") return @@ -913,21 +915,36 @@ datum on_mob_life(var/mob/living/M as mob) if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this. if(!M) M = holder.my_atom - M.apply_effect(10,IRRADIATE,0) + M.apply_effect(10*REAGENTS_EFFECT_MULTIPLIER,IRRADIATE,0) ..() return + tramadol + name = "Tramadol" + id = "tramadol" + description = "A simple, yet effective painkiller." + reagent_state = LIQUID + color = "#C8A5DC" + + oxycodone + name = "Oxycodone" + id = "oxycodone" + description = "An effective and very addictive painkiller." + reagent_state = LIQUID + color = "#C805DC" + virus_food name = "Virus Food" id = "virusfood" description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce." reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 2 * FOOD_METABOLISM color = "#899613" // rgb: 137, 150, 19 on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.nutrition += nutriment_factor + M.nutrition += nutriment_factor*REAGENTS_EFFECT_MULTIPLIER + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -996,7 +1013,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.apply_effect(1,IRRADIATE,0) + M.apply_effect(1*REAGENTS_EFFECT_MULTIPLIER,IRRADIATE,0) ..() return @@ -1029,28 +1046,25 @@ datum color = "#660000" // rgb: 102, 0, 0 //Commenting this out as it's horribly broken. It's a neat effect though, so it might be worth making a new reagent (that is less common) with similar effects. -Pete -/* + reaction_obj(var/obj/O, var/volume) src = null var/turf/the_turf = get_turf(O) if(!the_turf) return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO - var/datum/gas_mixture/napalm = new - var/datum/gas/volatile_fuel/fuel = new - fuel.moles = 15 - napalm.trace_gases += fuel - the_turf.assume_air(napalm) + new/obj/effect/decal/cleanable/liquid_fuel(the_turf, volume) + reaction_turf(var/turf/T, var/volume) src = null - var/datum/gas_mixture/napalm = new - var/datum/gas/volatile_fuel/fuel = new - fuel.moles = 15 - napalm.trace_gases += fuel - T.assume_air(napalm) - return*/ + + if(!T) + return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO + new/obj/effect/decal/cleanable/liquid_fuel(T, volume) + return + on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(1) + M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1070,12 +1084,12 @@ datum O.clean_blood() reaction_turf(var/turf/T, var/volume) if(volume >= 1) - T.overlays.Cut() + T.overlays = null T.clean_blood() for(var/obj/effect/decal/cleanable/C in src) del(C) - for(var/mob/living/carbon/slime/M in T) + for(var/mob/living/carbon/metroid/M in T) M.adjustToxLoss(rand(5,10)) reaction_mob(var/mob/M, var/method=TOUCH, var/volume) @@ -1138,7 +1152,8 @@ datum if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.dna) - if(H.dna.mutantrace == "plant") //plantmen take a LOT of damage +// if(H.dna.mutantrace == "plant") //plantmen take a LOT of damage + if(PLANT in H.mutations) //plantmen take a LOT of damage H.adjustToxLoss(10) plasma @@ -1151,28 +1166,28 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(holder.has_reagent("inaprovaline")) - holder.remove_reagent("inaprovaline", 2) - M.adjustToxLoss(1) + holder.remove_reagent("inaprovaline", 10*REAGENTS_METABOLISM) + M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) ..() return reaction_obj(var/obj/O, var/volume) src = null - /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime)) - var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/roro_egg)) + var/obj/item/weapon/reagent_containers/food/snacks/roro_egg/egg = O if (egg.grown) - egg.Hatch()*/ + egg.Hatch() if((!O) || (!volume)) return 0 var/turf/the_turf = get_turf(O) var/datum/gas_mixture/napalm = new var/datum/gas/volatile_fuel/fuel = new - fuel.moles = 5 + fuel.moles = volume napalm.trace_gases += fuel the_turf.assume_air(napalm) reaction_turf(var/turf/T, var/volume) src = null var/datum/gas_mixture/napalm = new var/datum/gas/volatile_fuel/fuel = new - fuel.moles = 5 + fuel.moles = volume napalm.trace_gases += fuel T.assume_air(napalm) return @@ -1205,7 +1220,7 @@ datum M.make_dizzy(1) if(!M.confused) M.confused = 1 M.confused = max(M.confused, 20) - holder.remove_reagent(src.id, 0.2) + holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) ..() return @@ -1221,7 +1236,7 @@ datum return if(!M) M = holder.my_atom if(prob(33)) - M.take_organ_damage(1, 0) + M.take_organ_damage(1*REAGENTS_EFFECT_MULTIPLIER, 0) M.adjustOxyLoss(3) if(prob(20)) M.emote("gasp") ..() @@ -1238,7 +1253,7 @@ datum if(M.stat == 2.0) return if(!M) M = holder.my_atom - M.heal_organ_damage(0,2) + M.heal_organ_damage(0,2*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1253,7 +1268,7 @@ datum if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN return if(!M) M = holder.my_atom - M.heal_organ_damage(0,3) + M.heal_organ_damage(0,3*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1268,9 +1283,9 @@ datum if(M.stat == 2.0) return //See above, down and around. --Agouri if(!M) M = holder.my_atom - M.adjustOxyLoss(-2) + M.adjustOxyLoss(-2*REAGENTS_EFFECT_MULTIPLIER) if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2) + holder.remove_reagent("lexorin", 10*REAGENTS_METABOLISM) ..() return @@ -1287,7 +1302,7 @@ datum if(!M) M = holder.my_atom M.adjustOxyLoss(-M.getOxyLoss()) if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2) + holder.remove_reagent("lexorin", 10*REAGENTS_METABOLISM) ..() return @@ -1302,10 +1317,10 @@ datum if(M.stat == 2.0) return if(!M) M = holder.my_atom - if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-1) - if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(1,0) - if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,1) - if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-1) + if(M.getOxyLoss() && prob(40)) M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER) + if(M.getBruteLoss() && prob(40)) M.heal_organ_damage(1*REAGENTS_EFFECT_MULTIPLIER,0) + if(M.getFireLoss() && prob(40)) M.heal_organ_damage(0,1*REAGENTS_EFFECT_MULTIPLIER) + if(M.getToxLoss() && prob(40)) M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1387,8 +1402,8 @@ datum M.AdjustStunned(-1) M.AdjustWeakened(-1) if(holder.has_reagent("mindbreaker")) - holder.remove_reagent("mindbreaker", 5) - M.hallucination = max(0, M.hallucination - 10) + holder.remove_reagent("mindbreaker", 10*REAGENTS_METABOLISM) + M.hallucination = max(0, M.hallucination - 10*REAGENTS_EFFECT_MULTIPLIER) if(prob(60)) M.adjustToxLoss(1) ..() return @@ -1404,7 +1419,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.jitteriness = max(M.jitteriness-5,0) - if(prob(80)) M.adjustBrainLoss(1) + if(prob(80)) M.adjustBrainLoss(1*REAGENTS_EFFECT_MULTIPLIER) if(prob(50)) M.drowsyness = max(M.drowsyness, 3) if(prob(10)) M.emote("drool") ..() @@ -1419,7 +1434,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.radiation = max(M.radiation-3,0) + M.radiation = max(M.radiation-3*REAGENTS_EFFECT_MULTIPLIER,0) ..() return @@ -1434,10 +1449,10 @@ datum if(M.stat == 2.0) return //See above, down and around. --Agouri if(!M) M = holder.my_atom - M.radiation = max(M.radiation-7,0) - M.adjustToxLoss(-1) + M.radiation = max(M.radiation-7*REAGENTS_EFFECT_MULTIPLIER,0) + M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER) if(prob(15)) - M.take_organ_damage(1, 0) + M.take_organ_damage(1*REAGENTS_EFFECT_MULTIPLIER, 0) ..() return @@ -1450,7 +1465,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustBrainLoss(-3) + M.adjustBrainLoss(-3*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1482,7 +1497,7 @@ datum if(M.stat == 2.0) return if(!M) M = holder.my_atom - M.heal_organ_damage(2,0) + M.heal_organ_damage(2*REAGENTS_EFFECT_MULTIPLIER,0) ..() return @@ -1496,7 +1511,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(prob(5)) M.emote(pick("twitch","blink_r","shiver")) - holder.remove_reagent(src.id, 0.2) + holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) ..() return @@ -1512,8 +1527,9 @@ datum if(M.bodytemperature < 170) M.adjustCloneLoss(-1) M.adjustOxyLoss(-3) - M.heal_organ_damage(3,3) - M.adjustToxLoss(-3) + if(prob(50)) + M.heal_organ_damage(1,1) + M.adjustToxLoss(-1) ..() return @@ -1529,8 +1545,8 @@ datum if(M.bodytemperature < 170) M.adjustCloneLoss(-3) M.adjustOxyLoss(-3) - M.heal_organ_damage(3,3) - M.adjustToxLoss(-3) + M.heal_organ_damage(1,1) + M.adjustToxLoss(-1) ..() return @@ -1542,7 +1558,6 @@ datum color = "#C8A5DC" // rgb: 200, 165, 220 on_mob_life(var/mob/living/M as mob)//no more mr. panacea - holder.remove_reagent(src.id, 0.2) ..() return @@ -1555,7 +1570,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(2) + M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1568,8 +1583,8 @@ datum on_mob_life(var/mob/living/carbon/M as mob) if(!M) M = holder.my_atom M.status_flags |= FAKEDEATH - M.adjustOxyLoss(0.5) - M.adjustToxLoss(0.5) + M.adjustOxyLoss(0.5*REAGENTS_EFFECT_MULTIPLIER) + M.adjustToxLoss(0.5*REAGENTS_EFFECT_MULTIPLIER) M.Weaken(10) M.silent = max(M.silent, 10) M.tod = worldtime2text() @@ -1648,40 +1663,6 @@ datum reagent_state = LIQUID color = "#181818" // rgb: 24, 24, 24 - ethanol - name = "Ethanol" - id = "ethanol" - description = "A well-known alcohol with a variety of applications." - reagent_state = LIQUID - color = "#404030" // rgb: 64, 64, 48 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.make_dizzy(5) - M.jitteriness = max(M.jitteriness-5,0) - if(data >= 25) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - if(data >= 40 && prob(33)) - if (!M.confused) M.confused = 1 - M.confused += 3 - ..() - return - reaction_obj(var/obj/O, var/volume) - if(istype(O,/obj/item/weapon/paper)) - var/obj/item/weapon/paper/paperaffected = O - paperaffected.clearpaper() - usr << "The solution melts away the ink on the paper." - if(istype(O,/obj/item/weapon/book)) - if(volume >= 5) - var/obj/item/weapon/book/affectedbook = O - affectedbook.dat = null - usr << "The solution melts away the ink on the book." - else - usr << "It wasn't enough..." - return - ammonia name = "Ammonia" id = "ammonia" @@ -1713,7 +1694,7 @@ datum if(!M) M = holder.my_atom M.dizziness = 0 M.drowsyness = 0 - M.stuttering = 0 + M.slurring = 0 M.confused = 0 ..() return @@ -1730,14 +1711,17 @@ datum if(!data) data = 1 data++ switch(data) - if(1) + if(15 to 25) M.confused += 2 M.drowsyness += 2 - if(2 to 50) + if(25 to 60) M.sleeping += 1 - if(51 to INFINITY) + if(61 to INFINITY) M.sleeping += 1 - M.adjustToxLoss(data - 50) + M.adjustToxLoss((data - 50) * REAGENTS_EFFECT_MULTIPLIER) + + // Sleep toxins should always be consumed pretty fast + holder.remove_reagent(src.id, 0.1) ..() return @@ -1761,6 +1745,8 @@ datum M.sleeping += 1 M.adjustToxLoss(data - 50) data++ + // Sleep toxins should always be consumed pretty fast + holder.remove_reagent(src.id, 0.1) ..() return @@ -1773,26 +1759,168 @@ datum id = "nutriment" description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." reagent_state = SOLID - nutriment_factor = 15 * REAGENTS_METABOLISM + nutriment_factor = 15 * FOOD_METABOLISM color = "#664330" // rgb: 102, 67, 48 on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(prob(50)) M.heal_organ_damage(1,0) M.nutrition += nutriment_factor // For hunger and fatness -/* - // If overeaten - vomit and fall down - // Makes you feel bad but removes reagents and some effect - // from your body - if (M.nutrition > 650) - M.nutrition = rand (250, 400) - M.weakened += rand(2, 10) - M.jitteriness += rand(0, 5) - M.dizziness = max (0, (M.dizziness - rand(0, 15))) - M.druggy = max (0, (M.druggy - rand(0, 15))) - M.adjustToxLoss(rand(-15, -5))) - M.updatehealth() -*/ + holder.remove_reagent(src.id, FOOD_METABOLISM) + ..() + return + + coco + name = "Coco Powder" + id = "coco" + description = "A fatty, bitter paste made from coco beans." + nutriment_factor = 5 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + sprinkles + name = "Sprinkles" + id = "sprinkles" + description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + syndicream + name = "Cream filling" + id = "syndicream" + description = "Delicious cream filling of a mysterious origin. Tastes criminally good." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#AB7878" // rgb: 171, 120, 120 + + cornoil + name = "Corn Oil" + id = "cornoil" + description = "An oil derived from various types of corn." + reagent_state = LIQUID + nutriment_factor = 20 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + reaction_turf(var/turf/simulated/T, var/volume) + if (!istype(T)) return + src = null + if(volume >= 3) + if(T.wet >= 1) return + T.wet = 1 + if(T.wet_overlay) + T.overlays -= T.wet_overlay + T.wet_overlay = null + T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor") + T.overlays += T.wet_overlay + + spawn(800) + if (!istype(T)) return + if(T.wet >= 2) return + T.wet = 0 + if(T.wet_overlay) + T.overlays -= T.wet_overlay + T.wet_overlay = null + var/hotspot = (locate(/obj/fire) in T) + if(hotspot) + var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) + lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) + lowertemp.react() + T.assume_air(lowertemp) + del(hotspot) + + dry_ramen + name = "Dry Ramen" + id = "dry_ramen" + description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + hot_ramen + name = "Hot Ramen" + id = "hot_ramen" + description = "The noodles are boiled, the flavors are artificial, just like being back in school." + reagent_state = LIQUID + nutriment_factor = 5 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + + hell_ramen + name = "Hell Ramen" + id = "hell_ramen" + description = "The noodles are boiled, the flavors are artificial, just like being back in school." + reagent_state = LIQUID + nutriment_factor = 5 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + on_mob_life(var/mob/living/M as mob) + M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT + ..() + return + + flour + name = "flour" + id = "flour" + description = "This is what you rub all over yourself to pretend to be a ghost." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#FFFFFF" // rgb: 0, 0, 0 + + reaction_turf(var/turf/T, var/volume) + src = null + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/flour(T) + + cherryjelly + name = "Cherry Jelly" + id = "cherryjelly" + description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." + reagent_state = LIQUID + nutriment_factor = 1 * FOOD_METABOLISM + color = "#801E28" // rgb: 128, 30, 40 + +//Drugs + amatoxin + name = "Amatoxin" + id = "amatoxin" + description = "A powerful poison derived from certain species of mushroom." + color = "#792300" // rgb: 121, 35, 0 + + on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + M.adjustToxLoss(1) + ..() + return + + psilocybin + name = "Psilocybin" + id = "psilocybin" + description = "A strong psycotropic derived from certain species of mushroom." + color = "#E700E7" // rgb: 231, 0, 231 + + on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + M.druggy = max(M.druggy, 30) + if(!data) data = 1 + switch(data) + if(1 to 5) + if (!M.stuttering) M.stuttering = 1 + M.make_dizzy(5) + if(prob(10)) M.emote(pick("twitch","giggle")) + if(5 to 10) + if (!M.stuttering) M.stuttering = 1 + M.make_jittery(10) + M.make_dizzy(10) + M.druggy = max(M.druggy, 35) + if(prob(20)) M.emote(pick("twitch","giggle")) + if (10 to INFINITY) + if (!M.stuttering) M.stuttering = 1 + M.make_jittery(20) + M.make_dizzy(20) + M.druggy = max(M.druggy, 40) + if(prob(30)) M.emote(pick("twitch","giggle")) + holder.remove_reagent(src.id, 0.2) + data++ ..() return @@ -1801,7 +1929,7 @@ datum id = "lipozine" description = "A chemical compound that causes a powerful fat-burning reaction." reagent_state = LIQUID - nutriment_factor = 10 * REAGENTS_METABOLISM + nutriment_factor = 10 * FOOD_METABOLISM color = "#BBEDA4" // rgb: 187, 237, 164 on_mob_life(var/mob/living/M as mob) @@ -1812,13 +1940,13 @@ datum M.nutrition = 0 ..() return - +//Additives soysauce name = "Soysauce" id = "soysauce" description = "A salty sauce made from the soy plant." reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 2 * FOOD_METABOLISM color = "#792300" // rgb: 121, 35, 0 ketchup @@ -1826,10 +1954,31 @@ datum id = "ketchup" description = "Ketchup, catsup, whatever. It's tomato paste." reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM + nutriment_factor = 5 * FOOD_METABOLISM color = "#731008" // rgb: 115, 16, 8 + sodiumchloride + name = "Table Salt" + id = "sodiumchloride" + description = "A salt made of sodium chloride. Commonly used to season food." + reagent_state = SOLID + color = "#282828" // rgb: 40, 40, 40 + blackpepper + name = "Black Pepper" + id = "blackpepper" + description = "A powder ground from peppercorns. *AAAACHOOO*" + reagent_state = SOLID + // no color (ie, black) + + enzyme + name = "Universal Enzyme" + id = "enzyme" + description = "A universal enzyme used in the preperation of certain chemicals and foods." + reagent_state = LIQUID + color = "#365E30" // rgb: 54, 94, 48 + +//Peppers capsaicin name = "Capsaicin Oil" id = "capsaicin" @@ -1844,16 +1993,16 @@ datum if(1 to 15) M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT if(holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) - if(istype(M, /mob/living/carbon/slime)) + holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM) + if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(5,20) if(15 to 25) M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) + if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(10,20) if(25 to INFINITY) M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) + if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(15,20) data++ ..() @@ -1930,32 +2079,27 @@ datum if(1 to 15) M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 5) - if(istype(M, /mob/living/carbon/slime)) + holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM) + if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(5,20) if(15 to 25) M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) + if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(10,20) if(25 to INFINITY) M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT if(prob(1)) M.emote("shiver") - if(istype(M, /mob/living/carbon/slime)) + if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(15,20) data++ ..() return reaction_turf(var/turf/simulated/T, var/volume) - for(var/mob/living/carbon/slime/M in T) + for(var/mob/living/carbon/metroid/M in T) M.adjustToxLoss(rand(15,30)) - sodiumchloride - name = "Table Salt" - id = "sodiumchloride" - description = "A salt made of sodium chloride. Commonly used to season food." - reagent_state = SOLID - color = "#282828" // rgb: 40, 40, 40 + blackpepper name = "Black Pepper" @@ -1969,11 +2113,12 @@ datum id = "coco" description = "A fatty, bitter paste made from coco beans." reagent_state = SOLID - nutriment_factor = 5 * REAGENTS_METABOLISM + nutriment_factor = 5 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -1982,13 +2127,14 @@ datum id = "hot_coco" description = "Made with love! And coco beans." reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 2 * FOOD_METABOLISM color = "#403010" // rgb: 64, 48, 16 on_mob_life(var/mob/living/M as mob) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -2014,6 +2160,7 @@ datum if(!M) M = holder.my_atom M.druggy = max(M.druggy, 30) if(!data) data = 1 + switch(data) if(1 to 5) if (!M.stuttering) M.stuttering = 1 @@ -2040,15 +2187,17 @@ datum name = "Sprinkles" id = "sprinkles" description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden")) if(!M) M = holder.my_atom M.heal_organ_damage(1,1) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return ..() @@ -2057,16 +2206,18 @@ datum name = "Cream filling" id = "syndicream" description = "Delicious cream filling of a mysterious origin. Tastes criminally good." - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#AB7878" // rgb: 171, 120, 120 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) if(istype(M, /mob/living/carbon/human) && M.mind) if(M.mind.special_role) if(!M) M = holder.my_atom M.heal_organ_damage(1,1) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return ..() @@ -2076,11 +2227,12 @@ datum id = "cornoil" description = "An oil derived from various types of corn." reagent_state = LIQUID - nutriment_factor = 20 * REAGENTS_METABOLISM + nutriment_factor = 20 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return reaction_turf(var/turf/simulated/T, var/volume) @@ -2122,11 +2274,12 @@ datum id = "dry_ramen" description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." reagent_state = SOLID - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -2135,11 +2288,12 @@ datum id = "hot_ramen" description = "The noodles are boiled, the flavors are artificial, just like being back in school." reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM + nutriment_factor = 5 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() @@ -2150,11 +2304,12 @@ datum id = "hell_ramen" description = "The noodles are boiled, the flavors are artificial, just like being back in school." reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM + nutriment_factor = 5 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -2164,11 +2319,12 @@ datum id = "flour" description = "This is what you rub all over yourself to pretend to be a ghost." reagent_state = SOLID - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#FFFFFF" // rgb: 0, 0, 0 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -2182,11 +2338,12 @@ datum id = "cherryjelly" description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#801E28" // rgb: 128, 30, 40 on_mob_life(var/mob/living/M as mob) M.nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -2194,1806 +2351,336 @@ datum /////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum//////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////// - orangejuice - name = "Orange juice" - id = "orangejuice" - description = "Both delicious AND rich in Vitamin C, what more do you need?" + drink + name = "Drink" + id = "drink" + description = "Uh, some kind of drink." reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#E78108" // rgb: 231, 129, 8 - - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!M) M = holder.my_atom - if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1) - M.nutrition++ - ..() - return - - tomatojuice - name = "Tomato Juice" - id = "tomatojuice" - description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#731008" // rgb: 115, 16, 8 - - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!M) M = holder.my_atom - if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1) - M.nutrition++ - ..() - return - - limejuice - name = "Lime Juice" - id = "limejuice" - description = "The sweet-sour juice of limes." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#365E30" // rgb: 54, 94, 48 - - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!M) M = holder.my_atom - if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1) - M.nutrition++ - ..() - return - - carrotjuice - name = "Carrot juice" - id = "carrotjuice" - description = "It is just like a carrot but without crunching." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#973800" // rgb: 151, 56, 0 + var/adj_dizzy = 0 + var/adj_drowsy = 0 + var/adj_sleepy = 0 + var/adj_temp = 0 on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.nutrition += nutriment_factor - M.eye_blurry = max(M.eye_blurry-1 , 0) - M.eye_blind = max(M.eye_blind-1 , 0) - if(!data) data = 1 - switch(data) - if(1 to 20) - //nothing - if(21 to INFINITY) - if (prob(data-10)) - M.disabilities &= ~NEARSIGHTED - data++ + holder.remove_reagent(src.id, FOOD_METABOLISM) + if (adj_dizzy) M.dizziness = max(0,M.dizziness + adj_dizzy) + if (adj_drowsy) M.drowsyness = max(0,M.drowsyness + adj_drowsy) + if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy) + if (adj_temp) + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT)) + // Drinks should be used up faster than other reagents. + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return - berryjuice - name = "Berry Juice" - id = "berryjuice" - description = "A delicious blend of several different kinds of berries." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 134, 51, 51 + orangejuice + name = "Orange juice" + id = "orangejuice" + description = "Both delicious AND rich in Vitamin C, what more do you need?" + color = "#E78108" // rgb: 231, 129, 8 - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - ..() - return + on_mob_life(var/mob/living/M as mob) + ..() + if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1) + return - poisonberryjuice - name = "Poison Berry Juice" - id = "poisonberryjuice" - description = "A tasty juice blended from various kinds of very deadly and toxic berries." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863353" // rgb: 134, 51, 83 + tomatojuice + name = "Tomato Juice" + id = "tomatojuice" + description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" + color = "#731008" // rgb: 115, 16, 8 - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - M.adjustToxLoss(1) - ..() - return + on_mob_life(var/mob/living/M as mob) + ..() + if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1) + return - watermelonjuice - name = "Watermelon Juice" - id = "watermelonjuice" - description = "Delicious juice made from watermelon." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 134, 51, 51 + limejuice + name = "Lime Juice" + id = "limejuice" + description = "The sweet-sour juice of limes." + color = "#365E30" // rgb: 54, 94, 48 - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - ..() - return + on_mob_life(var/mob/living/M as mob) + ..() + if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1) + return - lemonjuice - name = "Lemon Juice" - id = "lemonjuice" - description = "This juice is VERY sour." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 175, 175, 0 + carrotjuice + name = "Carrot juice" + id = "carrotjuice" + description = "It is just like a carrot but without crunching." + color = "#973800" // rgb: 151, 56, 0 - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - ..() - return + on_mob_life(var/mob/living/M as mob) + ..() + M.eye_blurry = max(M.eye_blurry-1 , 0) + M.eye_blind = max(M.eye_blind-1 , 0) + if(!data) data = 1 + switch(data) + if(1 to 20) + //nothing + if(21 to INFINITY) + if (prob(data-10)) + M.disabilities &= ~NEARSIGHTED + data++ + return - banana - name = "Banana Juice" - id = "banana" - description = "The raw essence of a banana. HONK" - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 175, 175, 0 + berryjuice + name = "Berry Juice" + id = "berryjuice" + description = "A delicious blend of several different kinds of berries." + color = "#863333" // rgb: 134, 51, 51 - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Clown")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) + poisonberryjuice + name = "Poison Berry Juice" + id = "poisonberryjuice" + description = "A tasty juice blended from various kinds of very deadly and toxic berries." + color = "#863353" // rgb: 134, 51, 83 + + on_mob_life(var/mob/living/M as mob) + ..() + M.adjustToxLoss(1) + return + + watermelonjuice + name = "Watermelon Juice" + id = "watermelonjuice" + description = "Delicious juice made from watermelon." + color = "#863333" // rgb: 134, 51, 51 + + lemonjuice + name = "Lemon Juice" + id = "lemonjuice" + description = "This juice is VERY sour." + color = "#863333" // rgb: 175, 175, 0 + + banana + name = "Banana Juice" + id = "banana" + description = "The raw essence of a banana." + color = "#863333" // rgb: 175, 175, 0 + + nothing + name = "Nothing" + id = "nothing" + description = "Absolutely nothing." + + potato_juice + name = "Potato Juice" + id = "potato" + description = "Juice of the potato. Bleh." + nutriment_factor = 2 * FOOD_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + + milk + name = "Milk" + id = "milk" + description = "An opaque white liquid produced by the mammary glands of mammals." + color = "#DFDFDF" // rgb: 223, 223, 223 + + on_mob_life(var/mob/living/M as mob) + if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) + if(holder.has_reagent("capsaicin")) + holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM) ..() return - if(istype(M, /mob/living/carbon/monkey)) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) + + soymilk + name = "Soy Milk" + id = "soymilk" + description = "An opaque white liquid made from soybeans." + color = "#DFDFC7" // rgb: 223, 223, 199 + + cream + name = "Cream" + id = "cream" + description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" + color = "#DFD7AF" // rgb: 223, 215, 175 + + hot_coco + name = "Hot Chocolate" + id = "hot_coco" + description = "Made with love! And coco beans." + nutriment_factor = 2 * FOOD_METABOLISM + color = "#403010" // rgb: 64, 48, 16 + adj_temp = 5 + + coffee + name = "Coffee" + id = "coffee" + description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." + color = "#482000" // rgb: 72, 32, 0 + adj_dizzy = -5 + adj_drowsy = -3 + adj_sleepy = -2 + adj_temp = 25 + + on_mob_life(var/mob/living/M as mob) ..() + M.make_jittery(5) + if(adj_temp > 0 && holder.has_reagent("frostoil")) + holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM) + + holder.remove_reagent(src.id, 0.1) return - ..() - nothing - name = "Nothing" - id = "nothing" - description = "Absolutely nothing." - nutriment_factor = 1 * REAGENTS_METABOLISM - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) + icecoffee + name = "Iced Coffee" + id = "icecoffee" + description = "Coffee and ice, refreshing and cool." + color = "#102838" // rgb: 16, 40, 56 + adj_temp = -5 + + soy_latte + name = "Soy Latte" + id = "soy_latte" + description = "A nice and tasty beverage while you are reading your hippie books." + color = "#664300" // rgb: 102, 67, 0 + adj_sleepy = 0 + adj_temp = 5 + + on_mob_life(var/mob/living/M as mob) + ..() + M.sleeping = 0 + if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) + return + + cafe_latte + name = "Cafe Latte" + id = "cafe_latte" + description = "A nice, strong and tasty beverage while you are reading." + color = "#664300" // rgb: 102, 67, 0 + adj_sleepy = 0 + adj_temp = 5 + + on_mob_life(var/mob/living/M as mob) + ..() + M.sleeping = 0 + if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) + return + + tea + name = "Tea" + id = "tea" + description = "Tasty black tea, it has antioxidants, it's good for you!" + color = "#101000" // rgb: 16, 16, 0 + adj_dizzy = -2 + adj_drowsy = -1 + adj_sleepy = -3 + adj_temp = 20 + + on_mob_life(var/mob/living/M as mob) ..() + if(M.getToxLoss() && prob(20)) + M.adjustToxLoss(-1) return - ..() - - potato_juice - name = "Potato Juice" - id = "potato" - description = "Juice of the potato. Bleh." - reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - - milk - name = "Milk" - id = "milk" - description = "An opaque white liquid produced by the mammary glands of mammals." - reagent_state = LIQUID - color = "#DFDFDF" // rgb: 223, 223, 223 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 2) - M.nutrition++ - ..() - return - - soymilk - name = "Soy Milk" - id = "soymilk" - description = "An opaque white liquid made from soybeans." - reagent_state = LIQUID - color = "#DFDFC7" // rgb: 223, 223, 199 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - M.nutrition++ - ..() - return - - cream - name = "Cream" - id = "cream" - description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#DFD7AF" // rgb: 223, 215, 175 - - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - ..() - return - - coffee - name = "Coffee" - id = "coffee" - description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." - reagent_state = LIQUID - color = "#482000" // rgb: 72, 32, 0 - - on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping - 2) - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.make_jittery(5) - if(holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) - ..() - return - - tea - name = "Tea" - id = "tea" - description = "Tasty black tea, it has antioxidants, it's good for you!" - reagent_state = LIQUID - color = "#101000" // rgb: 16, 16, 0 - - on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-2) - M.drowsyness = max(0,M.drowsyness-1) - M.jitteriness = max(0,M.jitteriness-3) - M.sleeping = max(0,M.sleeping-1) - if(M.getToxLoss() && prob(20)) - M.adjustToxLoss(-1) - if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - - icecoffee - name = "Iced Coffee" - id = "icecoffee" - description = "Coffee and ice, refreshing and cool." - reagent_state = LIQUID - color = "#102838" // rgb: 16, 40, 56 - - on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.make_jittery(5) - ..() - return - - icetea - name = "Iced Tea" - id = "icetea" - description = "No relation to a certain rap artist/ actor." - reagent_state = LIQUID - color = "#104038" // rgb: 16, 64, 56 - - on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-2) - M.drowsyness = max(0,M.drowsyness-1) - M.sleeping = max(0,M.sleeping-2) - if(M.getToxLoss() && prob(20)) - M.adjustToxLoss(-1) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - return - - space_cola - name = "Cola" - id = "cola" - description = "A refreshing beverage." - reagent_state = LIQUID - color = "#100800" // rgb: 16, 8, 0 - - on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-5) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.nutrition += 1 - ..() - return - - nuka_cola - name = "Nuka Cola" - id = "nuka_cola" - description = "Cola, cola never changes." - reagent_state = LIQUID - color = "#100800" // rgb: 16, 8, 0 - - on_mob_life(var/mob/living/M as mob) - M.make_jittery(20) - M.druggy = max(M.druggy, 30) - M.dizziness +=5 - M.drowsyness = 0 - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.nutrition += 1 - ..() - return - - spacemountainwind - name = "Space Mountain Wind" - id = "spacemountainwind" - description = "Blows right through you like a space wind." - reagent_state = LIQUID - color = "#102000" // rgb: 16, 32, 0 - - on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-7) - M.sleeping = max(0,M.sleeping-1) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.make_jittery(5) - M.nutrition += 1 - ..() - return - - thirteenloko - name = "Thirteen Loko" - id = "thirteenloko" - description = "A potent mixture of caffeine and alcohol." - reagent_state = LIQUID - color = "#102000" // rgb: 16, 32, 0 - - on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-7) - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.make_jittery(5) - M.nutrition += 1 - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 45 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - dr_gibb - name = "Dr. Gibb" - id = "dr_gibb" - description = "A delicious blend of 42 different flavours" - reagent_state = LIQUID - color = "#102000" // rgb: 16, 32, 0 - - on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-6) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - M.nutrition += 1 - ..() - return - - space_up - name = "Space-Up" - id = "space_up" - description = "Tastes like a hull breach in your mouth." - reagent_state = LIQUID - color = "#202800" // rgb: 32, 40, 0 - - on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - M.nutrition += 1 - ..() - return - - lemon_lime - name = "Lemon Lime" - description = "A tangy substance made of 0.5% natural citrus!" - id = "lemon_lime" - reagent_state = LIQUID - color = "#878F00" // rgb: 135, 40, 0 - - on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - M.nutrition += 1 - ..() - return - - beer - name = "Beer" - id = "beer" - description = "An alcoholic beverage made from malted grains, hops, yeast, and water." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.make_dizzy(3) - M.jitteriness = max(M.jitteriness-3,0) - M.nutrition += 2 - if(data >= 25) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - if(data >= 40 && prob(33)) - if (!M.confused) M.confused = 1 - M.confused += 2 - - ..() - return - - whiskey - name = "Whiskey" - id = "whiskey" - description = "A superb and well-aged single-malt whiskey. Damn." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - specialwhiskey - name = "Special Blend Whiskey" - id = "specialwhiskey" - description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - - gin - name = "Gin" - id = "gin" - description = "It's gin. In space. I say, good sir." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - rum - name = "Rum" - id = "rum" - description = "Yohoho and all that." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - vodka - name = "Vodka" - id = "vodka" - description = "Number one drink AND fueling choice for Russians worldwide." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - M.radiation = max(M.radiation-2,0) - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - holywater - name = "Holy Water" - id = "holywater" - description = "Water blessed by some deity." - reagent_state = LIQUID - color = "#E0E8EF" // rgb: 224, 232, 239 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=8 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 8 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+8,8) - ..() - return - - reaction_turf(var/turf/simulated/T, var/volume) - if(!istype(T)) return - T.Bless() - - tequilla - name = "Tequila" - id = "tequilla" - description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" - reagent_state = LIQUID - color = "#A8B0B7" // rgb: 168, 176, 183 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - vermouth - name = "Vermouth" - id = "vermouth" - description = "You suddenly feel a craving for a martini..." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - wine - name = "Wine" - id = "wine" - description = "An premium alchoholic beverage made from distilled grape juice." - reagent_state = LIQUID - color = "#7E4043" // rgb: 126, 64, 67 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=2 - 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) - ..() - 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" - description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - - kahlua - name = "Kahlua" - id = "kahlua" - description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping-2)//Copy-paste from Coffee, derp - M.make_jittery(5) - ..() - return - - - cognac - name = "Cognac" - id = "cognac" - description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 45 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - hooch - name = "Hooch" - id = "hooch" - description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=6 - if(data >= 35 && data <90) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 90 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - ale - name = "Ale" - id = "ale" - description = "A dark alchoholic beverage made by malted barley and yeast." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - sodawater - name = "Soda Water" - id = "sodawater" - description = "A can of club soda. Why not make a scotch and soda?" - reagent_state = LIQUID - color = "#619494" // rgb: 97, 148, 148 - - on_mob_life(var/mob/living/M as mob) - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - - ice - name = "Ice" - id = "ice" - description = "Frozen water, your dentist wouldn't like you chewing this." - reagent_state = SOLID - color = "#619494" // rgb: 97, 148, 148 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT - ..() - return - -/////////////////////////////////////////////////////////////////cocktail entities////////////////////////////////////////////// - - bilk - name = "Bilk" - id = "bilk" - description = "This appears to be beer mixed with milk. Disgusting." - reagent_state = LIQUID - color = "#895C4C" // rgb: 137, 92, 76 - - on_mob_life(var/mob/living/M as mob) - if(M.getBruteLoss() && prob(10)) M.heal_organ_damage(1,0) - M.nutrition += 2 - if(!data) data = 1 - data++ - M.make_dizzy(3) - M.jitteriness = max(M.jitteriness-3,0) - if(data >= 25) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - if(data >= 40 && prob(33)) - if (!M.confused) M.confused = 1 - M.confused += 2 - ..() - return - - atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - description = "Nuclear proliferation never tasted so good." - reagent_state = LIQUID - color = "#666300" // rgb: 102, 99, 0 - - on_mob_life(var/mob/living/M as mob) - M.druggy = max(M.druggy, 50) - M.confused = max(M.confused+2,0) - M.make_dizzy(10) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - if(!data) data = 1 - data++ - switch(data) - if(51 to INFINITY) - M.sleeping += 1 - ..() - return - - threemileisland - name = "THree Mile Island Iced Tea" - id = "threemileisland" - description = "Made for a woman, strong enough for a man." - reagent_state = LIQUID - color = "#666340" // rgb: 102, 99, 64 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - M.druggy = max(M.druggy, 50) - if(data >= 35 && data <90) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 90) - M.confused = max(M.confused+2,0) - ..() - return - - goldschlager - name = "Goldschlager" - id = "goldschlager" - description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - patron - name = "Patron" - id = "patron" - description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." - reagent_state = LIQUID - color = "#585840" // rgb: 88, 88, 64 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - gintonic - name = "Gin and Tonic" - id = "gintonic" - description = "An all time classic, mild cocktail." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <135) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 135 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - cuba_libre - name = "Cuba Libre" - id = "cubalibre" - description = "Rum, mixed with cola. Viva la revolution." - reagent_state = LIQUID - color = "#3E1B00" // rgb: 62, 27, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <135) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 135 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" - description = "Whiskey, mixed with cola. Surprisingly refreshing." - reagent_state = LIQUID - color = "#3E1B00" // rgb: 62, 27, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - martini - name = "Classic Martini" - id = "martini" - description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 135 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - vodkamartini - name = "Vodka Martini" - id = "vodkamartini" - description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 135 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - white_russian - name = "White Russian" - id = "whiterussian" - description = "That's just, like, your opinion, man..." - reagent_state = LIQUID - color = "#A68340" // rgb: 166, 131, 64 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - screwdrivercocktail - name = "Screwdriver" - id = "screwdrivercocktail" - description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - reagent_state = LIQUID - color = "#A68310" // rgb: 166, 131, 16 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - booger - name = "Booger" - id = "booger" - description = "Ewww..." - reagent_state = LIQUID - color = "#A68310" // rgb: 166, 131, 16 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+4,0) - ..() - return - - bloody_mary - name = "Bloody Mary" - id = "bloodymary" - description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - gargle_blaster - name = "Pan-Galactic Gargle Blaster" - id = "gargleblaster" - description = "Whoah, this stuff looks volatile!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=6 - if(data >= 15 && data <45) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 45 && prob(50) && data <55) - M.confused = max(M.confused+3,0) - else if(data >=55) - M.druggy = max(M.druggy, 55) - ..() - return - - brave_bull - name = "Brave Bull" - id = "bravebull" - description = "It's just as effective as Dutch-Courage!." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <145) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 145 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - tequilla_sunrise - name = "Tequila Sunrise" - id = "tequillasunrise" - description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - toxins_special - name = "Toxins Special" - id = "toxinsspecial" - description = "This thing is ON FIRE!. CALL THE DAMN SHUTTLE!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 330) - M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - beepsky_smash - name = "Beepsky Smash" - id = "beepskysmash" - description = "Deny drinking this and prepare for THE LAW." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - M.Stun(2) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - doctor_delight - name = "The Doctor's Delight" - id = "doctorsdelight" - description = "A gulp a day keeps the MediBot away. That's probably for the best." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-2) - if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(2,0) - if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,2) - if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-2) - if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15) - if(M.confused !=0) M.confused = max(0,M.confused - 5) - ..() - return - - irish_cream - name = "Irish Cream" - id = "irishcream" - description = "Whiskey-imbued cream, what else would you expect from the Irish." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 45 && data <145) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 145 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - manly_dorf - name = "The Manly Dorf" - id = "manlydorf" - description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 35 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - longislandicedtea - name = "Long Island Iced Tea" - id = "longislandicedtea" - description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - moonshine - name = "Moonshine" - id = "moonshine" - description = "You've really hit rock bottom now... your liver packed its bags and left last night." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 30 && data <60) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 60 && prob(40)) - M.confused = max(M.confused+5,0) - ..() - return - - b52 - name = "B-52" - id = "b52" - description = "Coffee, Irish Cream, and congac. You will get bombed." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 25 && data <90) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 90 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - irishcoffee - name = "Irish Coffee" - id = "irishcoffee" - description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <150) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 150 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - margarita - name = "Margarita" - id = "margarita" - description = "On the rocks with salt on the rim. Arriba~!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <150) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 150 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - black_russian - name = "Black Russian" - id = "blackrussian" - description = "For the lactose-intolerant. Still as classy as a White Russian." - reagent_state = LIQUID - color = "#360000" // rgb: 54, 0, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - manhattan - name = "Manhattan" - id = "manhattan" - description = "The Detective's undercover drink of choice. He never could stomach gin..." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - manhattan_proj - name = "Manhattan Project" - id = "manhattan_proj" - description = "A scientist's drink of choice, for pondering ways to blow up the station." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - M.druggy = max(M.druggy, 30) - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - whiskeysoda - name = "Whiskey Soda" - id = "whiskeysoda" - description = "For the more refined griffon." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - antifreeze - name = "Anti-freeze" - id = "antifreeze" - description = "Ultimate refreshment." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 330) - M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - barefoot - name = "Barefoot" - id = "barefoot" - description = "Barefoot and pregnant" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+5,0) - ..() - return - - snowwhite - name = "Snow White" - id = "snowwhite" - description = "A cold refreshment" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 115 && prob(30)) - M.confused = max(M.confused+4,0) - ..() - return - - demonsblood - name = "Demons Blood" - id = "demonsblood" - description = "AHHHH!!!!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=10 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 10 - else if(data >= 115 && prob(90)) - M.confused = max(M.confused+10,10) - ..() - return - - vodkatonic - name = "Vodka and Tonic" - id = "vodkatonic" - description = "For when a gin and tonic isn't russian enough." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - ginfizz - name = "Gin Fizz" - id = "ginfizz" - description = "Refreshingly lemony, deliciously dry." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - bahama_mama - name = "Bahama mama" - id = "bahama_mama" - description = "Tropical cocktail." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=3 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+2,0) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - - singulo - name = "Singulo" - id = "singulo" - description = "A blue-space beverage!" - reagent_state = LIQUID - color = "#2E6671" // rgb: 46, 102, 113 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=15 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 15 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+15,15) - ..() - return - - sbiten - name = "Sbiten" - id = "sbiten" - description = "A spicy Vodka! Might be a little hot for the little guys!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 360) - M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - if(!data) data = 1 - data++ - M.dizziness +=6 - if(data >= 45 && data <125) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 6 - else if(data >= 125 && prob(33)) - M.confused = max(M.confused+5,5) - ..() - return - - devilskiss - name = "Devils Kiss" - id = "devilskiss" - description = "Creepy time!" - reagent_state = LIQUID - color = "#A68310" // rgb: 166, 131, 16 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+4,0) - ..() - return - - red_mead - name = "Red Mead" - id = "red_mead" - description = "The true Viking drink! Even though it has a strange red color." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+4,4) - ..() - return - - mead - name = "Mead" - id = "mead" - description = "A Vikings drink, though a cheap one." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.make_dizzy(3) - M.jitteriness = max(M.jitteriness-3,0) - M.nutrition += 2 - if(data >= 25) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - if(data >= 40 && prob(33)) - if (!M.confused) M.confused = 1 - M.confused += 2 - - ..() - return - - iced_beer - name = "Iced Beer" - id = "iced_beer" - description = "A beer which is so cold the air around it freezes." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(M.bodytemperature > 270) - M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - if(!data) data = 1 - data++ - M.make_dizzy(3) - M.jitteriness = max(M.jitteriness-3,0) - M.nutrition += 2 - if(data >= 25) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - if(data >= 40 && prob(33)) - if (!M.confused) M.confused = 1 - M.confused += 2 - - ..() - return - - grog - name = "Grog" - id = "grog" - description = "Watered down rum, Nanotrasen approves!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=2 - if(data >= 90 && data <250) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 2 - else if(data >= 250 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - aloe - name = "Aloe" - id = "aloe" - description = "So very, very, very good." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=2 - if(data >= 90 && data <250) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 2 - else if(data >= 250 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - andalusia - name = "Andalusia" - id = "andalusia" - description = "A nice, strange named drink." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=8 - if(data >= 90 && data <250) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 1 - else if(data >= 250 && prob(33)) - M.confused = max(M.confused+2,0) - ..() - return - - alliescocktail - name = "Allies Cocktail" - id = "alliescocktail" - description = "A drink made from your allies, not as sweet as when made from your enemies." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 90 && data <250) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 7 - else if(data >= 250 && prob(60)) - M.confused = max(M.confused+8,0) - ..() - return - - soy_latte - name = "Soy Latte" - id = "soy_latte" - description = "A nice and tasty beverage while you are reading your hippie books." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = 0 - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.make_jittery(5) - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - M.nutrition++ - ..() - return - - cafe_latte - name = "Cafe Latte" - id = "cafe_latte" - description = "A nice, strong and tasty beverage while you are reading." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = 0 - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.make_jittery(5) - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - M.nutrition++ - ..() - return - - acid_spit - name = "Acid Spit" - id = "acidspit" - description = "A drink for the daring, can be deadly if incorrectly prepared!" - reagent_state = LIQUID - color = "#365000" // rgb: 54, 80, 0 - - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=10 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 10 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+10,0) - ..() - return - - amasec - name = "Amasec" - id = "amasec" - description = "Official drink of the Nanotrasen Gun-Club!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - - on_mob_life(var/mob/living/M as mob) - M.stunned = 1 - if(!data) data = 1 - data++ - M.dizziness +=4 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+5,0) - ..() - return - - neurotoxin - name = "Neurotoxin" - id = "neurotoxin" - description = "A strong neurotoxin that puts the subject into a death-like state." - reagent_state = LIQUID - color = "#2E2E61" // rgb: 46, 46, 97 - - on_mob_life(var/mob/living/carbon/M as mob) - if(!M) M = holder.my_atom - M.weakened = max(M.weakened, 3) - if(!data) data = 1 - data++ - M.dizziness +=6 - if(data >= 15 && data <45) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 45 && prob(50) && data <55) - M.confused = max(M.confused+3,0) - else if(data >=55) - M.druggy = max(M.druggy, 55) - ..() - - return + icetea + name = "Iced Tea" + id = "icetea" + description = "No relation to a certain rap artist/ actor." + color = "#104038" // rgb: 16, 64, 56 + adj_temp = -5 + + kahlua + name = "Kahlua" + id = "kahlua" + description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" + color = "#664300" // rgb: 102, 67, 0 + adj_dizzy = -5 + adj_drowsy = -3 + adj_sleepy = -2 + + on_mob_life(var/mob/living/M as mob) + ..() + M.make_jittery(5) + return + + cold + name = "Cold drink" + adj_temp = -5 + + tonic + name = "Tonic Water" + id = "tonic" + description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." + color = "#664300" // rgb: 102, 67, 0 + adj_dizzy = -5 + adj_drowsy = -3 + adj_sleepy = -2 + + sodawater + name = "Soda Water" + id = "sodawater" + description = "A can of club soda. Why not make a scotch and soda?" + color = "#619494" // rgb: 97, 148, 148 + adj_dizzy = -5 + adj_drowsy = -3 + + ice + name = "Ice" + id = "ice" + description = "Frozen water, your dentist wouldn't like you chewing this." + reagent_state = SOLID + color = "#619494" // rgb: 97, 148, 148 + + space_cola + name = "Cola" + id = "cola" + description = "A refreshing beverage." + reagent_state = LIQUID + color = "#100800" // rgb: 16, 8, 0 + adj_drowsy = -3 + + nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + description = "Cola, cola never changes." + color = "#100800" // rgb: 16, 8, 0 + adj_sleepy = -2 + + on_mob_life(var/mob/living/M as mob) + M.make_jittery(20) + M.druggy = max(M.druggy, 30) + M.dizziness +=5 + M.drowsyness = 0 + ..() + return + + spacemountainwind + name = "Space Mountain Wind" + id = "spacemountainwind" + description = "Blows right through you like a space wind." + color = "#102000" // rgb: 16, 32, 0 + adj_drowsy = -7 + adj_sleepy = -1 + + dr_gibb + name = "Dr. Gibb" + id = "dr_gibb" + description = "A delicious blend of 42 different flavours" + color = "#102000" // rgb: 16, 32, 0 + adj_drowsy = -6 + + space_up + name = "Space-Up" + id = "space_up" + description = "Tastes like a hull breach in your mouth." + color = "#202800" // rgb: 32, 40, 0 + adj_temp = -8 + + lemon_lime + name = "Lemon Lime" + description = "A tangy substance made of 0.5% natural citrus!" + id = "lemon_lime" + color = "#878F00" // rgb: 135, 40, 0 + adj_temp = -8 hippies_delight name = "Hippie's Delight" @@ -4028,155 +2715,670 @@ datum ..() return - bananahonk - name = "Banana Mama" - id = "bananahonk" - description = "A drink from Clown Heaven." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#664300" // rgb: 102, 67, 0 +//ALCOHOL WOO + ethanol + name = "Ethanol" //Parent class for all alcoholic reagents. + id = "ethanol" + description = "A well-known alcohol with a variety of applications." + reagent_state = LIQUID + nutriment_factor = 0 //So alcohol can fill you up! If they want to. + color = "#404030" // rgb: 64, 64, 48 + var/dizzy_adj = 3 + var/slurr_adj = 3 + var/confused_adj = 2 + var/slur_start = 65 //amount absorbed after which mob starts slurring + var/confused_start = 130 //amount absorbed after which mob starts confusing directions + var/blur_start = 260 //amount absorbed after which mob starts getting blurred vision + var/pass_out = 325 //amount absorbed after which mob starts passing out on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!data) data = 1 - data++ - if(istype(M, /mob/living/carbon/human) && M.job in list("Clown")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - M.dizziness +=5 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+5,0) + M:nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) + if(!src.data) data = 1 + src.data++ + + var/d = data + + // make all the beverages work together + for(var/datum/reagent/ethanol/A in holder.reagent_list) + if(A.data) d += A.data + + M.dizziness +=dizzy_adj. + if(d >= slur_start && d < confused_start) + if (!M:slurring) M:slurring = 1 + M:slurring += slurr_adj + if(d >= confused_start && prob(33)) + if (!M:confused) M:confused = 1 + M.confused = max(M:confused+confused_adj,0) + if(d >= blur_start) + M.eye_blurry = max(M.eye_blurry, 10) + M:drowsyness = max(M:drowsyness, 0) + if(d >= pass_out) + M:paralysis = max(M:paralysis, 20) + M:drowsyness = max(M:drowsyness, 30) + + holder.remove_reagent(src.id, 0.4) + ..() + return + + reaction_obj(var/obj/O, var/volume) + if(istype(O,/obj/item/weapon/paper)) + var/obj/item/weapon/paper/paperaffected = O + paperaffected.clearpaper() + usr << "The solution melts away the ink on the paper." + if(istype(O,/obj/item/weapon/book)) + if(volume >= 5) + var/obj/item/weapon/book/affectedbook = O + affectedbook.dat = null + usr << "The solution melts away the ink on the book." + else + usr << "It wasn't enough..." + return + + beer //It's really much more stronger than other drinks. + name = "Beer" + id = "beer" + description = "An alcoholic beverage made from malted grains, hops, yeast, and water." + nutriment_factor = 2 * FOOD_METABOLISM + color = "#664300" // rgb: 102, 67, 0 + on_mob_life(var/mob/living/M as mob) ..() + M:jitteriness = max(M:jitteriness-3,0) return - if(istype(M, /mob/living/carbon/monkey)) + + whiskey + name = "Whiskey" + id = "whiskey" + description = "A superb and well-aged single-malt whiskey. Damn." + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 4 + + specialwhiskey + name = "Special Blend Whiskey" + id = "specialwhiskey" + description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." + color = "#664300" // rgb: 102, 67, 0 + slur_start = 30 //amount absorbed after which mob starts slurring + + gin + name = "Gin" + id = "gin" + description = "It's gin. In space. I say, good sir." + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 3 + + absinthe + name = "Absinthe" + id = "absinthe" + description = "Watch out that the Green Fairy doesn't come for you!" + color = "#33EE00" // rgb: lots, ??, ?? + dizzy_adj = 5 + slur_start = 25 + confused_start = 100 + + //copy paste from LSD... shoot me + on_mob_life(var/mob/M) if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - M.dizziness +=5 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+5,0) + if(!data) data = 1 + data++ + M:hallucination += 5 + if(volume > REAGENTS_OVERDOSE) + M:adjustToxLoss(1) ..() return - silencer - name = "Silencer" - id = "silencer" - description = "A drink from Mime Heaven." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#664300" // rgb: 102, 67, 0 + rum + name = "Rum" + id = "rum" + description = "Yohoho and all that." + color = "#664300" // rgb: 102, 67, 0 - on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!data) data = 1 - data++ - if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - M.dizziness +=5 - if(data >= 55 && data <165) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 165 && prob(33)) - M.confused = max(M.confused+5,0) + deadrum + name = "Deadrum" + id = "rum" + description = "Popular with the sailors. Not very popular with everyone else." + color = "#664300" // rgb: 102, 67, 0 + + on_mob_life(var/mob/living/M as mob) ..() + M.dizziness +=5 + if(volume > REAGENTS_OVERDOSE) + M:adjustToxLoss(1) + return + + vodka + name = "Vodka" + id = "vodka" + description = "Number one drink AND fueling choice for Russians worldwide." + color = "#664300" // rgb: 102, 67, 0 + + tequilla + name = "Tequila" + id = "tequilla" + description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" + color = "#A8B0B7" // rgb: 168, 176, 183 + + vermouth + name = "Vermouth" + id = "vermouth" + description = "You suddenly feel a craving for a martini..." + color = "#664300" // rgb: 102, 67, 0 + + wine + name = "Wine" + id = "wine" + description = "An premium alchoholic beverage made from distilled grape juice." + color = "#7E4043" // rgb: 126, 64, 67 + dizzy_adj = 2 + slur_start = 65 //amount absorbed after which mob starts slurring + confused_start = 145 //amount absorbed after which mob starts confusing directions + + cognac + name = "Cognac" + id = "cognac" + description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 4 + confused_start = 115 //amount absorbed after which mob starts confusing directions + + hooch + name = "Hooch" + id = "hooch" + description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 6 + slurr_adj = 5 + slur_start = 35 //amount absorbed after which mob starts slurring + confused_start = 90 //amount absorbed after which mob starts confusing directions + + ale + name = "Ale" + id = "ale" + description = "A dark alchoholic beverage made by malted barley and yeast." + color = "#664300" // rgb: 102, 67, 0 + + thirteenloko + name = "Thirteen Loko" + id = "thirteenloko" + description = "A potent mixture of caffeine and alcohol." + reagent_state = LIQUID + color = "#102000" // rgb: 16, 32, 0 + + on_mob_life(var/mob/living/M as mob) + ..() + M:nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) + M:drowsyness = max(0,M:drowsyness-7) + //if(!M:sleeping_willingly) + // M:sleeping = max(0,M.sleeping-2) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature-5) + M.make_jittery(1) return - changelingsting - name = "Changeling Sting" - id = "changelingsting" - description = "You take a tiny sip and feel a burning sensation..." - reagent_state = LIQUID - color = "#2E6671" // rgb: 46, 102, 113 +/////////////////////////////////////////////////////////////////cocktail entities////////////////////////////////////////////// - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+15,15) - ..() - return + bilk + name = "Bilk" + id = "bilk" + description = "This appears to be beer mixed with milk. Disgusting." + reagent_state = LIQUID + color = "#895C4C" // rgb: 137, 92, 76 - irishcarbomb - name = "Irish Car Bomb" - id = "irishcarbomb" - description = "Mmm, tastes like chocolate cake..." - reagent_state = LIQUID - color = "#2E6671" // rgb: 46, 102, 113 + atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + description = "Nuclear proliferation never tasted so good." + reagent_state = LIQUID + color = "#666300" // rgb: 102, 99, 0 - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=5 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 5 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+15,15) - ..() - return + threemileisland + name = "THree Mile Island Iced Tea" + id = "threemileisland" + description = "Made for a woman, strong enough for a man." + reagent_state = LIQUID + color = "#666340" // rgb: 102, 99, 64 - syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" - description = "Tastes like terrorism!" - reagent_state = LIQUID - color = "#2E6671" // rgb: 46, 102, 113 + goldschlager + name = "Goldschlager" + id = "goldschlager" + description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=10 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 10 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+15,15) - ..() - return + patron + name = "Patron" + id = "patron" + description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." + reagent_state = LIQUID + color = "#585840" // rgb: 88, 88, 64 - erikasurprise - name = "Erika Surprise" - id = "erikasurprise" - description = "The surprise is, it's green!" - reagent_state = LIQUID - color = "#2E6671" // rgb: 46, 102, 113 + gintonic + name = "Gin and Tonic" + id = "gintonic" + description = "An all time classic, mild cocktail." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=30 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 30 - else if(data >= 115 && prob(60)) - M.confused = max(M.confused+15,15) - ..() - return + cuba_libre + name = "Cuba Libre" + id = "cubalibre" + description = "Rum, mixed with cola. Viva la revolution." + reagent_state = LIQUID + color = "#3E1B00" // rgb: 62, 27, 0 - driestmartini - name = "Driest Martini" - id = "driestmartini" - description = "Only for the experienced. You think you see sand floating in the glass." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#2E6671" // rgb: 46, 102, 113 + whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + description = "Whiskey, mixed with cola. Surprisingly refreshing." + reagent_state = LIQUID + color = "#3E1B00" // rgb: 62, 27, 0 - on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=10 - if(data >= 55 && data <115) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 10 - else if(data >= 115 && prob(33)) - M.confused = max(M.confused+15,15) - ..() - return \ No newline at end of file + martini + name = "Classic Martini" + id = "martini" + description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + vodkamartini + name = "Vodka Martini" + id = "vodkamartini" + description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + white_russian + name = "White Russian" + id = "whiterussian" + description = "That's just, like, your opinion, man..." + reagent_state = LIQUID + color = "#A68340" // rgb: 166, 131, 64 + + screwdrivercocktail + name = "Screwdriver" + id = "screwdrivercocktail" + description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + reagent_state = LIQUID + color = "#A68310" // rgb: 166, 131, 16 + + booger + name = "Booger" + id = "booger" + description = "Ewww..." + reagent_state = LIQUID + color = "#A68310" // rgb: 166, 131, 16 + + bloody_mary + name = "Bloody Mary" + id = "bloodymary" + description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + gargle_blaster + name = "Pan-Galactic Gargle Blaster" + id = "gargleblaster" + description = "Whoah, this stuff looks volatile!" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + brave_bull + name = "Brave Bull" + id = "bravebull" + description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + tequilla_sunrise + name = "Tequila Sunrise" + id = "tequillasunrise" + description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + toxins_special + name = "Toxins Special" + id = "toxinsspecial" + description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + beepsky_smash + name = "Beepsky Smash" + id = "beepskysmash" + description = "Deny drinking this and prepare for THE LAW." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + doctor_delight + name = "The Doctor's Delight" + id = "doctorsdelight" + description = "A gulp a day keeps the MediBot away. That's probably for the best." + reagent_state = LIQUID + nutriment_factor = 1 * FOOD_METABOLISM + color = "#664300" // rgb: 102, 67, 0 + + on_mob_life(var/mob/living/M as mob) + M:nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) + if(!M) M = holder.my_atom + if(M:getOxyLoss() && prob(50)) M:adjustOxyLoss(-2) + if(M:getBruteLoss() && prob(60)) M:heal_organ_damage(2,0) + if(M:getFireLoss() && prob(50)) M:heal_organ_damage(0,2) + if(M:getToxLoss() && prob(50)) M:adjustToxLoss(-2) + if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15) + if(M.confused !=0) M.confused = max(0,M.confused - 5) + ..() + return + + irish_cream + name = "Irish Cream" + id = "irishcream" + description = "Whiskey-imbued cream, what else would you expect from the Irish." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + manly_dorf + name = "The Manly Dorf" + id = "manlydorf" + description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + longislandicedtea + name = "Long Island Iced Tea" + id = "longislandicedtea" + description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + moonshine + name = "Moonshine" + id = "moonshine" + description = "You've really hit rock bottom now... your liver packed its bags and left last night." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + b52 + name = "B-52" + id = "b52" + description = "Coffee, Irish Cream, and congac. You will get bombed." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + irishcoffee + name = "Irish Coffee" + id = "irishcoffee" + description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + margarita + name = "Margarita" + id = "margarita" + description = "On the rocks with salt on the rim. Arriba~!" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + black_russian + name = "Black Russian" + id = "blackrussian" + description = "For the lactose-intolerant. Still as classy as a White Russian." + reagent_state = LIQUID + color = "#360000" // rgb: 54, 0, 0 + + manhattan + name = "Manhattan" + id = "manhattan" + description = "The Detective's undercover drink of choice. He never could stomach gin..." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + manhattan_proj + name = "Manhattan Project" + id = "manhattan_proj" + description = "A scienitst's drink of choice, for pondering ways to blow up the station." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + whiskeysoda + name = "Whiskey Soda" + id = "whiskeysoda" + description = "Ultimate refreshment." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + antifreeze + name = "Anti-freeze" + id = "antifreeze" + description = "Ultimate refreshment." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + barefoot + name = "Barefoot" + id = "barefoot" + description = "Barefoot and pregnant" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + snowwhite + name = "Snow White" + id = "snowwhite" + description = "A cold refreshment" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + demonsblood + name = "Demons Blood" + id = "demonsblood" + description = "AHHHH!!!!" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 10 + slurr_adj = 10 + + vodkatonic + name = "Vodka and Tonic" + id = "vodkatonic" + description = "For when a gin and tonic isn't russian enough." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 4 + slurr_adj = 3 + + ginfizz + name = "Gin Fizz" + id = "ginfizz" + description = "Refreshingly lemony, deliciously dry." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + dizzy_adj = 4 + slurr_adj = 3 + + bahama_mama + name = "Bahama mama" + id = "bahama_mama" + description = "Tropic cocktail." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + singulo + name = "Singulo" + id = "singulo" + description = "A blue-space beverage!" + reagent_state = LIQUID + color = "#2E6671" // rgb: 46, 102, 113 + dizzy_adj = 15 + slurr_adj = 15 + + sbiten + name = "Sbiten" + id = "sbiten" + description = "A spicy Vodka! Might be a little hot for the little guys!" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + on_mob_life(var/mob/living/M as mob) + ..() + if (M.bodytemperature < 360) + M.bodytemperature = min(360, M.bodytemperature+50) //310 is the normal bodytemp. 310.055 + return + + devilskiss + name = "Devils Kiss" + id = "devilskiss" + description = "Creepy time!" + reagent_state = LIQUID + color = "#A68310" // rgb: 166, 131, 16 + + red_mead + name = "Red Mead" + id = "red_mead" + description = "The true Viking drink! Even though it has a strange red color." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + mead + name = "Mead" + id = "mead" + description = "A Vikings drink, though a cheap one." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + iced_beer + name = "Iced Beer" + id = "iced_beer" + description = "A beer which is so cold the air around it freezes." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + on_mob_life(var/mob/living/M as mob) + ..() + if (M.bodytemperature < 270) + M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055 + return + + grog + name = "Grog" + id = "grog" + description = "Watered down rum, NanoTrasen approves!" + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + aloe + name = "Aloe" + id = "aloe" + description = "So very, very, very good." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + andalusia + name = "Andalusia" + id = "andalusia" + description = "A nice, strange named drink." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + alliescocktail + name = "Allies Cocktail" + id = "alliescocktail" + description = "A drink made from your allies." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + acid_spit + name = "Acid Spit" + id = "acidspit" + description = "A drink by NanoTrasen. Made from live aliens." + reagent_state = LIQUID + color = "#365000" // rgb: 54, 80, 0 + + amasec + name = "Amasec" + id = "amasec" + description = "Official drink of the Imperium." + reagent_state = LIQUID + color = "#664300" // rgb: 102, 67, 0 + + on_mob_life(var/mob/living/M as mob) + ..() + M.stunned = 4 + return + + neurotoxin + name = "Neurotoxin" + id = "neurotoxin" + description = "A strong neurotoxin that puts the subject into a death-like state." + reagent_state = LIQUID + color = "#2E2E61" // rgb: 46, 46, 97 + + on_mob_life(var/mob/living/M as mob) + ..() + if(!M) M = holder.my_atom + M:adjustOxyLoss(0.5) + M:adjustOxyLoss(0.5) + M:weakened = max(M:weakened, 15) + M:silent = max(M:silent, 15) + return + + bananahonk + name = "Banana Mama" + id = "bananahonk" + description = "A drink from Clown Heaven." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#664300" // rgb: 102, 67, 0 + + silencer + name = "Silencer" + id = "silencer" + description = "A drink from Mime Heaven." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#664300" // rgb: 102, 67, 0 + + changelingsting + name = "Changeling Sting" + id = "changelingsting" + description = "A stingy drink." + reagent_state = LIQUID + color = "#2E6671" // rgb: 46, 102, 113 + + on_mob_life(var/mob/living/M as mob) + ..() + M.dizziness +=5 + return + + irishcarbomb + name = "Irish Car Bomb" + id = "irishcarbomb" + description = "Mmm, tastes like chocolate cake..." + reagent_state = LIQUID + color = "#2E6671" // rgb: 46, 102, 113 + + on_mob_life(var/mob/living/M as mob) + ..() + M.dizziness +=5 + return + + syndicatebomb + name = "Syndicate Bomb" + id = "syndicatebomb" + description = "A Syndicate bomb" + reagent_state = LIQUID + color = "#2E6671" // rgb: 46, 102, 113 + + erikasurprise + name = "Erika Surprise" + id = "erikasurprise" + description = "The surprise is, it's green!" + reagent_state = LIQUID + color = "#2E6671" // rgb: 46, 102, 113 + + driestmartini + name = "Driest Martini" + id = "driestmartini" + description = "Only for the experienced. You think you see sand floating in the glass." + nutriment_factor = 1 * FOOD_METABOLISM + color = "#2E6671" // rgb: 46, 102, 113 diff --git a/config/admins.txt b/config/admins.txt index f80ff5334e5..06e1552f386 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -5,8 +5,8 @@ # Ranks can be anything defined in admin_ranks.txt ~Carn # ###################################################################### -abi79 - Game Master -arcalane - Game Admin +chinsky - Game Master +phaux - Game Master asanadas - Game Admin bobbehluvspropane - Game Admin cacophony - Game Admin diff --git a/html/changelog.html b/html/changelog.html index bfac87bc87f..e83e90c7c27 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -69,51 +69,36 @@ should be listed in the changelog upon commit though. Thanks. -->
-

13/01/2013

-

Chinsky updated:

+

November 2012 - January 2013

+

chinsky updated:

-
- -
-

January 7th

-

Cael_Aislinn updated:

+
  • Several cargo crates from pre-merge were ported.
    • +
  • Contraband crate is no longer labeled as such.
    • +
  • In space, no one can hear you scream now.
    • + +

    CIB updated:

    -
    - -
    -

    7/01/2013

    -

    Chinsky updated:

    +
  • Airflow produces subtle sound effects now.
    • +
  • Events are now adjusted based on department activity.
    • +
  • The virus event will spawn BS12 vira.
    • +
  • Two new traitor objectives: Brig and Harm
    • +
  • Space no longer makes rooms cold.
    • +
  • Gibbing creates actual limbs you can pick up, if you're lucky a complete head with brain.
    • +
  • It's now possible to miss in combat(melee and guns), instead of just hitting the torso rather than the head. This makes targetting the head much riskier than before.
    • +
  • Chemicals now last 10x as long in the blood, but their effect is also reduced equally.
    • +
  • IV drips now have a right-click option to take blood rather than give it.
    • +
  • Everyone gets a crew manifest.
    • + +

    CaelAislinn updated:

    -
    - -
    -

    December 28nd

    -

    Cael_Aislinn updated:

    +
  • There now is a client-toggle for whether to become a space-ninja.
    • +
  • Reduced startup lag by removing a vermin-related proc.
    • +
  • Several alien balance fixes.
    • + +

    Ravensdale updated:

    +
  • Ported station-wide explosion sounds.
    • +
    @@ -644,8 +629,8 @@ Credits Section @@ -658,6 +643,7 @@ Credits Section
    - Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom, trubble_bass.
     - Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut, Pewtershmitz, Firecage
     + Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie
     + Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut
     Sounds: Skie, Lasty/Vinyl
     Thanks to: CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image     		Coders: DopeGhoti, Sunfall, ThVortex
    Artwork: Captain Hammer
    + Spriters: ((TODO.))
    Sounds: Peter J, due, Erik Satie
    Thanks to: All the dev teams that came before: BS12, /tg/station13, the Goons, and the original SS13 folks.