Headset/shield issues.

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

View File

@@ -13,7 +13,7 @@
var/translate_hive = 0 var/translate_hive = 0
var/obj/item/device/encryptionkey/keyslot1 = null var/obj/item/device/encryptionkey/keyslot1 = null
var/obj/item/device/encryptionkey/keyslot2 = null var/obj/item/device/encryptionkey/keyslot2 = null
maxf = 1489 // maxf = 1489
var/ks1type = /obj/item/device/encryptionkey var/ks1type = /obj/item/device/encryptionkey
var/ks2type = null var/ks2type = null
@@ -287,7 +287,7 @@
desc = "The headset of the boss's boss." desc = "The headset of the boss's boss."
icon_state = "com_headset" icon_state = "com_headset"
item_state = "headset" item_state = "headset"
freerange = 1 // freerange = 1
ks2type = /obj/item/device/encryptionkey/ert ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/ert/alt /obj/item/device/radio/headset/ert/alt
@@ -295,7 +295,7 @@
desc = "The headset of the boss's boss." desc = "The headset of the boss's boss."
icon_state = "com_headset_alt" icon_state = "com_headset_alt"
item_state = "com_headset_alt" item_state = "com_headset_alt"
freerange = 1 // freerange = 1
ks2type = /obj/item/device/encryptionkey/ert ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/ia /obj/item/device/radio/headset/ia

View File

@@ -205,13 +205,13 @@
throw_range = 4 throw_range = 4
w_class = 3 w_class = 3
var/active = 0 var/active = 0
/*
/obj/item/weapon/shield/energy/IsShield() /obj/item/weapon/shield/energy/IsShield()
if(active) if(active)
return 1 return 1
else else
return 0 return 0
*/
/obj/item/weapon/shield/riot/tele/attack_self(mob/living/user) /obj/item/weapon/shield/riot/tele/attack_self(mob/living/user)
active = !active active = !active
icon_state = "teleriot[active]" icon_state = "teleriot[active]"

View File

@@ -6,7 +6,7 @@
slot_l_hand_str = "helmet", slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet", slot_r_hand_str = "helmet",
) )
flags = HEADCOVERSEYES | THICKMATERIAL flags = THICKMATERIAL
armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0) armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)
flags_inv = HIDEEARS|HIDEEYES flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD cold_protection = HEAD
@@ -20,7 +20,6 @@
name = "riot helmet" name = "riot helmet"
desc = "It's a helmet specifically designed to protect against close range attacks." desc = "It's a helmet specifically designed to protect against close range attacks."
icon_state = "riot" icon_state = "riot"
flags = HEADCOVERSEYES
armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEEARS flags_inv = HIDEEARS
siemens_coefficient = 0.7 siemens_coefficient = 0.7
@@ -46,7 +45,6 @@
name = "\improper SWAT helmet" name = "\improper SWAT helmet"
desc = "They're often used by highly trained SWAT Members." desc = "They're often used by highly trained SWAT Members."
icon_state = "swat" icon_state = "swat"
flags = HEADCOVERSEYES
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags_inv = HIDEEARS|HIDEEYES flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD cold_protection = HEAD
@@ -57,7 +55,6 @@
name = "\improper Thunderdome helmet" name = "\improper Thunderdome helmet"
desc = "<i>'Let the battle commence!'</i>" desc = "<i>'Let the battle commence!'</i>"
icon_state = "thunderdome" icon_state = "thunderdome"
flags = HEADCOVERSEYES
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
@@ -67,7 +64,7 @@
name = "gladiator helmet" name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant." desc = "Ave, Imperator, morituri te salutant."
icon_state = "gladiator" icon_state = "gladiator"
flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
siemens_coefficient = 1 siemens_coefficient = 1
@@ -75,7 +72,6 @@
name = "tactical helmet" name = "tactical helmet"
desc = "An armored helmet capable of being fitted with a multitude of attachments." desc = "An armored helmet capable of being fitted with a multitude of attachments."
icon_state = "swathelm" icon_state = "swathelm"
flags = HEADCOVERSEYES
sprite_sheets = list( sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
@@ -89,7 +85,6 @@
name = "Augment Array" name = "Augment Array"
desc = "A helmet with optical and cranial augments coupled to it." desc = "A helmet with optical and cranial augments coupled to it."
icon_state = "v62" icon_state = "v62"
flags = HEADCOVERSEYES
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags_inv = HIDEEARS|HIDEEYES flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD cold_protection = HEAD

View File

@@ -432,7 +432,7 @@
icon_state = "yellow_hoodie" icon_state = "yellow_hoodie"
item_state = "yellow_hoodie" item_state = "yellow_hoodie"
icon_open = "yellow_hoodie_open" icon_open = "yellow_hoodie_open"
icon_closed = "yellow_hoodie" icon_closed = "yellow_hoodie"
// FUN! // FUN!