cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01: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:22:10 +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
code/modules/mob/language/monkey.dm
+1 -1
View File
@@ -7,7 +7,7 @@
key = "6"
/datum/language/skrell/monkey
name = "Neara"
name = "Neaera"
desc = "Squik squik squik."
key = "8"