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

cleanup

Browse Source
This commit is contained in:
Fox-McCloud
2016-04-01 00:39:48 -04:00
parent 24139b8a84
commit 5d8b02b37a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species.dm
+2 -2
View File
@@ -63,8 +63,8 @@
var/ventcrawler = 0 //Determines if the mob can go through the vents.
var/has_fine_manipulation = 1 // Can use small items.
var/can_consume_mobs = 0 //can it consume mobs?
var/list/allowed_consumed_mobs = list()
var/list/allowed_consumed_mobs = list() //If a species can consume mobs, put the type of mobs it can consume here.
var/flags = 0 // Various specific features.
var/clothing_flags = 0 // Underwear and socks.
code/modules/mob/living/carbon/human/species/station.dm
+4 -4
View File
@@ -55,7 +55,7 @@
flesh_color = "#34AF10"
reagent_tag = PROCESS_ORG
base_color = "#066000"
can_consume_mobs = 1
allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
/mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
@@ -109,7 +109,7 @@
reagent_tag = PROCESS_ORG
flesh_color = "#AFA59E"
base_color = "#333333"
can_consume_mobs = 1
allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot,
/mob/living/simple_animal/tribble)
@@ -153,7 +153,7 @@
reagent_tag = PROCESS_ORG
flesh_color = "#966464"
base_color = "#B43214"
can_consume_mobs = 1
allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
/mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
@@ -363,7 +363,7 @@
dietflags = DIET_HERB
blood_color = "#FB9800"
reagent_tag = PROCESS_ORG
can_consume_mobs = 1
allowed_consumed_mobs = list(/mob/living/simple_animal/diona)
suicide_messages = list(
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -414,7 +414,7 @@
return 1
var/mob/living/carbon/human/H = attacker
if(ishuman(H) && H.species.can_consume_mobs && is_type_in_list(prey, H.species.allowed_consumed_mobs)) //species eating of other mobs
if(ishuman(H) && is_type_in_list(prey, H.species.allowed_consumed_mobs)) //species eating of other mobs
return 1
return 0