cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Techno-Conglomerate Cleanup (#14404)

Browse Source
This commit is contained in:
Doc
2022-07-14 12:16:03 +02:00
committed by GitHub
parent abb3da4f03
commit bb1fa6cfaa
11 changed files with 55 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
-1
View File
@@ -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)
code/modules/clothing/spacesuits/rig/hardsuit_token.dm
+1 -1
View File
@@ -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
)
code/modules/clothing/spacesuits/rig/suits/light.dm
+9 -9
View File
@@ -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
)
)
code/modules/clothing/under/accessories/badges.dm
-9
View File
@@ -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."
code/modules/customitems/item_defines.dm
-48
View File
@@ -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."