diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 43e3c7ca22d..54d4365fe5a 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -446,10 +446,10 @@ new /obj/item/gun/energy/crossbow/largecrossbow(src) new /obj/item/melee/energy/sword/red(src) -/obj/structure/closet/crate/secure/gear_loadout/ninja/techno - associated_hardsuit = /obj/item/rig/light/offworlder/techno/ninja +/obj/structure/closet/crate/secure/gear_loadout/ninja/frontier + associated_hardsuit = /obj/item/rig/light/offworlder/frontier/ninja -/obj/structure/closet/crate/secure/gear_loadout/ninja/techno/fill() +/obj/structure/closet/crate/secure/gear_loadout/ninja/frontier/fill() ..() new /obj/item/clothing/accessory/holster/armpit/brown(src) new /obj/item/gun/projectile/pistol(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 6bbe50ae58f..5938c1762b3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -424,7 +424,6 @@ passcard["passcard, vysoka"] = /obj/item/clothing/accessory/badge/passcard/vysoka passcard["passcard, gadpathur"] = /obj/item/clothing/accessory/badge/passcard/gad passcard["passcard, assunzione"] = /obj/item/clothing/accessory/badge/passcard/assu - passcard["passcard, techno-conglomerate"] = /obj/item/clothing/accessory/badge/passcard/techno passcard["passcard, konyang"] = /obj/item/clothing/accessory/badge/passcard/konyang passcard["passcard, visegrad"] = /obj/item/clothing/accessory/badge/passcard/sol/visegrad gear_tweaks += new /datum/gear_tweak/path(passcard) diff --git a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm index b25ce8a6c4b..f3e04e4047a 100644 --- a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm +++ b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm @@ -18,7 +18,7 @@ "Jinxiang Pattern Combat Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/jinxiang, "Elyran Battlesuit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/elyra, "Cyberwarfare Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/hacker, - "Technoconglomerate Mobility Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/techno, + "Advanced Mobility Combat Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/frontier, "Crimson Hardsuit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/crimson, "Rhino Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/rhino ) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 1e180c58e22..0e3e264305e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -241,12 +241,12 @@ cold_protection = UPPER_TORSO flags_inv = 0 -/obj/item/rig/light/offworlder/techno - name = "techno-conglomerate mobility hardsuit control module" - desc = "A sleek hardsuit used by the Coalition forces of the Techno-Conglomerate." - icon = 'icons/clothing/rig/techno.dmi' - icon_state = "techno_rig" - suit_type = "techno-conglomerate mobility hardsuit" +/obj/item/rig/light/offworlder/frontier + name = "advanced mobility hardsuit control module" + desc = "Patterned off of the standard Exo-Stellar Skeleton, this sophisticated and light hardsuit is a staple of many armed forces throughout the Frontier. The mobility it grants compared to bulkier suits, while still packing the potential for a versatile toolset, has made it especially popular in the often cramped environments of ships and stations." + icon = 'icons/clothing/rig/frontier.dmi' + icon_state = "frontier_rig" + suit_type = "advanced mobility hardsuit" armor = list( melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_SMALL, @@ -287,7 +287,7 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/light glove_type = /obj/item/clothing/gloves/rig/light -/obj/item/rig/light/offworlder/techno/equipped +/obj/item/rig/light/offworlder/frontier/equipped initial_modules = list( /obj/item/rig_module/device/healthscanner/vitalscanner, /obj/item/rig_module/chem_dispenser/offworlder, @@ -296,7 +296,7 @@ /obj/item/rig_module/chem_dispenser/combat, /obj/item/rig_module/mounted/xray ) -/obj/item/rig/light/offworlder/techno/ninja +/obj/item/rig/light/offworlder/frontier/ninja initial_modules = list( /obj/item/rig_module/device/healthscanner/vitalscanner, /obj/item/rig_module/chem_dispenser/offworlder, @@ -305,4 +305,4 @@ /obj/item/rig_module/chem_dispenser/combat, /obj/item/rig_module/device/door_hack, /obj/item/rig_module/mounted/xray - ) + ) \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index b6881267594..052552d89ea 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -448,15 +448,6 @@ drop_sound = 'sound/items/drop/metalweapon.ogg' pickup_sound = 'sound/items/pickup/metalweapon.ogg' -/obj/item/clothing/accessory/badge/passcard/techno - name = "techno-conglomerate passcard" - desc = "A clump of machinery scraps repurposed into a functional passcard, used by the Techno-Conglomerate." - desc_fluff = "In a society that values progress towards perfection, the Techno-Conglomerate has also applied this to their 'governance'. Prospective wayfarers and explorers will often be required to assemble \ - their own cards from scraps left over from the early days of the technology, often leading to outdated or buggy versions. Urban legend claims that some have even found a way to exploit this technology to 'sequence' \ - their way into more secure locales." - icon_state = "passcard_techno" - item_state = "passcard_techno" - /obj/item/clothing/accessory/badge/passcard/burzsia name = "burzsian passcard" desc = "A passcard issued to Burzsian Hephaestus employees and- owned IPCs- working abroad." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c0eea3e03a2..82805fdbf97 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2301,54 +2301,6 @@ All custom items with worn sprites must follow the contained sprite system: http if(lit_message) visible_message(SPAN_NOTICE(lit_message), range = 3) -/obj/item/clothing/under/fluff/yanna_dress //Techno-Conglomerate CR dress - Yanna Trevidic - simplemaroon - name = "techno-conglomerate CR dress" - desc = "A sky blue-colored comfort-and-relaxation dress designed for off-worlders. This one is made to Techno-Conglomerate specifications, \ - with sensors outlined across the ribcage that grow brighter or duller based on the wearer's emotional intensity." - icon = 'icons/obj/custom_items/yanna_dress.dmi' - icon_override = 'icons/obj/custom_items/yanna_dress.dmi' - icon_state = "yanna_dress" - item_state = "yanna_dress" - contained_sprite = TRUE - var/list/emotional_settings = list("0", "1", "2", "3") - var/emotional_choice - action_button_name = "Adjust Emotional Setting" - -/obj/item/clothing/under/fluff/yanna_dress/Initialize() - for(var/setting in emotional_settings) - emotional_settings[setting] = image('icons/obj/custom_items/yanna_dress.dmi', "level_[emotional_settings.Find(setting) - 1]") - .=..() - -/obj/item/clothing/under/fluff/yanna_dress/attack_self(mob/user) - choose_setting(user) - -/obj/item/clothing/under/fluff/yanna_dress/verb/adjust_setting() - set category = "Object" - set name = "Adjust Emotional Setting" - set src in usr - - choose_setting(usr) - -/obj/item/clothing/under/fluff/yanna_dress/proc/choose_setting(mob/user) - var/emotional_setting = RADIAL_INPUT(user, emotional_settings) - if(!emotional_setting) - return - set_light(text2num(emotional_setting) * 0.4, text2num(emotional_setting) * 0.4, COLOR_BRIGHT_GREEN) - emotional_choice = "level_" + emotional_setting - update_icon() - update_clothing_icon() - get_mob_overlay(TRUE) - -/obj/item/clothing/under/fluff/yanna_dress/update_icon() - cut_overlays() - add_overlay(emotional_choice) - -/obj/item/clothing/under/fluff/yanna_dress/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) - var/image/I = ..() - I.add_overlay(emotional_choice + "_un") - return I - - /obj/item/clothing/suit/vaurca/fluff/bells_zora_cloak //Tailored Hive Cloak - Ka'Akaix'Bells Zo'ra - shestrying name = "tailored hive cloak" desc = "A typical-looking Vaurca hive cloak design, tailored from what looks to be labcoat material." diff --git a/html/changelogs/tcg cleanup-doc.yml b/html/changelogs/tcg cleanup-doc.yml new file mode 100644 index 00000000000..84e83d3757c --- /dev/null +++ b/html/changelogs/tcg cleanup-doc.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Doc + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Cleans up several items from the now-decanonized Techno Conglomerate." + - tweak: "Reflavors the Techno Conglomerate ninja hardsuit to generecized frontier hardsuit." diff --git a/icons/clothing/accessories/passcards.dmi b/icons/clothing/accessories/passcards.dmi index d1f90ce9bee..9b1ea150586 100644 Binary files a/icons/clothing/accessories/passcards.dmi and b/icons/clothing/accessories/passcards.dmi differ diff --git a/icons/clothing/rig/techno.dmi b/icons/clothing/rig/frontier.dmi similarity index 89% rename from icons/clothing/rig/techno.dmi rename to icons/clothing/rig/frontier.dmi index 1d1db5881c4..bc39fc5ac3e 100644 Binary files a/icons/clothing/rig/techno.dmi and b/icons/clothing/rig/frontier.dmi differ diff --git a/icons/obj/custom_items/yanna_dress.dmi b/icons/obj/custom_items/yanna_dress.dmi deleted file mode 100644 index b796da6ab61..00000000000 Binary files a/icons/obj/custom_items/yanna_dress.dmi and /dev/null differ diff --git a/icons/obj/hardsuit_token.dmi b/icons/obj/hardsuit_token.dmi index 82089f0a475..2f943182693 100644 Binary files a/icons/obj/hardsuit_token.dmi and b/icons/obj/hardsuit_token.dmi differ