cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Humans with matter eater can now grab eat

Browse Source 
Eating mobs with minds will also generate attack logs
This commit is contained in:
Crazylemon64
2016-01-24 00:50:02 -08:00
parent 4fd3d3154b
commit 5a774922fa
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_grab.dm
+7
View File
@@ -394,12 +394,19 @@
if(!do_after(user, checktime(user, affecting), target = affecting)) return
user.visible_message("<span class='danger'>[user] devours \the [affecting]!</span>")
if(affecting.mind)
affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been devoured by [attacker.name] ([attacker.ckey])</font>"
attacker.attack_log += "\[[time_stamp()]\] <font color='red'>Devoured [affecting.name] ([affecting.ckey])</font>"
msg_admin_attack("[key_name(attacker)] devoured [key_name(affecting)]")
affecting.loc = user
attacker.stomach_contents.Add(affecting)
qdel(src)
/obj/item/weapon/grab/proc/checkvalid(var/mob/attacker, var/mob/prey) //does all the checking for the attack proc to see if a mob can eat another with the grab
if(ishuman(attacker) && (/datum/dna/gene/basic/grant_spell/mattereater in attacker.active_genes)) // MATTER EATER CARES NOT OF YOUR FORM
return 1
if(ishuman(attacker) && (FAT in attacker.mutations) && iscarbon(prey) && !isalien(prey)) //Fat people eating carbon mobs but not xenos
return 1