shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renames generic armor and athletic shorts

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-27 17:01:29 -05:00
parent 1334608d23
commit 4a2e1367b5
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -13,7 +13,7 @@
armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
/obj/item/clothing/suit/armor/vest
name = "armor"
name = "armor vest"
desc = "A slim armored vest that protects against most types of damage."
icon_state = "armoralt"
item_state = "armoralt"
code/modules/clothing/suits/armor.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm (rejected hunks)
@@ -140,7 +140,7 @@
return 1
/obj/item/clothing/suit/armor/vest/det_suit
- name = "armor"
+ name = "detective's armor vest"
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"
allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic)