mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
TG Clothing Pack Polish
This commit is contained in:
committed by
CHOMPStation2
parent
5f07c2a152
commit
338d5f605b
@@ -144,8 +144,15 @@
|
||||
/obj/item/clothing/under/rank/neo_warden_red,
|
||||
/obj/item/clothing/under/rank/neo_warden_red_skirt,
|
||||
/obj/item/clothing/under/rank/neo_warden_blue,
|
||||
<<<<<<< HEAD
|
||||
/obj/item/clothing/suit/neo_armsco_trench,
|
||||
/obj/item/clothing/suit/neo_warden_heavy,
|
||||
=======
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden,
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy,
|
||||
/obj/item/clothing/under/rank/neo_sec_gorka,
|
||||
>>>>>>> 236fb54ed4... Merge pull request #14893 from KillianKirilenko/kk-nanofix
|
||||
/obj/item/weapon/cartridge/security,
|
||||
/obj/item/device/radio/headset/headset_sec,
|
||||
/obj/item/device/radio/headset/headset_sec/alt,
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
/obj/item/clothing/under/rank/neo_hos_parade_blue_fem,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hos_parade,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hosformal_blue,
|
||||
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
|
||||
/obj/item/clothing/head/helmet/HoS/hat/blue,
|
||||
/obj/item/clothing/head/helmet/dermal,
|
||||
/obj/item/device/radio/headset/heads/hos,
|
||||
|
||||
Reference in New Issue
Block a user