mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 03:57:48 +01:00
Merge pull request #2823 from Anewbe/boots_fix
Corrects magboots and the shoe toggle thing
This commit is contained in:
@@ -380,7 +380,7 @@
|
||||
var/can_hold_knife = 0
|
||||
var/obj/item/holding
|
||||
|
||||
var/show_above_pants = 1
|
||||
var/shoes_under_pants = 0
|
||||
|
||||
permeability_coefficient = 0.50
|
||||
slowdown = SHOES_SLOWDOWN
|
||||
@@ -437,10 +437,10 @@
|
||||
set name = "Switch Shoe Layer"
|
||||
set category = "Object"
|
||||
|
||||
if(show_above_pants == -1)
|
||||
if(shoes_under_pants == -1)
|
||||
usr << "<span class='notice'>\The [src] cannot be worn above your suit!</span>"
|
||||
return
|
||||
show_above_pants = !show_above_pants
|
||||
shoes_under_pants = !shoes_under_pants
|
||||
update_icon()
|
||||
|
||||
/obj/item/clothing/shoes/update_icon()
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
species_restricted = null
|
||||
force = 3
|
||||
overshoes = 1
|
||||
shoes_under_pants = -1 //These things are huge
|
||||
var/magpulse = 0
|
||||
var/icon_base = "magboots"
|
||||
action_button_name = "Toggle Magboots"
|
||||
|
||||
@@ -646,11 +646,12 @@ var/global/list/damage_icon_parts = list()
|
||||
var/shoe_layer = SHOES_LAYER
|
||||
if(istype(shoes, /obj/item/clothing/shoes))
|
||||
var/obj/item/clothing/shoes/ushoes = shoes
|
||||
if(ushoes.show_above_pants)
|
||||
if(ushoes.shoes_under_pants == 1)
|
||||
overlays_standing[SHOES_LAYER] = null
|
||||
shoe_layer = SHOES_LAYER_ALT
|
||||
else
|
||||
overlays_standing[SHOES_LAYER_ALT] = null
|
||||
shoe_layer = SHOES_LAYER
|
||||
|
||||
if(shoes.blood_DNA)
|
||||
var/image/bloodsies = image("icon" = species.get_blood_mask(src), "icon_state" = "shoeblood")
|
||||
|
||||
Reference in New Issue
Block a user