From 8fc75b438d6e675d27520682ebe1fdbed4eb0535 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sun, 24 Apr 2016 13:21:14 +0100 Subject: [PATCH] Fixed some remaining variables --- code/__DEFINES/clothing.dm | 3 --- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/suits/wiz_robe.dm | 1 - code/modules/paperwork/paper.dm | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/clothing.dm b/code/__DEFINES/clothing.dm index ed0f79ea979..29e35489555 100644 --- a/code/__DEFINES/clothing.dm +++ b/code/__DEFINES/clothing.dm @@ -102,6 +102,3 @@ #define TINT_DARKENED 2 //Threshold of tint level to apply weld mask overlay #define TINT_BLIND 3 //Threshold of tint level to obscure vision fully -//flags for indicating suitability of items for corgi equipping -#define DOG_BACK 1 -#define DOG_HEAD 2 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index ab225656783..6f0487f4836 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -75,7 +75,7 @@ max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - dog_valid = DOG_HEAD + dog_fashion = /datum/dog_fashion/head /obj/item/clothing/head/hardhat/dblue icon_state = "hardhat0_dblue" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8d58dba184c..e96dd88e631 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -20,7 +20,7 @@ desc = "It's an amish looking hat." icon_state = "tophat" item_state = "that" - dog_valid = DOG_HEAD + dog_fashion = /datum/dog_fashion/head /obj/item/clothing/head/canada name = "striped red tophat" diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index dfc4756043e..c5677007305 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -15,7 +15,6 @@ name = "red wizard hat" desc = "Strange-looking red hat-wear that most certainly belongs to a real magic user." icon_state = "redwizard" - dog_valid = DOG_HEAD dog_fashion = /datum/dog_fashion/head/red_wizard /obj/item/clothing/head/wizard/yellow diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 8e8b742204c..4f172ff20b5 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -20,7 +20,7 @@ body_parts_covered = HEAD burn_state = FLAMMABLE burntime = 5 - dog_valid = DOG_HEAD + dog_fashion = /datum/dog_fashion/head var/info //What's actually written on the paper. var/info_links //A different version of the paper which includes html links at fields and EOF