cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation into spriteshit

Browse Source 
# Conflicts:
#	code/game/dna/dna2.dm
#	code/game/dna/dna2_helpers.dm
This commit is contained in:
Verkister
2017-08-13 15:21:22 +03:00
parent 22e6bcb520 2e22e7fd08
commit 5ff61bea4c
18 changed files with 1045 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/appearance/sprite_accessories_vr.dm
+1 -1
View File
@@ -287,7 +287,7 @@
name = "pharoah hound ears (Shock Diamond)"
desc = ""
icon_state = "shock"
ckeys_allowed = list("icowom")
ckeys_allowed = list("icowom","cameron653")
/datum/sprite_accessory/ears/alurane
name = "alurane ears/hair (Pumila)"