cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4131 from Aurorablade/DAMNMONKEYS

Browse Source 
Playing with Monkey Meat
This commit is contained in:
Fox McCloud
2016-04-07 22:31:39 -04:00
parent ba5c45bfa4 7137af5fce
commit 1e780bfcb5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/monkey.dm
+2
View File
@@ -50,6 +50,8 @@
/datum/species/monkey/handle_post_spawn(var/mob/living/carbon/human/H)
H.real_name = "[lowertext(name)] ([rand(100,999)])"
H.name = H.real_name
H.butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 5)
..()
/datum/species/monkey/handle_dna(var/mob/living/carbon/human/H)
code/modules/mob/living/carbon/human/species/species.dm
+1 -3
View File
@@ -322,8 +322,6 @@
return
/datum/species/proc/handle_post_spawn(var/mob/living/carbon/C) //Handles anything not already covered by basic species assignment.
if(C.get_species() == "Monkey" || C.get_species() == "Farwa" || C.get_species() == "Stok" || C.get_species() == "Wolpin" || C.get_species() == "Neara")
C.butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 5)
grant_abilities(C)
return
@@ -333,7 +331,7 @@
return
/datum/species/proc/handle_pre_change(var/mob/living/carbon/human/H)
if(!H.get_species() == "Monkey" || !H.get_species() == "Farwa" || !H.get_species() == "Stok" || !H.get_species() == "Wolpin" || !H.get_species() == "Neara")
if(H.butcher_results)//clear it out so we don't butcher a actual human.
H.butcher_results = null
remove_abilities(H)
return