cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the empty type of /snacks (#26010)

Browse Source 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-29 14:46:04 +00:00
committed by GitHub
parent 2e2569f1db
commit 098b13bb33
222 changed files with 3300 additions and 3347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "alien"
icon_state = "alien_s"
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
butcher_results = list(/obj/item/food/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
var/caste = ""
var/alt_icon = 'icons/mob/alienleap.dmi' //used to switch between the two alien icon files.
var/custom_pixel_x_offset = 0 //for admin fuckery.
code/modules/mob/living/carbon/alien/larva/larva.dm
+1 -1
View File
@@ -7,7 +7,7 @@
maxHealth = 25
health = 25
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat = 1)
butcher_results = list(/obj/item/food/monstermeat/xenomeat = 1)
density = FALSE
var/temperature_resistance = T0C+75
code/modules/mob/living/carbon/carbon_procs.dm
+1 -1
View File
@@ -1089,7 +1089,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return FALSE
var/fullness = nutrition + 10
if(istype(to_eat, /obj/item/food/snacks))
if(istype(to_eat, /obj/item/food))
for(var/datum/reagent/consumable/C in reagents.reagent_list) // We add the nutrition value of what we're currently digesting
fullness += C.nutriment_factor * C.volume / (C.metabolization_rate * metabolism_efficiency)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -462,7 +462,7 @@ emp_act
return FALSE
if(HAS_TRAIT(I, TRAIT_BUTCHERS_HUMANS) && stat == DEAD && user.a_intent == INTENT_HARM)
var/obj/item/food/snacks/meat/human/newmeat = new /obj/item/food/snacks/meat/human(get_turf(loc))
var/obj/item/food/meat/human/newmeat = new /obj/item/food/meat/human(get_turf(loc))
newmeat.name = real_name + newmeat.name
newmeat.subjectname = real_name
newmeat.subjectjob = job
code/modules/mob/living/carbon/human/species/monkey.dm
+1 -1
View File
@@ -64,7 +64,7 @@
..()
H.real_name = get_random_name()
H.name = H.real_name
H.butcher_results = list(/obj/item/food/snacks/meat/monkey = 5)
H.butcher_results = list(/obj/item/food/meat/monkey = 5)
/datum/species/monkey/handle_dna(mob/living/carbon/human/H, remove)
..()
code/modules/mob/living/simple_animal/constructs.dm
+1 -1
View File
@@ -22,7 +22,7 @@
pressure_resistance = 100
universal_speak = TRUE
AIStatus = AI_OFF //normal constructs don't have AI
loot = list(/obj/item/food/snacks/ectoplasm)
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
deathmessage = "collapses in a shattered heap."
var/construct_type = "shade"
code/modules/mob/living/simple_animal/friendly/bunny.dm
+1 -1
View File
@@ -12,7 +12,7 @@
see_in_dark = 6
maxHealth = 10
health = 10
butcher_results = list(/obj/item/food/snacks/meat = 1)
butcher_results = list(/obj/item/food/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
code/modules/mob/living/simple_animal/friendly/butterfly.dm
+1 -1
View File
@@ -21,7 +21,7 @@
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC | MOB_BUG
butcher_results = list(/obj/item/food/snacks/meat = 0)
butcher_results = list(/obj/item/food/meat = 0)
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/butterfly/Initialize(mapload) //Not the poor butterfly!
code/modules/mob/living/simple_animal/friendly/cat.dm
+4 -4
View File
@@ -17,7 +17,7 @@
mob_size = MOB_SIZE_SMALL
animal_species = /mob/living/simple_animal/pet/cat
childtype = list(/mob/living/simple_animal/pet/cat/kitten)
butcher_results = list(/obj/item/food/snacks/meat = 3)
butcher_results = list(/obj/item/food/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -233,8 +233,8 @@
butcher_results = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
/obj/item/food/snacks/birthdaycakeslice = 3,
/obj/item/food/snacks/meat/slab = 2
/obj/item/food/birthdaycakeslice = 3,
/obj/item/food/meat/slab = 2
)
response_harm = "takes a bite out of"
attacked_sound = "sound/items/eatfood.ogg"
@@ -254,7 +254,7 @@
final_bites = 0
if(health < maxHealth)
adjustBruteLoss(-4)
for(var/obj/item/food/snacks/donut/D in range(1, src))
for(var/obj/item/food/donut/D in range(1, src))
if(D.icon_state != "donut2")
D.name = "frosted donut"
D.icon_state = "donut2"
code/modules/mob/living/simple_animal/friendly/crab.dm
+1 -1
View File
@@ -10,7 +10,7 @@
emote_see = list("clacks")
speak_chance = 1
turns_per_move = 5
butcher_results = list(/obj/item/food/snacks/meat = 1)
butcher_results = list(/obj/item/food/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
code/modules/mob/living/simple_animal/friendly/deer.dm
+1 -1
View File
@@ -11,7 +11,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 0 //I'm so funny
butcher_results = list(/obj/item/food/snacks/meat = 4)
butcher_results = list(/obj/item/food/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+1 -1
View File
@@ -213,7 +213,7 @@
return TRUE
// Consumes plant matter other than weeds to evolve
/mob/living/simple_animal/diona/proc/consume(obj/item/food/snacks/grown/G)
/mob/living/simple_animal/diona/proc/consume(obj/item/food/grown/G)
if(nutrition >= nutrition_need) // Prevents griefing by overeating plant items without evolving.
to_chat(src, "<span class='warning'>You're too full to consume this! Perhaps it's time to grow bigger...</span>")
else
code/modules/mob/living/simple_animal/friendly/dog.dm
+3 -3
View File
@@ -70,7 +70,7 @@
icon_state = "corgi"
icon_living = "corgi"
icon_dead = "corgi_dead"
butcher_results = list(/obj/item/food/snacks/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
butcher_results = list(/obj/item/food/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
collar_type = "corgi"
@@ -435,7 +435,7 @@
stop_automated_movement = FALSE
var/obj/item/possible_target = null
for(var/I in snack_range)
if(istype(I, /obj/item/food/snacks)) // Noms
if(istype(I, /obj/item/food)) // Noms
possible_target = I
break
else if(istype(I, /obj/item/paper)) // Important noms
@@ -652,7 +652,7 @@
icon_state = "pug"
icon_living = "pug"
icon_dead = "pug_dead"
butcher_results = list(/obj/item/food/snacks/meat/pug = 3)
butcher_results = list(/obj/item/food/meat/pug = 3)
collar_type = "pug"
/mob/living/simple_animal/pet/dog/pug/handle_automated_movement()
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+12 -12
View File
@@ -12,7 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat = 4)
butcher_results = list(/obj/item/food/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -122,7 +122,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat/slab = 6)
butcher_results = list(/obj/item/food/meat/slab = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -202,7 +202,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 2
butcher_results = list(/obj/item/food/snacks/meat/chicken = 1)
butcher_results = list(/obj/item/food/meat/chicken = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -267,9 +267,9 @@ GLOBAL_VAR_INIT(chicken_count, 0)
density = FALSE
speak_chance = 2
turns_per_move = 3
butcher_results = list(/obj/item/food/snacks/meat/chicken = 2)
var/egg_type = /obj/item/food/snacks/egg
var/food_type = /obj/item/food/snacks/grown/wheat
butcher_results = list(/obj/item/food/meat/chicken = 2)
var/egg_type = /obj/item/food/egg
var/food_type = /obj/item/food/grown/wheat
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -341,7 +341,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
if(GLOB.chicken_count < MAX_CHICKENS && prob(25))
START_PROCESSING(SSobj, E)
/obj/item/food/snacks/egg/process()
/obj/item/food/egg/process()
if(isturf(loc))
amount_grown += rand(1,2)
if(amount_grown >= 100)
@@ -392,7 +392,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat/ham = 6)
butcher_results = list(/obj/item/food/meat/ham = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -418,7 +418,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat = 4)
butcher_results = list(/obj/item/food/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -443,7 +443,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat = 6)
butcher_results = list(/obj/item/food/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -468,7 +468,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat = 6)
butcher_results = list(/obj/item/food/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -493,7 +493,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat = 6)
butcher_results = list(/obj/item/food/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
code/modules/mob/living/simple_animal/friendly/fox.dm
+1 -1
View File
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat = 3)
butcher_results = list(/obj/item/food/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
code/modules/mob/living/simple_animal/friendly/lizard.dm
+1 -1
View File
@@ -22,7 +22,7 @@
mob_size = MOB_SIZE_SMALL
can_hide = TRUE
pass_door_while_hidden = TRUE
butcher_results = list(/obj/item/food/snacks/meat = 1)
butcher_results = list(/obj/item/food/meat = 1)
can_collar = TRUE
mob_biotypes = MOB_ORGANIC | MOB_BEAST | MOB_REPTILE
gold_core_spawnable = FRIENDLY_SPAWN
code/modules/mob/living/simple_animal/friendly/mouse.dm
+2 -2
View File
@@ -16,7 +16,7 @@
see_in_dark = 6
maxHealth = 5
health = 5
butcher_results = list(/obj/item/food/snacks/meat = 1)
butcher_results = list(/obj/item/food/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stamps on"
@@ -92,7 +92,7 @@
..()
/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things
if(istype(AM, /obj/item/food/snacks/cheesewedge))
if(istype(AM, /obj/item/food/cheesewedge))
return ..() // Get dem
if(show_message)
to_chat(src, "<span class='warning'>You are too small to pull anything except cheese.</span>")
code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
+2 -2
View File
@@ -10,7 +10,7 @@
mob_size = MOB_SIZE_SMALL
ventcrawler = VENTCRAWLER_ALWAYS
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
butcher_results = list(/obj/item/food/snacks/meat = 1)
butcher_results = list(/obj/item/food/meat = 1)
minbodytemp = 0
blood_color = "#b9ae9c"
@@ -102,7 +102,7 @@
qdel(src)
return TRUE
/mob/living/simple_animal/nian_caterpillar/proc/consume(obj/item/food/snacks/G)
/mob/living/simple_animal/nian_caterpillar/proc/consume(obj/item/food/G)
if(nutrition >= nutrition_need) // Prevents griefing by overeating food items without evolving.
return to_chat(src, "<span class='warning'>You're too full to consume this! Perhaps it's time to grow bigger...</span>")
visible_message("<span class='warning'>[src] ravenously consumes [G].</span>", "<span class='notice'>You ravenously devour [G].</span>")
code/modules/mob/living/simple_animal/friendly/sloth.dm
+1 -1
View File
@@ -13,7 +13,7 @@
faction = list("neutral", "jungle")
speak_chance = 1
turns_per_move = 5
butcher_results = list(/obj/item/food/snacks/meat = 3)
butcher_results = list(/obj/item/food/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
code/modules/mob/living/simple_animal/hostile/alien_types.dm
+3 -3
View File
@@ -11,7 +11,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
butcher_results = list(/obj/item/food/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
maxHealth = 125
health = 125
harm_intent_damage = 5
@@ -92,7 +92,7 @@
retreat_distance = 5
minimum_distance = 5
move_to_delay = 4
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 4, /obj/item/stack/sheet/animalhide/xeno = 1)
butcher_results = list(/obj/item/food/monstermeat/xenomeat= 4, /obj/item/stack/sheet/animalhide/xeno = 1)
projectiletype = /obj/item/projectile/neurotox
projectilesound = 'sound/weapons/pierce.ogg'
status_flags = 0
@@ -140,7 +140,7 @@
move_to_delay = 4
maxHealth = 400
health = 400
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
butcher_results = list(/obj/item/food/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
/obj/item/projectile/neurotox
code/modules/mob/living/simple_animal/hostile/bat.dm
+1 -1
View File
@@ -9,7 +9,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
butcher_results = list(/obj/item/food/snacks/meat = 1)
butcher_results = list(/obj/item/food/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
code/modules/mob/living/simple_animal/hostile/bear.dm
+5 -5
View File
@@ -14,7 +14,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1)
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -44,14 +44,14 @@
icon_state = "black_bear"
icon_living = "black_bear"
icon_dead = "black_bear_dead"
butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/black = 1)
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/black = 1)
/mob/living/simple_animal/hostile/bear/brown
name = "brown bear"
icon_state = "brown_bear"
icon_living = "brown_bear"
icon_dead = "brown_bear_dead"
butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1)
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1)
/mob/living/simple_animal/hostile/bear/polar
name = "polar bear"
@@ -59,7 +59,7 @@
icon_state = "polar_bear"
icon_living = "polar_bear"
icon_dead = "polar_bear_dead"
butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/polar = 1)
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/polar = 1)
//SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!!
/mob/living/simple_animal/hostile/bear/Hudson
@@ -68,7 +68,7 @@
icon_state = "combat_bear"
icon_living = "combat_bear"
icon_dead = "combat_bear_dead"
butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1)
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1)
/mob/living/simple_animal/hostile/bear/Hudson/Initialize(mapload)
. = ..()
code/modules/mob/living/simple_animal/hostile/carp.dm
+1 -1
View File
@@ -11,7 +11,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/snacks/carpmeat = 2)
butcher_results = list(/obj/item/food/carpmeat = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
code/modules/mob/living/simple_animal/hostile/feral_cat.dm
+1 -1
View File
@@ -18,7 +18,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/snacks/meat/slab = 2)
butcher_results = list(/obj/item/food/meat/slab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+2 -2
View File
@@ -14,7 +14,7 @@
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
footstep_type = FOOTSTEP_MOB_CLAW
butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat = 2, /obj/item/food/snacks/monstermeat/spiderleg = 8)
butcher_results = list(/obj/item/food/monstermeat/spidermeat = 2, /obj/item/food/monstermeat/spiderleg = 8)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -65,7 +65,7 @@
icon_state = "nurse"
icon_living = "nurse"
icon_dead = "nurse_dead"
butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat = 2, /obj/item/food/snacks/monstermeat/spiderleg = 8, /obj/item/food/snacks/monstermeat/spidereggs = 4)
butcher_results = list(/obj/item/food/monstermeat/spidermeat = 2, /obj/item/food/monstermeat/spiderleg = 8, /obj/item/food/monstermeat/spidereggs = 4)
maxHealth = 40
health = 40
code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+1 -1
View File
@@ -9,7 +9,7 @@
speak_chance = 80
maxHealth = 220
health = 220
butcher_results = list(/obj/item/food/snacks/meat/slab/gorilla = 4)
butcher_results = list(/obj/item/food/meat/slab/gorilla = 4)
response_help = "prods"
response_disarm = "challenges"
response_harm = "thumps"
code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
+1 -1
View File
@@ -14,7 +14,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
butcher_results = list(/obj/item/food/snacks/meat = 3)
butcher_results = list(/obj/item/food/meat = 3)
faction = list("hostile", "jungle")
response_help = "pets the"
response_disarm = "gently pushes aside the"
code/modules/mob/living/simple_animal/hostile/killertomato.dm
+1 -1
View File
@@ -10,7 +10,7 @@
maxHealth = 30
health = 30
see_in_dark = 3
butcher_results = list(/obj/item/food/snacks/meat/tomatomeat = 2)
butcher_results = list(/obj/item/food/meat/tomatomeat = 2)
response_help = "prods"
response_disarm = "pushes aside"
response_harm = "smacks"
code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
+2 -2
View File
@@ -90,7 +90,7 @@
throw_message = "does nothing to the tough hide of the"
pre_attack_icon = "goliath2"
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle
butcher_results = list(/obj/item/food/snacks/monstermeat/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
butcher_results = list(/obj/item/food/monstermeat/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
loot = list()
stat_attack = UNCONSCIOUS
robust_searching = TRUE
@@ -109,7 +109,7 @@
pre_attack_icon = "Goliath_preattack"
throw_message = "does nothing to the rocky hide of the"
loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
butcher_results = list(/obj/item/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/bone = 2)
butcher_results = list(/obj/item/food/monstermeat/goliath= 2, /obj/item/stack/sheet/bone = 2)
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle/ancient
crusher_drop_mod = 100 //These things are rare (1/100 per spawner). You shouldn't have to hope for another stroke of luck to get it's trophy after finding it
wander = FALSE
code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+1 -1
View File
@@ -387,7 +387,7 @@
belt = null
backpack_contents = list()
if(prob(70))
backpack_contents += pick(/obj/item/stamp/clown, /obj/item/reagent_containers/spray/waterflower, /obj/item/food/snacks/grown/banana, /obj/item/megaphone)
backpack_contents += pick(/obj/item/stamp/clown, /obj/item/reagent_containers/spray/waterflower, /obj/item/food/grown/banana, /obj/item/megaphone)
if(prob(30))
backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pickweight(list(1 = 3, 2 = 2, 3 = 1)))
if(prob(10))
code/modules/mob/living/simple_animal/hostile/mushroom.dm
+3 -3
View File
@@ -9,7 +9,7 @@
turns_per_move = 1
maxHealth = 10
health = 10
butcher_results = list(/obj/item/food/snacks/hugemushroomslice = 1)
butcher_results = list(/obj/item/food/hugemushroomslice = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "whacks"
@@ -152,7 +152,7 @@
bruised = 1
/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/food/snacks/grown/mushroom))
if(istype(I, /obj/item/food/grown/mushroom))
if(stat == DEAD && !recovery_cooldown)
Recover()
qdel(I)
@@ -182,7 +182,7 @@
/mob/living/simple_animal/hostile/mushroom/harvest()
var/counter
for(counter=0, counter<=powerlevel, counter++)
var/obj/item/food/snacks/hugemushroomslice/S = new (src.loc)
var/obj/item/food/hugemushroomslice/S = new (src.loc)
S.reagents.add_reagent("psilocybin", powerlevel)
S.reagents.add_reagent("omnizine", powerlevel)
S.reagents.add_reagent("synaptizine", powerlevel)
code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+2 -2
View File
@@ -8,7 +8,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/snacks/carpmeat = 1)
butcher_results = list(/obj/item/food/carpmeat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -68,7 +68,7 @@
melee_damage_lower = 2
melee_damage_upper = 2
speak_emote = list("blurps")
butcher_results = list(/obj/item/food/snacks/salmonmeat = 1)
butcher_results = list(/obj/item/food/salmonmeat = 1)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
code/modules/mob/living/simple_animal/hostile/retaliate/kangaroo.dm
+1 -1
View File
@@ -13,7 +13,7 @@
emote_hear = list("bark")
maxHealth = 150
health = 150
butcher_results = list(/obj/item/food/snacks/meat/kangaroo = 6)
butcher_results = list(/obj/item/food/meat/kangaroo = 6)
harm_intent_damage = 3
melee_damage_lower = 5 // avg damage 12.5 without kick, (12.5+12.5+60)/3=25 with kick
melee_damage_upper = 20
code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+1 -1
View File
@@ -51,7 +51,7 @@
pressure_resistance = 300
gold_core_spawnable = NO_SPAWN //too spooky for science
faction = list("undead") // did I mention ghost
loot = list(/obj/item/food/snacks/ectoplasm)
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
/mob/living/simple_animal/hostile/retaliate/ghost/Process_Spacemove(check_drift = 0)
code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+1 -1
View File
@@ -59,7 +59,7 @@
icon_state = "reindeer"
icon_living = "reindeer"
icon_dead = "reindeer-dead"
butcher_results = list(/obj/item/food/snacks/meat = 3)
butcher_results = list(/obj/item/food/meat = 3)
maxHealth = 80
health = 80
melee_damage_lower = 5
code/modules/mob/living/simple_animal/parrot.dm
+1 -1
View File
@@ -49,7 +49,7 @@
speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
turns_per_move = 5
butcher_results = list(/obj/item/food/snacks/cracker = 3)
butcher_results = list(/obj/item/food/cracker = 3)
response_help = "pets"
response_disarm = "gently moves aside"
code/modules/mob/living/simple_animal/shade.dm
+1 -1
View File
@@ -28,7 +28,7 @@
faction = list("cult")
status_flags = CANPUSH
flying = TRUE
loot = list(/obj/item/food/snacks/ectoplasm)
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
deathmessage = "lets out a contented sigh as their form unwinds."
var/holy = FALSE