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

Update chameleon.dm

Browse Source
This commit is contained in:
deathride58
2017-11-22 14:46:06 -05:00
committed by GitHub
parent d86bdf2150
commit 2dbe3e3b82
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/chameleon.dm
-12
View File
@@ -235,12 +235,8 @@
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
<<<<<<< HEAD
origin_tech = "syndicate=2"
resistance_flags = 0
=======
resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -261,12 +257,8 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
item_state = "meson"
<<<<<<< HEAD
origin_tech = "syndicate=2"
resistance_flags = 0
=======
resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
@@ -400,12 +392,8 @@
desc = "A pair of black shoes."
permeability_coefficient = 0.05
flags_1 = NOSLIP_1
<<<<<<< HEAD
origin_tech = "syndicate=2"
resistance_flags = 0
=======
resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
pockets = /obj/item/storage/internal/pocket/shoes
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)