mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 22:42:26 +01:00
Merge branch 'master' into ship_and_stuff
# Conflicts: # code/modules/client/preference_setup/loadout/loadout_eyes.dm
This commit is contained in:
@@ -2219,6 +2219,55 @@ Follow by example and make good judgement based on length which list to include
|
||||
length = 3
|
||||
chatname = "small horns"
|
||||
|
||||
una_dilocrest
|
||||
name = "Unathi Dilo Crest"
|
||||
icon_state = "dilocrest"
|
||||
length = 0
|
||||
chatname = "crests"
|
||||
|
||||
una_monocrest
|
||||
name = "Unathi Mono Crest"
|
||||
icon_state = "monocrest"
|
||||
length = 0
|
||||
chatname = "crest"
|
||||
|
||||
una_cryocrest
|
||||
name = "Unathi Cryo Crest"
|
||||
icon_state = "cryocrest"
|
||||
length = 0
|
||||
chatname = "crest"
|
||||
|
||||
una_corycrest
|
||||
name = "Unathi Cory Crest"
|
||||
icon_state = "corycrest"
|
||||
length = 0
|
||||
chatname = "crest"
|
||||
|
||||
una_albertahorns
|
||||
name = "Unathi Alberta Horns"
|
||||
icon_state = "albertahorns"
|
||||
length = 5
|
||||
chatname = "small horns"
|
||||
|
||||
una_styrahorn
|
||||
name = "Unathi Styra Horn"
|
||||
icon_state = "styrahorn"
|
||||
length = 5
|
||||
chatname = "massive horn"
|
||||
|
||||
una_styracrest
|
||||
name = "Unathi Styra Frill"
|
||||
icon_state = "styrafrill"
|
||||
length = 0
|
||||
chatname = "frill"
|
||||
|
||||
una_pachyboss
|
||||
name = "Unathi Pachy Boss"
|
||||
icon_state = "pachylump"
|
||||
length = 0
|
||||
chatname = "lump"
|
||||
|
||||
|
||||
//skrell tentacles
|
||||
|
||||
skr_tentacle_m
|
||||
@@ -3225,6 +3274,37 @@ Follow by example and make good judgement based on length which list to include
|
||||
name = "Unathi Chameleon Horns"
|
||||
icon_state = "facial_chameleon"
|
||||
|
||||
una_dilocrest
|
||||
name = "Unathi Dilo Crest"
|
||||
icon_state = "dilocrest"
|
||||
|
||||
una_monocrest
|
||||
name = "Unathi Mono Crest"
|
||||
icon_state = "monocrest"
|
||||
|
||||
una_cryocrest
|
||||
name = "Unathi Cryo Crest"
|
||||
icon_state = "cryocrest"
|
||||
|
||||
una_corycrest
|
||||
name = "Unathi Cory Crest"
|
||||
icon_state = "corycrest"
|
||||
|
||||
una_albertahorns
|
||||
name = "Unathi Alberta Horns"
|
||||
icon_state = "albertahorns"
|
||||
|
||||
una_styrahorn
|
||||
name = "Unathi Styra Horn"
|
||||
icon_state = "styrahorn"
|
||||
una_styracrest
|
||||
name = "Unathi Styra Frill"
|
||||
icon_state = "styrafrill"
|
||||
|
||||
una_pachyboss
|
||||
name = "Unathi Pachy Boss"
|
||||
icon_state = "pachylump"
|
||||
|
||||
//ipc screens
|
||||
|
||||
ipc_screen_blank
|
||||
|
||||
Reference in New Issue
Block a user