From 7560e2fed70f47ce6bdb8334e5cd66879cb05982 Mon Sep 17 00:00:00 2001 From: "morikou@gmail.com" Date: Mon, 3 Jan 2011 04:02:25 +0000 Subject: [PATCH] HONK-A-TONK Update: - Food items don't make you goddamn fat so easily. - Bananas are now edible but still leave a banana peel. - New Disease: Pierrot's Throat. While infected, random words you say are replaced with "honk." At the later stages, you'll randomly say honk as well. See your local doctor with a health analyzer to find the cure. Virus added to virus crate and random/badmin disease event. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@753 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Reagents.dm | 8 +++- code/WorkInProgress/Chemistry-Tools.dm | 38 ++++++++++++++++++- code/defines/obj/supplypacks.dm | 7 ++-- code/defines/obj/weapon.dm | 14 ------- code/game/gamemodes/events.dm | 4 +- code/game/jobs/jobprocs.dm | 2 +- code/game/machinery/microwave.dm | 2 +- .../game/objects/items/weapons/clown_items.dm | 14 +------ code/modules/admin/admin.dm | 2 +- code/modules/mob/living/carbon/human/say.dm | 12 ++++++ maps/tgstation.2.0.0.dmm | 2 +- tgstation.dme | 1 + 12 files changed, 69 insertions(+), 37 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index b226285b2d0..5c21e2e55ab 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -1128,7 +1128,7 @@ datum id = "nutriment" description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." reagent_state = SOLID - nutriment_factor = 25 * REAGENTS_METABOLISM + nutriment_factor = 15 * REAGENTS_METABOLISM on_mob_life(var/mob/M) if(!M) M = holder.my_atom if(prob(50)) M:bruteloss-- @@ -1295,6 +1295,12 @@ datum ..() return + banana + name = "Essence of Banana" + id = "banana" + description = "The raw essence of a banana. HONK" + nutriment_factor = 1 * REAGENTS_METABOLISM + ///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum//////////////////////////////// diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index da1de14f0f6..849305e7c45 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -787,6 +787,9 @@ icon_state = null var/bitesize = 1 + proc/On_Consume() + return + attackby(obj/item/weapon/W as obj, mob/user as mob) return attack_self(mob/user as mob) @@ -839,6 +842,7 @@ if(!reagents.total_volume) if(M == user) user << "\red You finish eating [src]." else user << "\red [M] finishes eating [src]." + On_Consume() del(src) playsound(M.loc,'eatfood.ogg', rand(10,50), 1) return 1 @@ -1239,6 +1243,17 @@ var/list/data = list("virus"= F) reagents.add_reagent("blood", 20, data) +/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat + name = "Pierrot's Throat culture bottle" + desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium." + icon = 'chemical.dmi' + icon_state = "bottle3" + amount_per_transfer_from_this = 5 + New() + ..() + var/datum/disease/F = new /datum/disease/pierrot_throat(0) + var/list/data = list("virus"= F) + reagents.add_reagent("blood", 20, data) /obj/item/weapon/reagent_containers/glass/bottle/cold name = "Rhinovirus culture bottle" @@ -1951,7 +1966,28 @@ reagents.add_reagent("nutriment", 4) bitesize = 2 - +/obj/item/weapon/reagent_containers/food/snacks/banana + name = "Banana" + desc = "A banana." + icon = 'items.dmi' + icon_state = "banana" + item_state = "banana" + On_Consume() + var/mob/M = usr + var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M ) + M << "\blue You peel the banana." + if (M.hand) + M.l_hand = W + else + M.r_hand = W + W.layer = 20 + W.add_fingerprint(M) + New() + ..() + reagents.add_reagent("banana", 5) + bitesize = 5 + src.pixel_x = rand(-5.0, 5) + src.pixel_y = rand(-5.0, 5) ///////////////////////////////////////////////Condiments //Notes by Darem: The condiments food-subtype is for stuff you don't actually eat but you use to modify existing food. They all diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 4f196cb5f78..46264f6507b 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -63,9 +63,9 @@ "/obj/item/weapon/reagent_containers/food/snacks/faggot", "/obj/item/kitchen/egg_box", "/obj/item/weapon/storage/condimentbottles", - "/obj/item/weapon/banana", - "/obj/item/weapon/banana", - "/obj/item/weapon/banana") + "/obj/item/weapon/reagent_containers/food/snacks/banana", + "/obj/item/weapon/reagent_containers/food/snacks/banana", + "/obj/item/weapon/reagent_containers/food/snacks/banana") cost = 5 containertype = "/obj/crate/freezer" containername = "Food crate" @@ -134,6 +134,7 @@ "/obj/item/weapon/reagent_containers/glass/bottle/magnitis", // "/obj/item/weapon/reagent_containers/glass/bottle/wizarditis", worse than GBS if anything // "/obj/item/weapon/reagent_containers/glass/bottle/gbs", No. Just no. + "/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat", "/obj/item/weapon/reagent_containers/glass/bottle/brainrot", "/obj/item/weapon/storage/firstaid/syringes", "/obj/item/weapon/storage/beakerbox") diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6ecad7eeed7..4a2375c0d8b 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -153,20 +153,6 @@ w_class = 3.0 flags = FPRINT | CONDUCT | NOSHIELD | TABLEPASS -/obj/item/weapon/banana - name = "Banana" - desc = "A banana." - icon = 'items.dmi' - icon_state = "banana" - item_state = "banana" - throwforce = 0 - w_class = 1.0 - throw_speed = 4 - throw_range = 20 - New() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) - /obj/item/weapon/bananapeel name = "Banana Peel" desc = "A peel from a banana." diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 6687d69890a..9ac1f2f25a6 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -228,7 +228,7 @@ world << sound('outbreak7.ogg') var/virus_type if(!virus) - virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis) + virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat) else switch(virus) if("fake gbs") @@ -245,6 +245,8 @@ virus_type = /datum/disease/dnaspread if("flu") virus_type = /datum/disease/flu + if("pierrot's throat") + virus_type = /datum/disease/pierrot_throat for(var/mob/living/carbon/human/H in world) if((H.virus) || (H.stat == 2)) continue diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index dfb6bc50170..e0d0765c262 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -304,7 +304,7 @@ src.equip_if_possible(new /obj/item/clothing/under/clown(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask) - src.equip_if_possible(new /obj/item/weapon/banana(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/banana(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/stamp/clown(src), slot_in_backpack) src.mutations |= 16 diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm index ea98faceb6b..93b8497ab33 100644 --- a/code/game/machinery/microwave.dm +++ b/code/game/machinery/microwave.dm @@ -61,7 +61,7 @@ /datum/recipe/pie flour_amount = 2 - extra_item = /obj/item/weapon/banana + extra_item = /obj/item/weapon/reagent_containers/food/snacks/banana creates = "/obj/item/weapon/reagent_containers/food/snacks/pie" /datum/recipe/donkpocket diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index f08d08478a3..2c88d0cc12c 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -1,23 +1,11 @@ /* CONTAINS: -BANANANANANA +NO MORE BANANA, NOW YOU CAN EAT IT. GO SEE OTHER FOOD STUFFS. BANANA PEEL BIKE HORN */ -/obj/item/weapon/banana/attack_self(mob/M as mob) - var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M ) - M << "\blue You peel the banana." - if (M.hand) - M.l_hand = W - else - M.r_hand = W - W.layer = 20 - W.add_fingerprint(M) - del(src) - return - /obj/item/weapon/bananapeel/HasEntered(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/M = AM diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 962948e7ffa..6d390817069 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1180,7 +1180,7 @@ var/showadminmessages = 1 viral_outbreak() message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1) else - var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu") + var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat") var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses viral_outbreak(V) message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index d681b6045db..c2c5843f3bf 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -2,6 +2,18 @@ if(src.mutantrace == "lizard") if(copytext(message, 1, 2) != "*") message = dd_replaceText(message, "s", stutter("ss")) + if(istype(src.virus, /datum/disease/pierrot_throat)) + var/list/temp_message = dd_text2list(message, " ") + var/list/pick_list = list() + for(var/i = 1, i <= temp_message.len, i++) + pick_list += i + for(var/i=1, ((i <= src.virus.stage) && (i <= temp_message.len)), i++) + if(prob(5 * src.virus.stage)) + var/H = pick(pick_list) + if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue + temp_message[H] = "HONK" + pick_list -= H + message = dd_list2text(temp_message, " ") ..(message) /mob/living/carbon/human/say_understands(var/other) diff --git a/maps/tgstation.2.0.0.dmm b/maps/tgstation.2.0.0.dmm index cfce5965fe2..9f4bf9c201a 100644 --- a/maps/tgstation.2.0.0.dmm +++ b/maps/tgstation.2.0.0.dmm @@ -6751,7 +6751,7 @@ "czQ" = (/obj/table/woodentable{dir = 1; icon_state = "woodentable"; tag = "icon-woodentable (NORTH)"},/obj/item/clothing/shoes/clown_shoes,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "czR" = (/obj/table/woodentable{dir = 1; icon_state = "woodentable"; tag = "icon-woodentable (NORTH)"},/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "czS" = (/obj/table/woodentable{dir = 5},/obj/item/clothing/mask/gas/clown_hat,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) -"czT" = (/obj/item/weapon/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) +"czT" = (/obj/item/weapon/reagent_containers/food/snacks/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "czU" = (/obj/table/woodentable{dir = 10; icon_state = "woodentable"},/obj/item/weapon/stamp/clown,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "czV" = (/obj/table/woodentable,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "czW" = (/obj/table/woodentable,/obj/item/clothing/under/clown,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) diff --git a/tgstation.dme b/tgstation.dme index c87ff857601..2c07aaf1174 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -187,6 +187,7 @@ #include "code\datums\diseases\gbs.dm" #include "code\datums\diseases\jungle_fever.dm" #include "code\datums\diseases\magnitis.dm" +#include "code\datums\diseases\pierrot_throat.dm" #include "code\datums\diseases\plasmatoid.dm" #include "code\datums\diseases\robotic_transformation.dm" #include "code\datums\diseases\wizarditis.dm"