diff --git a/code/datums/uplink/stealth and camouflage items.dm b/code/datums/uplink/stealth and camouflage items.dm index ab7055066cf..44d1d8e53f0 100644 --- a/code/datums/uplink/stealth and camouflage items.dm +++ b/code/datums/uplink/stealth and camouflage items.dm @@ -35,6 +35,13 @@ bluecrystal_cost = 1 path = /obj/item/storage/box/syndie_kit/chameleon +/datum/uplink_item/item/stealth_items/chameleonarmor_kit + name = "Chameleon Armor Kit" + desc = "Comes with a full chameleon armor-kit, offers slightly worse protection than heavy armor." + telecrystal_cost = 2 + bluecrystal_cost = 2 + path = /obj/item/storage/box/syndie_kit/chameleonarmor + /datum/uplink_item/item/stealth_items/voice name = "Voice Changer" telecrystal_cost = 1 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 3862eb47066..0c08a1f2355 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -66,6 +66,15 @@ /obj/item/gun/energy/chameleon = 1 ) +/obj/item/storage/box/syndie_kit/chameleonarmor + name = "chameleon armor kit" + desc = "Comes with a full armor-kit that is capable of mimicking other clothing items while also offering protection." + worn_overlay = "syndiesuit" + starts_with = list( + /obj/item/clothing/head/helmet/chameleon = 1, + /obj/item/clothing/suit/armor/chameleon = 1 + ) + /obj/item/storage/box/syndie_kit/clerical name = "clerical kit" desc = "Comes with all you need to fake paperwork. Assumes you have passed basic writing lessons." diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index e558d0e6d89..189fe6f383b 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -165,6 +165,105 @@ disguise(clothing_choices[picked]) update_clothing_icon() //so our overlays update. +//******************* +//**Chameleon Plate Carrier** +//******************* + +/obj/item/clothing/suit/armor/chameleon + name = "standard plate carrier" + icon = 'icons/obj/clothing/suits.dmi' + contained_sprite = TRUE + icon_state = "plate_chameleon" + item_state = "plate_chameleon" + w_class = WEIGHT_CLASS_NORMAL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + armor = list( + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED + ) + desc = "A standard plate carrier that upon closer inspection reveal a holographic cloaker that allows it to change its appearance. It seems to have a small dial inside." + origin_tech = list(TECH_ILLEGAL = 3) + var/global/list/clothing_choices + +/obj/item/clothing/suit/armor/chameleon/Initialize() + . = ..() + if(!clothing_choices) + var/blocked = list(src.type, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice) + clothing_choices = generate_chameleon_choices(/obj/item/clothing/suit, blocked) + +/obj/item/clothing/suit/armor/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. + . = ..() + + name = "plate carrier" + desc = "A generic plate carrier." + icon_state = "carrier_chameleon" + update_icon() + update_clothing_icon() + +/obj/item/clothing/suit/armor/chameleon/verb/change() + set name = "Change Oversuit Appearance" + set category = "Chameleon Items" + set src in usr + + var/picked = tgui_input_list(usr, "Select disguise.", "Disguise", clothing_choices) + + if(!picked) + return + + disguise(clothing_choices[picked]) + update_clothing_icon() //so our overlays update. + +//******************* +//**Chameleon Helmet** +//******************* + +/obj/item/clothing/head/helmet/chameleon + name = "standard helmet" + desc = "A standard helmet that upon closer inspection reveal a holographic cloaker that allows it to change its appearance. It seems to have a small dial on the inside." + icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi' + icon_state = "helm_generic" + item_state = "helm_generic" + contained_sprite = TRUE + origin_tech = list(TECH_ILLEGAL = 3) + armor = list( + MELEE = ARMOR_MELEE_KEVLAR, + BULLET = ARMOR_BALLISTIC_MEDIUM, + LASER = ARMOR_LASER_KEVLAR, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED + ) + var/global/list/clothing_choices + +/obj/item/clothing/head/helmet/chameleon/Initialize() + . = ..() + if(!clothing_choices) + var/blocked = list(src.type, /obj/item/clothing/head/justice,)//Prevent infinite loops and bad hats. + clothing_choices = generate_chameleon_choices(/obj/item/clothing/head, blocked) + +/obj/item/clothing/head/helmet/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. + . = ..() + + name = "standard helmet" + desc = "A generic helmet." + icon_state = initial(icon_state) + update_icon() + update_clothing_icon() + +/obj/item/clothing/head/helmet/chameleon/verb/change() + set name = "Change Hat/Helmet Appearance" + set category = "Chameleon Items" + set src in usr + + var/picked = tgui_input_list(usr, "Select disguise.", "Disguise", clothing_choices) + + if(!picked) + return + + disguise(clothing_choices[picked]) + update_clothing_icon() //so our overlays update. //******************* //**Chameleon Shoes** diff --git a/html/changelogs/Birigilis-Aurora.3ChameleonArmor.yml b/html/changelogs/Birigilis-Aurora.3ChameleonArmor.yml new file mode 100644 index 00000000000..390a5ec3398 --- /dev/null +++ b/html/changelogs/Birigilis-Aurora.3ChameleonArmor.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Baldos + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a Chameleon Armor-kit to the uplink, located in the Stealth and Camouflage Items category." diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 1a7dc38ede4..45c3e5c3af4 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ