Adds gauntlets, allows RIGs to be worn over gloves

This commit is contained in:
Anewbe
2016-07-02 20:18:19 -05:00
parent 1ddc30a0ec
commit ab9bfb3817
6 changed files with 41 additions and 9 deletions
+1 -1
View File
@@ -212,7 +212,7 @@
siemens_coefficient = 0.75
var/wired = 0
var/obj/item/weapon/cell/cell = 0
var/clipped = 0
var/overgloves = 0
body_parts_covered = HANDS
slot_flags = SLOT_GLOVES
attack_verb = list("challenged")
@@ -3,6 +3,7 @@
desc = "These arm guards will protect your hands and arms."
body_parts_covered = HANDS|ARMS
slowdown = 1
overgloves = 1
w_class = 3
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
+30
View File
@@ -0,0 +1,30 @@
/obj/item/clothing/gloves/gauntlets //Used to cover gloves, otherwise act as gloves. Currently the base item has some weird issues, not worth fixing until it's needed elsewhere.
name = "gauntlets"
desc = "These gloves go over regular gloves."
icon_state = "black"
item_state = "bgloves"
slot_flags = SLOT_GLOVES
overgloves = 1
var/obj/item/clothing/gloves/gloves = null //Undergloves
/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user)
var/mob/living/carbon/human/H = user
if(H.gloves)
gloves = H.gloves
if(gloves.overgloves)
user << "You are unable to wear \the [src] as \the [H.gloves] are in the way."
gloves = null
return 0
H.drop_from_inventory(gloves)
gloves.forceMove(src)
if(!..())
if(gloves)
if(H.equip_to_slot_if_possible(gloves, slot_gloves))
gloves = null
return 0
if(gloves)
user << "You slip \the [src] on over \the [gloves]."
// user.set_slowdown() //Needs to be converted from magboots, doesn't need to be done until there are gauntlets with slowdown
return 1
@@ -17,7 +17,7 @@
)
species_restricted = null
/obj/item/clothing/gloves/rig
/obj/item/clothing/gloves/gauntlets/rig
name = "gauntlets"
item_flags = THICKMATERIAL
body_parts_covered = HANDS
@@ -128,7 +128,7 @@
species_restricted = null
gender = PLURAL
/obj/item/clothing/gloves/lightrig
/obj/item/clothing/gloves/gauntlets/lightrig
name = "gloves"
flags = THICKMATERIAL
body_parts_covered = HANDS
@@ -15,13 +15,13 @@
chest_type = /obj/item/clothing/suit/space/rig/light
helm_type = /obj/item/clothing/head/helmet/space/rig/light
boot_type = /obj/item/clothing/shoes/magboots/rig/light
glove_type = /obj/item/clothing/gloves/rig/light
glove_type = /obj/item/clothing/gloves/gauntlets/rig/light
/obj/item/clothing/suit/space/rig/light
name = "suit"
breach_threshold = 18 //comparable to voidsuits
/obj/item/clothing/gloves/rig/light
/obj/item/clothing/gloves/gauntlets/rig/light
name = "gloves"
/obj/item/clothing/shoes/magboots/rig/light
@@ -43,7 +43,7 @@
helm_type = /obj/item/clothing/head/lightrig/hacker
chest_type = /obj/item/clothing/suit/lightrig/hacker
glove_type = /obj/item/clothing/gloves/lightrig/hacker
glove_type = /obj/item/clothing/gloves/gauntlets/lightrig/hacker
boot_type = /obj/item/clothing/shoes/lightrig/hacker
initial_modules = list(
@@ -68,7 +68,7 @@
siemens_coefficient = 0.4
flags = NOSLIP //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it.
/obj/item/clothing/gloves/lightrig/hacker
/obj/item/clothing/gloves/gauntlets/lightrig/hacker
siemens_coefficient = 0
/obj/item/weapon/rig/light/ninja
@@ -81,7 +81,7 @@
slowdown = 0
chest_type = /obj/item/clothing/suit/space/rig/light/ninja
glove_type = /obj/item/clothing/gloves/rig/light/ninja
glove_type = /obj/item/clothing/gloves/gauntlets/rig/light/ninja
cell_type = /obj/item/weapon/cell/hyper
req_access = list(access_syndicate)
@@ -103,7 +103,7 @@
..()
/obj/item/clothing/gloves/rig/light/ninja
/obj/item/clothing/gloves/gauntlets/rig/light/ninja
name = "insulated gloves"
siemens_coefficient = 0