mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
Actually fixes conflicts!
This commit is contained in:
@@ -945,6 +945,14 @@
|
||||
flags_inv = HIDEEARS
|
||||
|
||||
//////////// Uniforms ////////////
|
||||
/obj/item/clothing/under/fluff/benjaminfallout // Benjaminfallout: Pretzel Brassheart
|
||||
icon = 'icons/obj/custom_items.dmi'
|
||||
name = "Pretzel's dress"
|
||||
desc = "A nice looking dress"
|
||||
icon_state = "fallout_dress"
|
||||
item_state = "fallout_dress"
|
||||
item_color = "fallout_dress"
|
||||
|
||||
/obj/item/clothing/under/fluff/soviet_casual_uniform // Norstead : Natalya Sokolova
|
||||
icon = 'icons/obj/custom_items.dmi'
|
||||
name = "Soviet Casual Uniform"
|
||||
|
||||
Reference in New Issue
Block a user