cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 21:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/mob/holder.dm
	icons/mob/head.dmi
This commit is contained in:
Zuhayr
2015-08-31 16:16:23 +09:30
parent 88250ad57f 0f6644ae51
commit 14c57fcf11
13 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/language/monkey.dm
View File

@@ -7,7 +7,7 @@
key = "6"
/datum/language/skrell/monkey
name = "Neara"
name = "Neaera"
desc = "Squik squik squik."
key = "8"