cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly [MDB IGNORE] (#15506)

Browse Source 
* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly (#68899)

* Splits up 'gross' food from 'carrion'

* Adds a couple of missed burgers.
Moths dislike Carrion rather than it being poison to them.

* BEES is now BUGS

* It's always safe and a good idea to use find/replace

* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly

* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-08-17 17:40:21 +01:00
committed by GitHub
co-authored by Jacquerel Tom
parent 7ead4bc47f
commit 3ac5456f79
30 changed files with 83 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/felinid.dm
+1 -1
View File
@@ -15,7 +15,7 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/felinid
disliked_food = GROSS | CLOTH | RAW
liked_food = SEAFOOD | ORANGES | BUGS
liked_food = SEAFOOD | ORANGES | BUGS | GORE
var/original_felinid = TRUE //set to false for felinids created by mass-purrbation
payday_modifier = 0.75
ass_image = 'icons/ass/asscat.png'
code/modules/mob/living/carbon/human/species_types/flypeople.dm
+1 -1
View File
@@ -13,7 +13,7 @@
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
meat = /obj/item/food/meat/slab/human/mutant/fly
mutanteyes = /obj/item/organ/internal/eyes/fly
liked_food = GROSS
liked_food = GROSS | GORE
disliked_food = NONE
toxic_food = NONE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
code/modules/mob/living/carbon/human/species_types/golems.dm
+1 -1
View File
@@ -1190,7 +1190,7 @@
say_mod = "rattles"
prefix = "Bone"
special_names = list("Head", "Broth", "Fracture", "Rattler", "Appetit")
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
toxic_food = null
species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES,HAS_BONE)
inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
code/modules/mob/living/carbon/human/species_types/humans.dm
+1 -1
View File
@@ -11,7 +11,7 @@
mutant_bodyparts = list("wings" = "None")
use_skintones = 1
skinned_type = /obj/item/stack/sheet/animalhide/human
disliked_food = GROSS | RAW | CLOTH | BUGS
disliked_food = GROSS | RAW | CLOTH | BUGS | GORE
liked_food = JUNKFOOD | FRIED
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
payday_modifier = 1
code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+2 -2
View File
@@ -33,8 +33,8 @@
meat = /obj/item/food/meat/slab/human/mutant/lizard
skinned_type = /obj/item/stack/sheet/animalhide/lizard
exotic_bloodtype = "L"
disliked_food = GRAIN | DAIRY | CLOTH
liked_food = GROSS | MEAT | SEAFOOD | NUTS | BUGS
disliked_food = GRAIN | DAIRY | CLOTH | GROSS
liked_food = GORE | MEAT | SEAFOOD | NUTS | BUGS
inert_mutation = /datum/mutation/human/firebreath
death_sound = 'sound/voice/lizard/deathsound.ogg'
wings_icons = list("Dragon")
code/modules/mob/living/carbon/human/species_types/mothmen.dm
+1 -1
View File
@@ -19,7 +19,7 @@
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/food/meat/slab/human/mutant/moth
liked_food = VEGETABLES | DAIRY | CLOTH
disliked_food = FRUIT | GROSS | BUGS
disliked_food = FRUIT | GROSS | BUGS | GORE
toxic_food = MEAT | RAW | SEAFOOD
mutanteyes = /obj/item/organ/internal/eyes/moth
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
code/modules/mob/living/carbon/human/species_types/skeletons.dm
+1 -1
View File
@@ -33,7 +33,7 @@
mutantstomach = /obj/item/organ/internal/stomach/bone
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
wings_icons = list("Skeleton")
//They can technically be in an ERT
changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN
code/modules/mob/living/carbon/human/species_types/zombies.dm
+1 -1
View File
@@ -31,7 +31,7 @@
mutanttongue = /obj/item/organ/internal/tongue/zombie
var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg')
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN
bodytemp_normal = T0C // They have no natural body heat, the environment regulates body temp
bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_EXIST // Take damage at fire temp
code/modules/mob/living/simple_animal/friendly/mouse.dm
+2 -1
View File
@@ -200,7 +200,7 @@
bite_consumption = 3
eatverbs = list("devour")
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtypes = GROSS | MEAT | RAW
foodtypes = GORE | MEAT | RAW
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
decomp_req_handle = TRUE
ant_attracting = FALSE
@@ -243,5 +243,6 @@
desc = "A dead rodent, consumed by mold and rot. There is a slim chance that a lizard might still eat it."
icon_state = "mouse_gray_dead"
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mold = 10)
foodtypes = GORE | MEAT | RAW | GROSS
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5, /datum/reagent/consumable/mold = 10)
preserved_food = TRUE
code/modules/mob/living/simple_animal/hostile/bees.dm
+6 -2
View File
@@ -10,6 +10,8 @@
#define BEE_POLLINATE_PEST_CHANCE 33
#define BEE_POLLINATE_POTENCY_CHANCE 50
#define BEE_FOODGROUPS RAW | MEAT | GORE | BUGS
/mob/living/simple_animal/hostile/bee
name = "bee"
desc = "Buzzy buzzy bee, stingy sti- Ouch!"
@@ -75,7 +77,7 @@
var/list/reee = list(/datum/reagent/consumable/nutriment/vitamin = 5)
if(beegent)
reee[beegent.type] = 5
holder.AddComponent(/datum/component/edible, reee, null, RAW | MEAT | GROSS, 10, 0, list("bee"), null, 10)
holder.AddComponent(/datum/component/edible, reee, null, BEE_FOODGROUPS, 10, 0, list("bee"), null, 10)
L.visible_message(span_warning("[L] scoops up [src]!"))
L.put_in_hands(holder)
@@ -378,7 +380,7 @@
/obj/item/trash/bee/Initialize(mapload)
. = ..()
AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment/vitamin = 5), null, RAW | MEAT | GROSS, 10, 0, list("bee"), null, 10)
AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment/vitamin = 5), null, BEE_FOODGROUPS, 10, 0, list("bee"), null, 10)
AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
/obj/item/trash/bee/update_overlays()
@@ -386,3 +388,5 @@
var/mutable_appearance/body_overlay = mutable_appearance(icon = icon, icon_state = "bee_item_overlay")
body_overlay.color = beegent ? beegent.color : BEE_DEFAULT_COLOUR
. += body_overlay
#undef BEE_FOODGROUPS