cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 06:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Headset/shield issues.

Browse Source
This commit is contained in:
Neerti
2015-10-11 00:54:01 -04:00
parent 97a95c80a1
commit 24d9545790
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/headset.dm
+3 -3
View File
@@ -13,7 +13,7 @@
var/translate_hive = 0
var/obj/item/device/encryptionkey/keyslot1 = null
var/obj/item/device/encryptionkey/keyslot2 = null
maxf = 1489
// maxf = 1489
var/ks1type = /obj/item/device/encryptionkey
var/ks2type = null
@@ -287,7 +287,7 @@
desc = "The headset of the boss's boss."
icon_state = "com_headset"
item_state = "headset"
freerange = 1
// freerange = 1
ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/ert/alt
@@ -295,7 +295,7 @@
desc = "The headset of the boss's boss."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
freerange = 1
// freerange = 1
ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/ia
code/game/objects/items/weapons/shields.dm
+2 -2
View File
@@ -205,13 +205,13 @@
throw_range = 4
w_class = 3
var/active = 0
/*
/obj/item/weapon/shield/energy/IsShield()
if(active)
return 1
else
return 0
*/
/obj/item/weapon/shield/riot/tele/attack_self(mob/living/user)
active = !active
icon_state = "teleriot[active]"