cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2532 from CHOMPStationBot/upstream-merge-11057

Browse Source 
[MIRROR] Fixes double-defined hostrench
This commit is contained in:
Nadyr
2021-07-13 23:17:27 -04:00
committed by GitHub
parent f3ffdcb4ec ce32acae1c
commit 063fe50646
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/suits/armor_vr.dm
View File

@@ -34,12 +34,6 @@
/obj/item/clothing/suit/storage/vest/hos /obj/item/clothing/suit/storage/vest/hos
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hoscoat/jensen
name = "armored trenchcoat"
desc = "A trenchcoat augmented with a special alloy for some protection and style."
icon_state = "hostrench"
flags_inv = HIDEHOLSTER
// Override Polaris's "confederate" naming convention. I hate it. // Override Polaris's "confederate" naming convention. I hate it.
/obj/item/clothing/suit/storage/vest/solgov /obj/item/clothing/suit/storage/vest/solgov
name = "\improper Solar Central Government" //YW EDIT: SolGov name = "\improper Solar Central Government" //YW EDIT: SolGov