cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update clothing.dm

Browse Source
This commit is contained in:
Novacat
2020-07-31 16:47:53 -04:00
committed by GitHub
parent 8e79488e0c
commit 188eaf06a2
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/accessories/clothing.dm
-3
View File
@@ -400,11 +400,8 @@
name = "green asymmetrical jacket"
desc = "Insultingly avant-garde in aqua."
icon_state = "asym_green"
<<<<<<< HEAD
=======
/obj/item/clothing/accessory/asymovercoat
name = "orange asymmetrical overcoat"
desc = "An asymmetrical orange overcoat in a 2560's fashion."
icon_state = "asymovercoat"
>>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385)