cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	icons/mob/head.dmi
This commit is contained in:
Zuhayr
2015-09-01 11:12:24 +09:30
parent 4e9c2b089a df571464aa
commit 3f6f34c16f
14 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -1616,11 +1616,11 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
name = "neaera cube"
monkey_type = "Neara"
monkey_type = "Neaera"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube
name = "neaera cube"
monkey_type = "Neara"
monkey_type = "Neaera"
/obj/item/weapon/reagent_containers/food/snacks/spellburger