From ce7e72c367a4ec0e48b42bbdf63c08242fad2716 Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Mon, 29 Oct 2012 17:11:54 -0700 Subject: [PATCH 1/4] Fixes what emergency lockers spawn with so masks aren't rarer than diamonds. --- .../crates_lockers/closets/utility_closets.dm | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index adac90b75bf..6151f3babcc 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -22,29 +22,29 @@ /obj/structure/closet/emcloset/New() ..() - if (prob(40)) - new /obj/item/weapon/storage/toolbox/emergency(src) - - switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1))) + switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0))) if ("small") new /obj/item/weapon/tank/emergency_oxygen(src) new /obj/item/weapon/tank/emergency_oxygen(src) - + new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/mask/breath(src) if ("aid") new /obj/item/weapon/tank/emergency_oxygen(src) - new /obj/item/weapon/storage/firstaid/o2(src) - - if ("tank") - new /obj/item/weapon/tank/air(src) - - if ("both") - new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/storage/toolbox/emergency(src) + new /obj/item/clothing/mask/breath(src) + if ("tank") + new /obj/item/weapon/tank/emergency_oxygen/engi(src) + new /obj/item/clothing/mask/breath(src) + new /obj/item/weapon/tank/emergency_oxygen/engi(src) + new /obj/item/clothing/mask/breath(src) + if ("both") + new /obj/item/weapon/storage/toolbox/emergency(src) + new /obj/item/weapon/tank/emergency_oxygen/engi(src) new /obj/item/clothing/mask/breath(src) - if ("nothing") // doot - // teehee + // teehee - Ah, tg coders... if ("delete") del(src) @@ -56,7 +56,7 @@ /obj/structure/closet/emcloset/legacy/New() new /obj/item/weapon/tank/oxygen(src) new /obj/item/clothing/mask/gas(src) - + /* * Fire Closet */ From 7d5ee4cdf5dead74ebe7d5148291028601cc6361 Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Mon, 29 Oct 2012 17:13:50 -0700 Subject: [PATCH 2/4] Fixes AI-less borgs spawning with asimov instead of corporate lawset. --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 98ed068b946..480785f2198 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -81,7 +81,7 @@ icon_state = "secborg" modtype = "Synd" else - laws = new /datum/ai_laws/asimov() + laws = new /datum/ai_laws/nanotrasen() connected_ai = select_active_ai_with_fewest_borgs() if(connected_ai) connected_ai.connected_robots += src From 19bca3e2ef49f4bf7d3f3bbc2b6fa0276a56bea3 Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Thu, 1 Nov 2012 15:43:09 -0700 Subject: [PATCH 3/4] Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm --- .../structures/crates_lockers/closets/utility_closets.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 6151f3babcc..0688babd681 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -32,6 +32,7 @@ new /obj/item/weapon/tank/emergency_oxygen(src) new /obj/item/weapon/storage/toolbox/emergency(src) new /obj/item/clothing/mask/breath(src) + new /obj/item/weapon/storage/firstaid/o2(src) if ("tank") new /obj/item/weapon/tank/emergency_oxygen/engi(src) new /obj/item/clothing/mask/breath(src) @@ -41,6 +42,7 @@ new /obj/item/weapon/storage/toolbox/emergency(src) new /obj/item/weapon/tank/emergency_oxygen/engi(src) new /obj/item/clothing/mask/breath(src) + new /obj/item/weapon/storage/firstaid/o2(src) if ("nothing") // doot From dff741ce201f775b01bbeb1323411bef1ea92ea7 Mon Sep 17 00:00:00 2001 From: Hawk_v3 Date: Fri, 2 Nov 2012 15:29:13 +0000 Subject: [PATCH 4/4] Removing Fatness. --- code/modules/mob/living/carbon/alien/humanoid/life.dm | 4 ++-- code/modules/mob/living/carbon/alien/larva/life.dm | 4 ++-- code/modules/mob/living/carbon/human/examine.dm | 6 +++--- code/modules/mob/living/carbon/human/life.dm | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 6f538b44888..edb8ff7decb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -270,12 +270,12 @@ if(prob(round((50 - nutrition) / 100))) src << "\blue You feel fit again!" mutations.Remove(FAT) - else +/* else if(nutrition > 500) if(prob(5 + round((nutrition - 200) / 2))) src << "\red You suddenly feel blubbery!" mutations.Add(FAT) - + FUCK YOU FATCODE -Hawk */ if (nutrition > 0) nutrition -= HUNGER_FACTOR diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index a23b0a2191c..612b0bb6f8b 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -186,12 +186,12 @@ if(prob(round((50 - nutrition) / 100))) src << "\blue You feel fit again!" mutations.Add(FAT) - else +/* else if(nutrition > 500) if(prob(5 + round((nutrition - max_grown) / 2))) src << "\red You suddenly feel blubbery!" mutations.Add(FAT) - +FUCK YOU MORE FAT CODE -Hawk*/ if (nutrition > 0) nutrition-= HUNGER_FACTOR diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 07e10ad7353..ae3e1168dba 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -226,10 +226,10 @@ if(nutrition < 100) msg += "[t_He] [t_is] severely malnourished.\n" else if(nutrition >= 500) - if(usr.nutrition < 100) + /*if(usr.nutrition < 100) msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n" - else - msg += "[t_He] [t_is] quite chubby.\n" + else*/ + msg += "[t_He] [t_is] quite chubby.\n" msg += "" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f3a0bdebce9..35f38f54777 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -975,7 +975,7 @@ update_mutations(0) update_inv_w_uniform(0) update_inv_wear_suit() - else +/* else if(overeatduration > 500) src << "\red You suddenly feel blubbery!" mutations.Add(FAT) @@ -983,7 +983,7 @@ update_mutations(0) update_inv_w_uniform(0) update_inv_wear_suit() - +AND YOU */ // nutrition decrease if (nutrition > 0 && stat != 2) nutrition = max (0, nutrition - HUNGER_FACTOR)