cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 12:06:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7719 from Zuhayr/species_tweaks

Browse Source 
Species tweaks.
This commit is contained in:
Chinsky
2015-02-03 18:11:18 +03:00
parent ac8043d926 8756bb99bd
commit 74df9669a0
7 changed files with 175 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+11 -13
View File
@@ -2018,22 +2018,20 @@ datum
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()
*/
..()
return
nutriment/protein // Bad for Skrell!
name = "animal protein"
id = "protein"
color = "#440000"
on_mob_life(var/mob/living/M, var/alien)
if(alien && alien == IS_SKRELL)
M.adjustToxLoss(0.5)
M.nutrition -= nutriment_factor
..()
lipozine
name = "Lipozine" // The anti-nutriment.
id = "lipozine"
code/modules/reagents/reagent_containers/food/snacks.dm
+94 -87
View File
@@ -469,7 +469,7 @@
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("protein", 2)
throw_impact(atom/hit_atom)
..()
@@ -533,7 +533,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 3)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
bitesize = 1
@@ -546,7 +546,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/flour
name = "flour"
@@ -566,7 +566,7 @@
New()
..()
reagents.add_reagent("nutriment", rand(3,5))
reagents.add_reagent("protein", rand(3,5))
reagents.add_reagent("toxin", rand(1,3))
src.bitesize = 3
@@ -612,7 +612,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
reagents.add_reagent("carpotoxin", 3)
src.bitesize = 6
@@ -624,7 +624,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3
@@ -659,7 +659,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("protein", 12)
reagents.add_reagent("hyperzine", 5)
src.bitesize = 3
@@ -671,7 +671,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/meatball
@@ -682,7 +682,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -693,7 +693,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -704,7 +704,8 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
var/warm = 0
proc/cooltime() //Not working, derp?
@@ -723,7 +724,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
reagents.add_reagent("alkysine", 6)
bitesize = 2
@@ -750,7 +751,7 @@
icon_state = "hburger"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger
@@ -759,6 +760,7 @@
icon_state = "cheeseburger"
New()
..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger
@@ -769,7 +771,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fishburger
@@ -780,7 +783,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3
@@ -828,7 +831,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/clownburger
@@ -839,11 +842,6 @@
New()
..()
/*
var/datum/disease/F = new /datum/disease/pierrot_throat(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 4, data)
*/
reagents.add_reagent("nutriment", 6)
bitesize = 2
@@ -868,7 +866,7 @@
//var/herp = 0
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -945,7 +943,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -970,7 +968,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofupie
@@ -1025,7 +1023,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
@@ -1037,7 +1035,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
@@ -1050,7 +1048,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
@@ -1062,7 +1060,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofukabob
@@ -1079,14 +1077,15 @@
/obj/item/weapon/reagent_containers/food/snacks/cubancarp
name = "Cuban Carp"
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
desc = "A sandwich that burns your tongue and then leaves it numb!"
icon_state = "cubancarp"
trash = /obj/item/trash/plate
filling_color = "#E9ADFF"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("capsaicin", 3)
bitesize = 3
@@ -1120,7 +1119,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
@@ -1178,7 +1177,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fries
@@ -1225,7 +1225,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 2)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
@@ -1260,7 +1261,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
bitesize = 3
@@ -1314,7 +1315,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 8)
reagents.add_reagent("water", 5)
bitesize = 5
@@ -1332,13 +1333,13 @@
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
desc = "Smells like copper"
desc = "Smells like copper."
icon_state = "tomatosoup"
filling_color = "#FF0000"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 10)
reagents.add_reagent("water", 5)
bitesize = 5
@@ -1454,7 +1455,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
@@ -1469,7 +1471,8 @@
trash = /obj/item/trash/snack_bowl
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
@@ -1503,7 +1506,7 @@
New()
..()
reagents.add_reagent("nutriment",10)
reagents.add_reagent("protein", 10)
afterattack(obj/O as obj, mob/user as mob, proximity)
if(!proximity) return
@@ -1568,24 +1571,18 @@
desc = "Still wrapped in some paper."
icon_state = "monkeycubewrap"
wrapped = 1
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube
name = "farwa cube"
monkey_type = /mob/living/carbon/monkey/tajara
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube
name = "farwa cube"
monkey_type =/mob/living/carbon/monkey/tajara
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
name = "stok cube"
monkey_type = /mob/living/carbon/monkey/unathi
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube
name = "stok cube"
monkey_type =/mob/living/carbon/monkey/unathi
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
name = "neaera cube"
monkey_type = /mob/living/carbon/monkey/skrell
@@ -1613,7 +1610,8 @@
New()
..()
reagents.add_reagent("nutriment", 14)
reagents.add_reagent("protein", 10)
reagents.add_reagent("nutriment", 4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/enchiladas
@@ -1625,7 +1623,8 @@
New()
..()
reagents.add_reagent("nutriment",8)
reagents.add_reagent("protein", 6)
reagents.add_reagent("nutriment",2)
reagents.add_reagent("capsaicin", 6)
bitesize = 4
@@ -1638,7 +1637,7 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 10)
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
@@ -1665,7 +1664,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3
@@ -1678,7 +1678,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
@@ -1690,7 +1691,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carbon", 2)
bitesize = 2
@@ -1703,7 +1705,8 @@
New()
..()
reagents.add_reagent("nutriment", 7)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
@@ -1740,7 +1743,8 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
@@ -1836,7 +1840,7 @@
/obj/item/weapon/reagent_containers/food/snacks/ricepudding
name = "Rice Pudding"
desc = "Where's the Jam!"
desc = "Where's the jam?"
icon_state = "rpudding"
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
@@ -1868,7 +1872,8 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -1879,7 +1884,8 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
@@ -1914,7 +1920,8 @@
New()
..()
reagents.add_reagent("nutriment", 50)
reagents.add_reagent("protein", 25)
reagents.add_reagent("nutriment", 25)
bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
@@ -2043,7 +2050,7 @@
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("protein", 5)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
@@ -2055,19 +2062,7 @@
New()
..()
switch(rand(1,6))
if(1)
name = "borsch"
if(2)
name = "bortsch"
if(3)
name = "borstch"
if(4)
name = "borsh"
if(5)
name = "borshch"
if(6)
name = "borscht"
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
reagents.add_reagent("nutriment", 8)
bitesize = 2
@@ -2092,7 +2087,8 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("protein", 2)
reagents.add_reagent("nutriment", 6)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart
@@ -2125,7 +2121,8 @@
filling_color = "#FF7575"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
@@ -2145,7 +2142,8 @@
filling_color = "#8AFF75"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
@@ -2228,7 +2226,8 @@
filling_color = "#E6AEDB"
New()
..()
reagents.add_reagent("nutriment", 25)
reagents.add_reagent("protein", 25)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("alkysine", 10)
bitesize = 2
@@ -2249,7 +2248,8 @@
filling_color = "#FAF7AF"
New()
..()
reagents.add_reagent("nutriment", 25)
reagents.add_reagent("protein", 15)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
@@ -2364,7 +2364,7 @@
filling_color = "#FFF700"
New()
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("protein", 20)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
@@ -2389,7 +2389,7 @@
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
name = "Birthday Cake slice"
desc = "A slice of your birthday"
desc = "A slice of your birthday."
icon_state = "birthdaycakeslice"
trash = /obj/item/trash/plate
filling_color = "#FFD6D6"
@@ -2426,7 +2426,8 @@
filling_color = "#FFF896"
New()
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("protein", 15)
reagents.add_reagent("nutriment", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
@@ -2511,7 +2512,8 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 40)
reagents.add_reagent("nutriment", 35)
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
bitesize = 2
@@ -2530,7 +2532,7 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 50)
reagents.add_reagent("protein", 50)
reagents.add_reagent("tomatojuice", 6)
bitesize = 2
@@ -2550,6 +2552,7 @@
New()
..()
reagents.add_reagent("nutriment", 35)
reagents.add_reagent("protein", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
@@ -2568,6 +2571,7 @@
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("imidazoline", 12)
bitesize = 2
@@ -2799,6 +2803,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("nutriment", 3)
// Dough + rolling pin = flat dough
@@ -2818,6 +2823,7 @@
slices_num = 3
New()
..()
reagents.add_reagent("protein", 1)
reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/doughslice
@@ -2891,7 +2897,8 @@
bitesize = 3
New()
..()
reagents.add_reagent("nutriment", 7)
reagents.add_reagent("protein", 3)
reagents.add_reagent("nutriment", 4)
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
name = "raw cutlet"
@@ -2901,7 +2908,7 @@
bitesize = 1
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -2911,7 +2918,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/rawmeatball
name = "raw meatball"
@@ -2921,7 +2928,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -2930,7 +2937,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/flatbread
name = "flatbread"