Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE

This commit is contained in:
Aurorablade
2019-01-29 17:42:39 -05:00
198 changed files with 5111 additions and 3030 deletions
+23
View File
@@ -900,6 +900,13 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
icon_state = "dusty_jacket"
/obj/item/clothing/suit/fluff/cheeky_sov_coat //CheekyCrenando: Srusu Rskuzu
name = "Srusu's Greatcoat"
desc = "A heavy wool Soviet-style greatcoat. A name is written in fancy handwriting on the inside tag: Srusu Rskuzu"
icon = 'icons/obj/custom_items.dmi'
item_state = "cheeky_sov_coat"
icon_state = "cheeky_sov_coat"
/obj/item/clothing/suit/fluff/supplymaster_jacket //Denthamos: Henry Grandpa Gadow
name = "faded NT Supply Master's Coat"
desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it."
@@ -984,6 +991,14 @@
species_fit = null
sprite_sheets = null
/obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat // Ionward: Gemini
name = "Technocracy labcoat"
desc = "A thin, faded, carbon fiber labcoat. On the back, a Technocracy vessel's logo. Inside, the name 'Gemini' is printed on the collar."
icon = 'icons/obj/custom_items.dmi'
icon_state = "ionward_labcoat_open"
species_fit = null
sprite_sheets = null
/obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y
name = "\improper F.U.R.R.Y's Nanotrasen Greatcoat"
desc = "A greatcoat with Nanotrasen colors."
@@ -1604,3 +1619,11 @@
icon_state = "asmer_accordion"
item_state = "asmer_accordion"
/obj/item/clothing/head/rabbitears/fluff/pinesalad_bunny // Pineapple Salad : Dan Jello
name = "Bluespace rabbit ears"
desc = "A pair of sparkly bluespace rabbit ears, with a small tag on them that reads, 'Dan Jello~'. Yuck, \
there's some pink slime on the part that goes on your head!"
icon = 'icons/obj/custom_items.dmi'
icon_state = "ps_bunny"