diff --git a/hyperstation/code/obj/ZaoCorp/hat.dm b/hyperstation/code/obj/ZaoCorp/hat.dm new file mode 100644 index 00000000..9576ab3c --- /dev/null +++ b/hyperstation/code/obj/ZaoCorp/hat.dm @@ -0,0 +1,50 @@ +/obj/item/clothing/head/zao + name = "zao police cap" + desc = "Zao Corps standard issue police force headwear, designed with the overcoat to help with the cold weather. The headwear also features a holographic projector, allowing itself to blend in with the user to create a better face to face interaction with civilians." + icon = 'hyperstation/icons/obj/clothing/head.dmi' + icon_state = "zaohat" + item_state = "helmet" + item_color = "zaohat" + alternate_worn_icon = 'hyperstation/icons/mobs/head.dmi' + armor = list("melee" = 40, "bullet" = 40, "laser" = 10,"energy" = 20, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 60) + cold_protection = HEAD + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + strip_delay = 60 + resistance_flags = FLAMMABLE + + var/cloaked = 0 + +/obj/item/clothing/head/zao/dropped() + src.icon_state = "zaohat" + src.cloaked=0 + ..() + +/obj/item/clothing/head/zao/verb/cloakcap() + set category = "Object" + set name = "Cloak hat" + + cloak(usr) + + +/obj/item/clothing/head/zao/AltClick(mob/user) + . = ..() + if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) + return + cloak(user) + return TRUE + + +/obj/item/clothing/head/zao/proc/cloak(mob/user) + if(!user.incapacitated()) + src.cloaked = !src.cloaked + if(src.cloaked) + icon_state = "zaohat_active" + to_chat(user, "You toggle the hat\'s cloaking.") + else + icon_state = "zaohat" + to_chat(user, "You toggle the hat back to it\'s original state.") + usr.update_inv_head() //so our mob-overlays update + +/obj/item/clothing/head/zao/examine(mob/user) + . = ..() + . += "Alt-click the hat to toggle it\'s cloaking [cloaked ? "off" : "on"]." \ No newline at end of file diff --git a/hyperstation/code/obj/ZaoCorp/suit.dm b/hyperstation/code/obj/ZaoCorp/suit.dm new file mode 100644 index 00000000..51cd9888 --- /dev/null +++ b/hyperstation/code/obj/ZaoCorp/suit.dm @@ -0,0 +1,18 @@ +/obj/item/clothing/suit/toggle/zao + name = "zao overcoat" + desc = "Zao Corps signature navy-blue overcoat with a golden highlight finish. Found among police forces as the suit was designed with riot control in mind, it also serves as modest winter coat insulated padding inside." + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + icon_state = "zaocoat" + item_state = "armor" + item_color = "zaocoat" + alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' + body_parts_covered = CHEST|ARMS|LEGS + cold_protection = CHEST|GROIN|LEGS|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + strip_delay = 70 + equip_delay_other = 40 + max_integrity = 250 + resistance_flags = FLAMMABLE + armor = list("melee" = 25, "bullet" = 25, "laser" = 5, "energy" = 15, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 30) + // armor = list("melee" = 50, "bullet" = 50, "laser" = 10, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 60) + allowed = null //For sword later \ No newline at end of file diff --git a/hyperstation/code/obj/ZaoCorp/uniform.dm b/hyperstation/code/obj/ZaoCorp/uniform.dm new file mode 100644 index 00000000..de2f9438 --- /dev/null +++ b/hyperstation/code/obj/ZaoCorp/uniform.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/under/rank/security/zao + name = "zao uniform" + desc = "The standard-issue police force uniform of Zao Corp. Made with a more formal approach to a dress shirt attire while retaining the protective fibers and identity with the blue arm bands. Tie and waistcoat encouraged." + icon = 'hyperstation/icons/obj/clothing/uniforms.dmi' + icon_state = "zaounder" + item_state = "r_suit" + item_color = "zaounder" + alternate_worn_icon = 'hyperstation/icons/mobs/uniform.dmi' \ No newline at end of file diff --git a/hyperstation/icons/mobs/head.dmi b/hyperstation/icons/mobs/head.dmi index 2932bb38..e83719e1 100644 Binary files a/hyperstation/icons/mobs/head.dmi and b/hyperstation/icons/mobs/head.dmi differ diff --git a/hyperstation/icons/mobs/suits.dmi b/hyperstation/icons/mobs/suits.dmi index e2b00441..e7fd46fc 100644 Binary files a/hyperstation/icons/mobs/suits.dmi and b/hyperstation/icons/mobs/suits.dmi differ diff --git a/hyperstation/icons/mobs/uniform.dmi b/hyperstation/icons/mobs/uniform.dmi new file mode 100644 index 00000000..b9ac335e Binary files /dev/null and b/hyperstation/icons/mobs/uniform.dmi differ diff --git a/hyperstation/icons/obj/clothing/head.dmi b/hyperstation/icons/obj/clothing/head.dmi index aa31b4fb..a7fa8303 100644 Binary files a/hyperstation/icons/obj/clothing/head.dmi and b/hyperstation/icons/obj/clothing/head.dmi differ diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi index 669831ca..9d90fd06 100644 Binary files a/hyperstation/icons/obj/clothing/suits.dmi and b/hyperstation/icons/obj/clothing/suits.dmi differ diff --git a/hyperstation/icons/obj/clothing/uniforms.dmi b/hyperstation/icons/obj/clothing/uniforms.dmi new file mode 100644 index 00000000..2e2adff5 Binary files /dev/null and b/hyperstation/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/icons/mob/muzzled_helmet.dmi b/modular_citadel/icons/mob/muzzled_helmet.dmi index 1d6c0666..c2f85705 100644 Binary files a/modular_citadel/icons/mob/muzzled_helmet.dmi and b/modular_citadel/icons/mob/muzzled_helmet.dmi differ diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index fb2ba77f..d0718900 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index 3a45e93f..964eb9bb 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a6944765..2c63313a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3171,6 +3171,9 @@ #include "hyperstation\code\obj\sounding.dm" #include "hyperstation\code\obj\stargate_clothing.dm" #include "hyperstation\code\obj\vibrator.dm" +#include "hyperstation\code\obj\ZaoCorp\hat.dm" +#include "hyperstation\code\obj\ZaoCorp\suit.dm" +#include "hyperstation\code\obj\ZaoCorp\uniform.dm" #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm"