From 77d22749f15d419e4b4e064a379691fb9a1a7b7a Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Sun, 13 Jan 2013 17:30:27 -0800 Subject: [PATCH 1/6] Hydroponics trays will update icons after being weeded now. --- code/game/machinery/hydroponics.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index b611b974a30..9373768ecf6 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -723,6 +723,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) if(src.weedlevel > 0) user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].") src.weedlevel = 0 + src.updateicon() else user << "\red This plot is completely devoid of weeds. It doesn't need uprooting." From 558fad6428fed23b542431a14a5ac305834061d3 Mon Sep 17 00:00:00 2001 From: RavingManiac Date: Wed, 16 Jan 2013 04:10:59 +0800 Subject: [PATCH 2/6] required_players_secret added, which is the number of players needed for a game mode to start when that mode has been chosen at random. required_players for most modes reduced to the number of antagonists + 1, as the variable is only used when the game mode is explicitly voted for. --- code/game/gamemodes/changeling/changeling.dm | 3 ++- code/game/gamemodes/changeling/traitor_chan.dm | 3 ++- code/game/gamemodes/cult/cult.dm | 3 ++- code/game/gamemodes/epidemic/epidemic.dm | 3 ++- code/game/gamemodes/game_mode.dm | 10 ++++++++-- code/game/gamemodes/malfunction/malfunction.dm | 3 ++- code/game/gamemodes/meme/meme.dm | 3 ++- code/game/gamemodes/nuclear/nuclear.dm | 3 ++- code/game/gamemodes/revolution/revolution.dm | 3 ++- code/game/gamemodes/revolution/rp_revolution.dm | 3 ++- code/game/gamemodes/wizard/wizard.dm | 3 ++- 11 files changed, 28 insertions(+), 12 deletions(-) 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 f9735403037..56e8e20a31b 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/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0f33bddb993..6825efd74bd 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:" @@ -83,8 +84,13 @@ Whitespace:Seperator; 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 34545842ccf..77130f5ac1c 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 60b683d441b..ebc4bfd5b29 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 a210d856cde..e45ebfec870 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 e26c0acc4d1..1532a1b9272 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 dec9e7496cb..36f630ff26f 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 From e8a4dd33c5d05a2c0b832f9eb2ae8c55cf589c0d Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 15 Jan 2013 23:03:06 +0100 Subject: [PATCH 3/6] Updated changelog. --- html/changelog.html | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index 1de473de9fb..e28d64ebfae 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,39 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> +
+

November 2012 - January 2013

+

chinsky 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:

+
    +
  • 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:

+
    +
  • 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.
    • +
+
+

December 3rd

Cael_Aislinn updated:

From e181b90ca2ca50de1277aa5cdab2bb0c68071ff6 Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 16 Jan 2013 02:55:23 +0100 Subject: [PATCH 4/6] Bugfix: Fix metabolism rates for foods, drinks and sleep toxins. --- code/modules/reagents/Chemistry-Reagents.dm | 132 ++++++++++++-------- 1 file changed, 82 insertions(+), 50 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 0a9ff96ef47..6c76764b8b4 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2,6 +2,7 @@ #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. @@ -310,25 +311,25 @@ datum if(!M) M = holder.my_atom M.drowsyness = max(M.drowsyness-2*REAGENTS_EFFECT_MULTIPLIER, 0) if(holder.has_reagent("toxin")) - holder.remove_reagent("toxin", 2*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("toxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("stoxin")) - holder.remove_reagent("stoxin", 2*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("stoxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("plasma")) - holder.remove_reagent("plasma", 1*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("plasma", 10*REAGENTS_METABOLISM) if(holder.has_reagent("sacid")) - holder.remove_reagent("sacid", 1*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("sacid", 10*REAGENTS_METABOLISM) if(holder.has_reagent("cyanide")) - holder.remove_reagent("cyanide", 1*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("cyanide", 10*REAGENTS_METABOLISM) if(holder.has_reagent("amatoxin")) - holder.remove_reagent("amatoxin", 2*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("amatoxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("chloralhydrate")) - holder.remove_reagent("chloralhydrate", 5*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("chloralhydrate", 10*REAGENTS_METABOLISM) if(holder.has_reagent("carpotoxin")) - holder.remove_reagent("carpotoxin", 1*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("carpotoxin", 10*REAGENTS_METABOLISM) if(holder.has_reagent("zombiepowder")) - holder.remove_reagent("zombiepowder", 0.5*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("zombiepowder", 10*REAGENTS_METABOLISM) if(holder.has_reagent("mindbreaker")) - holder.remove_reagent("mindbreaker", 2*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("mindbreaker", 10*REAGENTS_METABOLISM) M.hallucination = max(0, M.hallucination - 5*REAGENTS_EFFECT_MULTIPLIER) M.adjustToxLoss(-2*REAGENTS_EFFECT_MULTIPLIER) ..() @@ -359,6 +360,8 @@ datum 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 @@ -428,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 @@ -933,12 +938,13 @@ datum 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*REAGENTS_EFFECT_MULTIPLIER + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -1160,7 +1166,7 @@ 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*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("inaprovaline", 10*REAGENTS_METABOLISM) M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) ..() return @@ -1279,7 +1285,7 @@ datum if(!M) M = holder.my_atom M.adjustOxyLoss(-2*REAGENTS_EFFECT_MULTIPLIER) if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("lexorin", 10*REAGENTS_METABOLISM) ..() return @@ -1296,7 +1302,7 @@ datum if(!M) M = holder.my_atom M.adjustOxyLoss(-M.getOxyLoss()) if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REAGENTS_EFFECT_MULTIPLIER) + holder.remove_reagent("lexorin", 10*REAGENTS_METABOLISM) ..() return @@ -1396,7 +1402,7 @@ datum M.AdjustStunned(-1) M.AdjustWeakened(-1) if(holder.has_reagent("mindbreaker")) - holder.remove_reagent("mindbreaker", 5) + holder.remove_reagent("mindbreaker", 10*REAGENTS_METABOLISM) M.hallucination = max(0, M.hallucination - 10*REAGENTS_EFFECT_MULTIPLIER) if(prob(60)) M.adjustToxLoss(1) ..() @@ -1713,6 +1719,9 @@ datum if(61 to INFINITY) M.sleeping += 1 M.adjustToxLoss((data - 50) * REAGENTS_EFFECT_MULTIPLIER) + + // Sleep toxins should always be consumed pretty fast + holder.remove_reagent(src.id, 0.1) ..() return @@ -1736,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 @@ -1748,12 +1759,13 @@ 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 M.nutrition += nutriment_factor // For hunger and fatness + holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -1761,21 +1773,21 @@ datum name = "Coco Powder" id = "coco" description = "A fatty, bitter paste made from coco beans." - nutriment_factor = 5 * REAGENTS_METABOLISM + 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 * REAGENTS_METABOLISM + 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 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#AB7878" // rgb: 171, 120, 120 cornoil @@ -1783,7 +1795,7 @@ 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 reaction_turf(var/turf/simulated/T, var/volume) @@ -1817,7 +1829,7 @@ datum 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 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 hot_ramen @@ -1825,7 +1837,7 @@ 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) @@ -1839,7 +1851,7 @@ 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) @@ -1851,7 +1863,7 @@ datum name = "flour" id = "flour" description = "This is what you rub all over yourself to pretend to be a ghost." - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#FFFFFF" // rgb: 0, 0, 0 reaction_turf(var/turf/T, var/volume) @@ -1864,7 +1876,7 @@ 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 //Drugs @@ -1917,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) @@ -1934,7 +1946,7 @@ datum 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 @@ -1942,7 +1954,7 @@ 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 @@ -1981,7 +1993,7 @@ datum if(1 to 15) M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT if(holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) + holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM) if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature += rand(5,20) if(15 to 25) @@ -2067,7 +2079,7 @@ datum if(1 to 15) M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 5) + holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM) if(istype(M, /mob/living/carbon/metroid)) M.bodytemperature -= rand(5,20) if(15 to 25) @@ -2101,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 @@ -2114,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 @@ -2173,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 ..() @@ -2190,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 ..() @@ -2209,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) @@ -2255,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 @@ -2268,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)) ..() @@ -2283,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 @@ -2297,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 @@ -2315,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 @@ -2332,7 +2356,7 @@ datum 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 var/adj_dizzy = 0 var/adj_drowsy = 0 @@ -2342,12 +2366,15 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.nutrition += nutriment_factor + 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 @@ -2448,7 +2475,7 @@ datum name = "Potato Juice" id = "potato" description = "Juice of the potato. Bleh." - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 2 * FOOD_METABOLISM color = "#302000" // rgb: 48, 32, 0 milk @@ -2460,7 +2487,7 @@ datum 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", 2) + holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM) ..() return @@ -2480,7 +2507,7 @@ datum name = "Hot Chocolate" id = "hot_coco" description = "Made with love! And coco beans." - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 2 * FOOD_METABOLISM color = "#403010" // rgb: 64, 48, 16 adj_temp = 5 @@ -2498,7 +2525,9 @@ datum ..() M.make_jittery(5) if(adj_temp > 0 && holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) + holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM) + + holder.remove_reagent(src.id, 0.1) return icecoffee @@ -2704,6 +2733,7 @@ datum on_mob_life(var/mob/living/M as mob) M:nutrition += nutriment_factor + holder.remove_reagent(src.id, FOOD_METABOLISM) if(!src.data) data = 1 src.data++ @@ -2749,7 +2779,7 @@ datum name = "Beer" id = "beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 2 * FOOD_METABOLISM color = "#664300" // rgb: 102, 67, 0 on_mob_life(var/mob/living/M as mob) ..() @@ -2877,6 +2907,7 @@ datum 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) @@ -3026,11 +3057,12 @@ datum id = "doctorsdelight" description = "A gulp a day keeps the MediBot away. That's probably for the best." reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM + 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) @@ -3296,14 +3328,14 @@ datum name = "Banana Mama" id = "bananahonk" description = "A drink from Clown Heaven." - nutriment_factor = 1 * REAGENTS_METABOLISM + 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 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#664300" // rgb: 102, 67, 0 changelingsting @@ -3348,5 +3380,5 @@ datum name = "Driest Martini" id = "driestmartini" description = "Only for the experienced. You think you see sand floating in the glass." - nutriment_factor = 1 * REAGENTS_METABOLISM + nutriment_factor = 1 * FOOD_METABOLISM color = "#2E6671" // rgb: 46, 102, 113 From 8de6998d83db13c3f8cc4d0d2613a4d38b6b25b4 Mon Sep 17 00:00:00 2001 From: cib Date: Fri, 18 Jan 2013 23:37:51 +0100 Subject: [PATCH 5/6] Removed space ninja random event. --- code/game/gamemodes/events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index d35b613f63c..8b338e0b96d 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -53,7 +53,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] From 5c97214b978aa3b64c651a3c17d1bd4ab40d99ba Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 20 Jan 2013 18:54:29 +0100 Subject: [PATCH 6/6] Removed an instance of spawning space ninjas I overlooked. This one would cause a space ninja to be spawned on every round, 6 minutes in. --- code/game/gamemodes/events.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 8b338e0b96d..591736f7118 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -21,9 +21,6 @@ // Doesn't necessarily trigger an event, but might. Returns 1 if it did. /proc/event() event = 1 - if(!sent_ninja_to_station) - choose_space_ninja() - return var/minutes_passed = world.time/600