cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

HONK-A-TONK Update:

Browse Source 
- 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
This commit is contained in:
morikou@gmail.com
2011-01-03 04:02:25 +00:00
parent 09e0bcf987
commit 7560e2fed7
12 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chemistry-Reagents.dm
+7 -1
View File
@@ -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////////////////////////////////
code/WorkInProgress/Chemistry-Tools.dm
+37 -1
View File
@@ -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
code/defines/obj/supplypacks.dm
+4 -3
View File
@@ -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")
code/defines/obj/weapon.dm
-14
View File
@@ -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."
code/game/gamemodes/events.dm
+3 -1
View File
@@ -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
code/game/jobs/jobprocs.dm
+1 -1
View File
@@ -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
code/game/machinery/microwave.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/clown_items.dm
+1 -13
View File
@@ -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
code/modules/admin/admin.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/carbon/human/say.dm
+12
View File
@@ -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)
maps/tgstation.2.0.0.dmm
+1 -1
View File
@@ -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)
tgstation.dme
+1
View File
@@ -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"