cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 20:46:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into blehh2sparkbooger

Browse Source 
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	icons/mob/human_races/markings_vr.dmi
This commit is contained in:
Verkister
2017-07-27 02:21:53 +03:00
parent 90c6c5f2e2 5f89411f44
commit 2492e7dbf5
17 changed files with 582 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/appearance/sprite_accessories_vr.dm
+14
View File
@@ -273,6 +273,12 @@
icon_state = "shock"
ckeys_allowed = list("icowom")
/datum/sprite_accessory/ears/alurane
name = "alurane ears/hair (Pumila)"
desc = ""
icon_state = "alurane-ears"
ckeys_allowed = list("natje")
/*
////////////////////////////
/ =--------------------= /
@@ -1018,3 +1024,11 @@
icon_state = "ariana_s"
ckeys_allowed = list("liquidfirefly")
do_colouration = 0
//liquidfirefly: Ariana Scol
/datum/sprite_accessory/tail/taur/alraune
name = "Alraune (natje)"
icon_state = "alraune_s"
ani_state = "alraune_closed_s"
ckeys_allowed = list("natje")
do_colouration = 0