cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-22 05:34:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 9/4/2015_master_to_dev

Browse Source 
Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm
This commit is contained in:
Neerti
2015-09-04 08:26:03 -04:00
parent 66b2b07f03 73f13d8084
commit b93595c19f
22 changed files with 113 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/sprite_accessories.dm
+11 -42
View File
@@ -112,7 +112,6 @@
ponytail2
name = "Ponytail 2"
icon_state = "hair_pa"
gender = FEMALE
ponytail3
name = "Ponytail 3"
@@ -121,12 +120,14 @@
ponytail4
name = "Ponytail 4"
icon_state = "hair_ponytail4"
gender = FEMALE
ponytail5
name = "Ponytail 5"
icon_state = "hair_ponytail5"
sideponytail
name = "Side Ponytail"
icon_state = "hair_stail"
gender = FEMALE
parted
name = "Parted"
@@ -135,12 +136,10 @@
pompadour
name = "Pompadour"
icon_state = "hair_pompadour"
gender = MALE
quiff
name = "Quiff"
icon_state = "hair_quiff"
gender = MALE
bedhead
name = "Bedhead"
@@ -157,55 +156,45 @@
beehive
name = "Beehive"
icon_state = "hair_beehive"
gender = FEMALE
beehive2
name = "Beehive 2"
icon_state = "hair_beehive2"
gender = FEMALE
bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
gender = FEMALE
species_allowed = list("Human","Unathi")
bob
name = "Bob"
icon_state = "hair_bobcut"
gender = FEMALE
species_allowed = list("Human","Unathi")
bowl
name = "Bowl"
icon_state = "hair_bowlcut"
gender = MALE
buzz
name = "Buzzcut"
icon_state = "hair_buzzcut"
gender = MALE
species_allowed = list("Human","Unathi")
crew
name = "Crewcut"
icon_state = "hair_crewcut"
gender = MALE
combover
name = "Combover"
icon_state = "hair_combover"
gender = MALE
father
name = "Father"
icon_state = "hair_father"
gender = MALE
reversemohawk
name = "Reverse Mohawk"
icon_state = "hair_reversemohawk"
gender = MALE
devillock
name = "Devil Lock"
@@ -230,12 +219,10 @@
afro_large
name = "Big Afro"
icon_state = "hair_bigafro"
gender = MALE
sargeant
name = "Flat Top"
icon_state = "hair_sargeant"
gender = MALE
emo
name = "Emo"
@@ -244,7 +231,10 @@
longemo
name = "Long Emo"
icon_state = "hair_emolong"
gender = FEMALE
veryshortovereye
name = "Overeye Very Short"
icon_state = "hair_veryshortovereye"
shortovereye
name = "Overeye Short"
@@ -265,31 +255,29 @@
hitop
name = "Hitop"
icon_state = "hair_hitop"
gender = MALE
mohawk
name = "Mohawk"
icon_state = "hair_d"
species_allowed = list("Human","Unathi")
jensen
name = "Adam Jensen Hair"
icon_state = "hair_jensen"
gender = MALE
gelled
name = "Gelled Back"
icon_state = "hair_gelled"
gender = FEMALE
gentle
name = "Gentle"
icon_state = "hair_gentle"
gender = FEMALE
spiky
name = "Spiky"
icon_state = "hair_spikey"
species_allowed = list("Human","Unathi")
kusangi
name = "Kusanagi Hair"
icon_state = "hair_kusanagi"
@@ -297,42 +285,34 @@
kagami
name = "Pigtails"
icon_state = "hair_kagami"
gender = FEMALE
himecut
name = "Hime Cut"
icon_state = "hair_himecut"
gender = FEMALE
braid
name = "Floorlength Braid"
icon_state = "hair_braid"
gender = FEMALE
icon_state = "bald" //Trust me, it's better this way.
mbraid
name = "Medium Braid"
icon_state = "hair_shortbraid"
gender = FEMALE
braid2
name = "Long Braid"
icon_state = "hair_hbraid"
gender = FEMALE
odango
name = "Odango"
icon_state = "hair_odango"
gender = FEMALE
ombre
name = "Ombre"
icon_state = "hair_ombre"
gender = FEMALE
updo
name = "Updo"
icon_state = "hair_updo"
gender = FEMALE
skinhead
name = "Skinhead"
@@ -346,57 +326,46 @@
familyman
name = "The Family Man"
icon_state = "hair_thefamilyman"
gender = MALE
mahdrills
name = "Drillruru"
icon_state = "hair_drillruru"
gender = FEMALE
dandypomp
name = "Dandy Pompadour"
icon_state = "hair_dandypompadour"
gender = MALE
poofy
name = "Poofy"
icon_state = "hair_poofy"
gender = FEMALE
crono
name = "Chrono"
icon_state = "hair_toriyama"
gender = MALE
vegeta
name = "Vegeta"
icon_state = "hair_toriyama2"
gender = MALE
cia
name = "CIA"
icon_state = "hair_cia"
gender = MALE
mulder
name = "Mulder"
icon_state = "hair_mulder"
gender = MALE
scully
name = "Scully"
icon_state = "hair_scully"
gender = FEMALE
nitori
name = "Nitori"
icon_state = "hair_nitori"
gender = FEMALE
joestar
name = "Joestar"
icon_state = "hair_joestar"
gender = MALE
bald
name = "Bald"