diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index 23d816bd97..e2ec983818 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -41,7 +41,7 @@ var/datum/antagonist/highlander/highlanders player.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(player), slot_l_ear) player.equip_to_slot_or_del(new /obj/item/clothing/head/beret(player), slot_head) player.equip_to_slot_or_del(new /obj/item/weapon/material/sword(player), slot_l_hand) - player.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(player), slot_shoes) + player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/combat(player), slot_shoes) player.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(get_turf(player)), slot_l_store) var/obj/item/weapon/card/id/W = new(player) diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index 357639fde6..5ec37a5b70 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -143,7 +143,7 @@ armor = list(melee = 75, bullet = 60, laser = 60,energy = 60, bomb = 60, bio = 0, rad = 0) //No idea if glove armor gets checked siemens_coefficient = 0 -/obj/item/clothing/shoes/combat/changeling //Noslips +/obj/item/clothing/shoes/boots/combat/changeling //Noslips desc = "chitinous boots" name = "Footwear made out of a hard, black chitinous material. The bottoms of these appear to have spikes that can protrude or extract itself into and out \ of the floor at will, granting the wearer stability." diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 7e8c721489..fb924bc9c4 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -684,7 +684,7 @@ something, make sure it's not in one of the other lists.*/ prob(3);/obj/item/weapon/storage/box/gloves, prob(2);/obj/item/weapon/storage/belt/medical/emt, prob(2);/obj/item/weapon/storage/belt/medical, - prob(1);/obj/item/clothing/shoes/combat, + prob(1);/obj/item/clothing/shoes/boots/combat, prob(3);/obj/item/clothing/shoes/white, prob(2);/obj/item/clothing/gloves/latex, prob(5);/obj/item/clothing/gloves/white, diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 5290dd21ae..d50001892b 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -711,7 +711,7 @@ if("special ops officer") M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate/combat(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/plain/eyepatch(M), slot_glasses) @@ -767,7 +767,7 @@ M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) if("soviet admiral") M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/plain/eyepatch(M), slot_glasses) diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 4e25a6be8f..54c3ee4e5c 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -194,12 +194,14 @@ // Check for requisite ckey and character name. if((lowertext(citem.assoc_key) != lowertext(M.ckey)) || (lowertext(citem.character_name) != lowertext(M.real_name))) + log_debug("Custom Item: [key_name(M)] Ckey or Char name does not match.") continue // Check for required access. var/obj/item/weapon/card/id/current_id = M.wear_id if(citem.req_access && citem.req_access > 0) if(!(istype(current_id) && (citem.req_access in current_id.access))) + log_debug("Custom Item: [key_name(M)] Does not have required access.") continue // Check for required job title. @@ -211,6 +213,7 @@ has_title = 1 break if(!has_title) + log_debug("Custom Item: [key_name(M)] Does not have required job.") continue // ID cards and PDAs are applied directly to the existing object rather than spawned fresh. diff --git a/code/modules/metric/metric.dm b/code/modules/metric/metric.dm index 1550b2c34e..44ff59d284 100644 --- a/code/modules/metric/metric.dm +++ b/code/modules/metric/metric.dm @@ -2,7 +2,7 @@ // player. /datum/metric - var/departments = list( + var/list/departments = list( ROLE_COMMAND, ROLE_SECURITY, ROLE_ENGINEERING, diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 16e0299874..0c4f178fc5 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -117,7 +117,7 @@ Please contact me on #coderbus IRC. ~Carn x #define GLOVES_LAYER 9 #define BELT_LAYER 10 #define SUIT_LAYER 11 -#define TAIL_LAYER 12 //bs12 specific. +#define TAIL_LAYER 12 //bs12 specific. //In a perfect world the parts of the tail that show between legs would be on a new layer. Until then, sprite's been tweaked #define GLASSES_LAYER 13 #define BELT_LAYER_ALT 14 #define SUIT_STORE_LAYER 15 diff --git a/icons/mob/species/tajaran/tail - old.dmi b/icons/mob/species/tajaran/tail - old.dmi new file mode 100644 index 0000000000..62a432ae76 Binary files /dev/null and b/icons/mob/species/tajaran/tail - old.dmi differ diff --git a/icons/mob/species/tajaran/tail.dmi b/icons/mob/species/tajaran/tail.dmi index 62a432ae76..a33ca7c60b 100644 Binary files a/icons/mob/species/tajaran/tail.dmi and b/icons/mob/species/tajaran/tail.dmi differ diff --git a/icons/mob/species/unathi/tail - old.dmi b/icons/mob/species/unathi/tail - old.dmi new file mode 100644 index 0000000000..eba37dba6a Binary files /dev/null and b/icons/mob/species/unathi/tail - old.dmi differ diff --git a/icons/mob/species/unathi/tail.dmi b/icons/mob/species/unathi/tail.dmi index eba37dba6a..09e3cce0c5 100644 Binary files a/icons/mob/species/unathi/tail.dmi and b/icons/mob/species/unathi/tail.dmi differ