diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm index 4bee94afaff..add52e7bee4 100644 --- a/code/datums/trading/ai.dm +++ b/code/datums/trading/ai.dm @@ -94,7 +94,6 @@ They sell generic supplies and ask for generic supplies. /obj/item/storage/bag/ore = TRADER_THIS_TYPE, /obj/item/storage/toolbox = TRADER_ALL, /obj/item/storage/wallet = TRADER_THIS_TYPE, - /obj/item/storage/wallet/fluff = TRADER_BLACKLIST_ALL, // Custom items /obj/item/storage/photo_album = TRADER_THIS_TYPE, /obj/item/clothing/glasses = TRADER_SUBTYPES_ONLY, /obj/item/clothing/glasses/threedglasses/fluff = TRADER_BLACKLIST_ALL, // Custom items diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 5bb598b2c44..514f891c0e3 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -663,7 +663,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept return signal -/proc/telecomms_process_active() +/proc/telecomms_process_active(var/level = 5) // First, we want to generate a new radio signal var/datum/signal/signal = new @@ -678,7 +678,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept "type" = 4, // determines what type of radio input it is: test broadcast "reject" = 0, "done" = 0, - "level" = 5 // The level it is being broadcasted at. + "level" = level // The level it is being broadcasted at. ) signal.frequency = PUB_FREQ// Common channel diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 64bbdf84294..750cb8705be 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -55,16 +55,6 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/accessory/bandanna/fluff/kir_bandanna //Kir's Bandanna - Kir Iziki - araskael - name = "purple bandanna" - desc = "A worn and faded purple bandanna with a knotted, dragon-like design on it." - icon = 'icons/obj/custom_items/kir_bandanna.dmi' - icon_override = 'icons/obj/custom_items/kir_bandanna.dmi' - icon_state = "kir_bandanna" - item_state = "kir_bandanna" - contained_sprite = TRUE - - /obj/item/clothing/accessory/badge/fluff/dylan_tags //Dog Tags - Dylan Sutton - catnippy name = "dog tags" desc = "Some black dog tags, engraved on them is the following: \"Wright, Dylan L, O POS, Pacific Union Special Forces\"." @@ -225,21 +215,6 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/fluff/zhilin_book //Siik'maas-Tau Ceti Basic Dictionary - Zhilin Vadim - fireandglory - name = "siik'maas-tau ceti basic dictionary" - desc = "A hefty dictionary with a simple design on the cover, it seems to be for translations. There's a label on the back denoting that it belongs to a \"Zhilin Vadim\"." - icon = 'icons/obj/custom_items/zhilin_book.dmi' - icon_override = 'icons/obj/custom_items/zhilin_book.dmi' - icon_state = "zhilin_book" - w_class = ITEMSIZE_NORMAL - -/obj/item/fluff/zhilin_book/attack_self(mob/user as mob) - user.visible_message("[user] starts flipping through \the [src].", - "You start looking through \the [src], it appears to be filled with translations of Tau-Ceti basic for tajaran users.", - "You hear pages being flipped.") - playsound(src.loc, /decl/sound_category/page_sound, 50, 1) - - /obj/item/clothing/under/fluff/faysal_uniform //Old Tajaran Nobleman Suit - Faysal Al-Shennawi - alberyk name = "old tajaran nobleman suit" desc = "A fancy looking suit, made of white line, adorned with golden details and buttons bearing long forgotten meanings. A blue sash decorates this piece of clothing." @@ -377,17 +352,6 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/accessory/fluff/zhilin_necklace //Tajaran Religious Necklace - Zhilin Vadim - fireandglory - name = "tajaran religious necklace" - desc = "A necklace with black string, it appears to have carved wooden figures of the Tajaran god Mata'ke and all of his pantheon strung through it." - icon = 'icons/obj/custom_items/zhilin_necklace.dmi' - icon_override = 'icons/obj/custom_items/zhilin_necklace.dmi' - icon_state = "zhilin_necklace" - item_state = "zhilin_necklace" - contained_sprite = TRUE - slot_flags = SLOT_EARS | SLOT_TIE - - /obj/item/clothing/suit/storage/fluff/vira_coat //Designer Military Coat - Vira Bolivar - scheveningen name = "designer military coat" desc = "A dark funnel neck designer military-style dress coat, specially fitted on commission, clearly designed for a woman's figure. \ @@ -492,17 +456,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_off = "hadley_camera_off" -/obj/item/storage/wallet/fluff/muhawir_wallet //Pineapple Wallet - Muhawir Nawfal - menown - name = "pineapple wallet" - desc = "A rather small, cheaply made felt wallet with a zipper near the top. It looks like a pineapple." - icon = 'icons/obj/custom_items/muhawir_items.dmi' - icon_override = 'icons/obj/custom_items/muhawir_items.dmi' - icon_state = "muhawir_wallet" - -/obj/item/storage/wallet/fluff/muhawir_wallet/update_icon() - return - - /obj/item/folder/fluff/sukhoi_folder //Inventor's Notebook - Natascha Sukhoi - lancelynxx name = "inventor's notebook" desc = "A dark-green notebook, with crumpled Post-Its sticking out and binding tearing at the edges. It reeks of DromedaryCo cigarettes. The words \"SUKH SYSTEMS\" are scribbled on the cover with a black sharpie." @@ -580,15 +533,6 @@ All custom items with worn sprites must follow the contained sprite system: http species_restricted = list(BODYTYPE_IPC_INDUSTRIAL) -/obj/item/fluff/daliyah_visa //NanoTrasen Exchange Visa - Daliyah Veridan - xanderdox - name = "NanoTrasen exchange visa" - desc = "A work visa authorizing the holder, Daliyah Veridan, to work within the Republic of Biesel. An Eridani and NanoTrasen logo are embossed on the back." - icon = 'icons/obj/custom_items/daliyah_visa.dmi' - icon_override = 'icons/obj/custom_items/daliyah_visa.dmi' - icon_state = "daliyah_visa" - w_class = ITEMSIZE_SMALL - - /obj/item/clothing/mask/fluff/ird_mask //Titanium Faceplate - IRD - kyres1 name = "titanium faceplate" desc = "An odd mask seeming to mimic the face of a Human with some artistic liberties taken. Small lights keep it dimly illuminated from within with holographic projectors emulating two bright blue eyes. \ @@ -623,53 +567,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "klavdiya_amulet" contained_sprite = TRUE -/obj/item/clothing/gloves/fluff/lunea_gloves //Spark Gloves - Lunea Discata - tishinastalker - name = "spark gloves" - desc = "Custom made flame retardant gloves designed after Cpt. Stallion from hit 2451 anime series Truesteel Arcanist: Fellowship. \ - A lighter assembly is built along the index finger with a tiny plate of steel, and there is a small flint built into the thumb." - icon = 'icons/obj/custom_items/lunea_gloves.dmi' - icon_override = 'icons/obj/custom_items/lunea_gloves.dmi' - icon_state = "lunea_gloves" - item_state = "lunea_gloves" - contained_sprite = TRUE - var/lit = FALSE - -/obj/item/clothing/gloves/fluff/lunea_gloves/verb/toggle() - set name = "Toggle Spark Gloves" - set category = "Object" - set src in usr - - if (use_check_and_message(usr)) return - - if(!lit) - usr.visible_message("With a snap of \the [usr]'s fingers, a small lighter flame sparks from [usr.get_pronoun("his")] index fingers!") - lit = TRUE - playsound(src.loc, 'sound/items/cigs_lighters/zippo_on.ogg', 75, 1) - update_icon() - usr.update_inv_gloves() - return - - else - usr.visible_message("With the flick of \the [usr]'s wrists and the pinch of [usr.get_pronoun("his")] fingers, the glove's flames are extinguished.") - lit = FALSE - playsound(src.loc, 'sound/items/cigs_lighters/zippo_off.ogg', 75, 1) - update_icon() - usr.update_inv_gloves() - return - -/obj/item/clothing/gloves/fluff/lunea_gloves/update_icon() - if(lit) - icon_state = "[icon_state]_lit" - item_state = "[item_state]_lit" - set_light(2, 0.25, "#E38F46") - else - icon_state = initial(icon_state) - item_state = initial(item_state) - set_light(0) - -/obj/item/clothing/gloves/fluff/lunea_gloves/isFlameSource() - return lit - /obj/item/storage/fluff/sovno_carrier //Reinforced Cat Carrier - Anabelle Sovno - pratepresidenten name = "cat carrier" @@ -1246,120 +1143,6 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/fluff/muhawir_bedroll //Bedroll - Muhawir Nawfal - menown - name = "bedroll" - desc = "A portable bedroll, made of cloth and padding." - icon = 'icons/obj/custom_items/muhawir_items.dmi' - icon_override = 'icons/obj/custom_items/muhawir_items.dmi' - icon_state = "bedroll-rolled" - w_class = ITEMSIZE_NORMAL - attack_verb = list("battered","whacked") - var/deployed = FALSE - -/obj/item/fluff/muhawir_bedroll/attack_self(mob/user as mob) - if(!deployed) - to_chat(user, "You open the bedroll, extending it.") - name = "open bedroll" - icon_state = "bedroll-open" - layer = MOB_LAYER - 0.01 - user.drop_from_inventory(src) - deployed = TRUE - return - -/obj/item/fluff/muhawir_bedroll/attack_hand(mob/user as mob) - if(deployed) - to_chat(user, "You pick up and fold \the [src].") - name = initial(name) - icon_state = initial(icon_state) - layer = initial(layer) - deployed = FALSE - - ..() - -/obj/item/fluff/muhawir_tenttools //Toolbag - Muhawir Nawfal - menown - name = "toolbag" - desc = "A roll of poles and ropes. Anybody knowledgeable would know they are designed for erecting a tent." - icon = 'icons/obj/custom_items/muhawir_items.dmi' - icon_override = 'icons/obj/custom_items/muhawir_items.dmi' - icon_state = "tent-tools" - w_class = ITEMSIZE_NORMAL - attack_verb = list("battered","whacked") - -/obj/item/fluff/muhawir_tent //Tentroll - Muhawir Nawfal - menown - name = "tentroll" - desc = "A portable tent. All wrapped up with straps and buckles." - icon = 'icons/obj/custom_items/muhawir_items.dmi' - icon_override = 'icons/obj/custom_items/muhawir_items.dmi' - icon_state = "tent-rolled" - w_class = ITEMSIZE_NORMAL - attack_verb = list("battered","whacked") - -/obj/item/fluff/muhawir_tent/attackby(var/obj/item/W, mob/user as mob) - if(istype(W, /obj/item/fluff/muhawir_tenttools)) - user.visible_message("[user] unrolls the tent .", - "You unroll the tent.") - if(do_after(user, 5 SECONDS, act_target = src)) - user.visible_message( - "[user] begins sliding the tent poles into the frame of the tent.", - "You begin sliding the tent poles into the frame of the tent.") - if(do_after(user, 60 SECONDS, act_target = src)) - user.visible_message( - "[user] begins raising tent.", - "You begin raising the tent.") - if(do_after(user, 20 SECONDS, act_target = src)) - user.visible_message( - "[usr] finishes raising the tent.", - "You finish raising the tent.") - new/obj/structure/closet/fluff/muhawir_tent(user.loc) - qdel(src) - return - -/obj/structure/closet/fluff/muhawir_tent - name = "camping tent" - desc = "A relatively good quality tent, complete with mounting poles and straps for keeping it open." - icon = 'icons/obj/custom_items/muhawir_items.dmi' - icon_state = "tent-closed" - icon_closed = "tent-closed" - icon_opened = "tent-open" - open_sound = 'sound/items/zip.ogg' - close_sound = 'sound/items/zip.ogg' - anchored = TRUE - storage_capacity = 15 - var/has_bedroll = FALSE - -/obj/structure/closet/fluff/muhawir_tent/attackby(W as obj, mob/user as mob) - if(istype(W, /obj/item/fluff/muhawir_bedroll)) - user.visible_message( - "[user] lays down the bedroll inside \the [src].", - "You lay down the bedroll in \the [src].") - qdel(W) - has_bedroll = TRUE - return - -/obj/structure/closet/fluff/muhawir_tent/verb/dismantle_tent() - set name = "Dismantle Tent" - set category = "Object" - set src in view(1) - - if (use_check_and_message(usr, USE_DISALLOW_SILICONS)) - return - - usr.visible_message( - "[usr] begins taking apart the [src.name].", - "You begin taking apart the [src.name].") - if(has_bedroll) - if(do_after(usr, 20 SECONDS, act_target = src)) - to_chat(usr, "You roll up the bedroll inside \the [src].") - new/obj/item/fluff/muhawir_bedroll(get_turf(usr)) - has_bedroll = FALSE - if(do_after(usr, 50 SECONDS, act_target = src)) - to_chat(usr, "You take down \the [src].") - dump_contents() - new/obj/item/fluff/muhawir_tent(get_turf(usr)) - qdel(src) - return - - /obj/item/clothing/head/fluff/djikstra_hood //Stellar Hood - Msizi Djikstra - happyfox name = "stellar hood" desc = "A more encompassing version of the Starveil, made from a resilient xeno-silk, intended to protect not just the eyes but also the soul of the wearer." @@ -1401,34 +1184,6 @@ All custom items with worn sprites must follow the contained sprite system: http body_parts_covered = UPPER_TORSO|LOWER_TORSO contained_sprite = TRUE -/obj/item/clothing/head/helmet/fluff/oscar_helmet //zavodskoi Specialist Helmet - Oscar Easter - slymantis84 - name = "zavodskoi instellar specialist helmet" - desc = "A modified EPMC specialist helmet, with a built-in visor and HUD to access electronics and receive tactical information. It doesn't appear to serve many purposes in Biesel" - icon = 'icons/obj/custom_items/oscar_helmet.dmi' - icon_override = 'icons/obj/custom_items/oscar_helmet.dmi' - icon_state = "oscar_helmet" - item_state = "oscar_helmet" - contained_sprite = TRUE - var/online = FALSE - -/obj/item/clothing/head/helmet/fluff/oscar_helmet/attack_self(mob/user) - online= !online - if(online) - to_chat(user, "You turn \the [src] on.") - else - to_chat(user, "You turn \the [src] off.") - - update_icon() - user.update_inv_head() - -/obj/item/clothing/head/helmet/fluff/oscar_helmet/update_icon() - if(online) - icon_state = "oscar_helmet_active" - item_state = "oscar_helmet_active" - else - icon_state = initial(icon_state) - item_state = initial(item_state) - /obj/item/storage/box/fancy/fluff/sentiment_bouquet //Bouquet of Chrysanthemums - IRU-Sentiment - niennab name = "bouquet of chrysanthemums" @@ -2269,7 +2024,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/journal/fluff/kathira // Blue Leather-Bound Journal - Kathira El-Hashem - TheGreyWolf name = "blue leather-bound journal" desc = "A blue journal emblazoned with the New Kingdom of Adhomai's flag across the cover." - closed_desc = " The pages within are a mix of clearly indexed case files, and study notes alongside less clearly indexed pages that appears to be fragmented thoughts, not unlike a diary. The very first page of the journal reads “dedicated to Qirandri Mrorirhaldarr” and is signed “Mrradar Sanufar” underneath." + closed_desc = " The pages within are a mix of clearly indexed case files, and study notes alongside less clearly indexed pages that appears to be fragmented thoughts, not unlike a diary. The very first page of the journal reads 'dedicated to Qirandri Mrorirhaldarr' and is signed 'Mrradar Sanufar' underneath." icon = 'icons/obj/custom_items/kathira_journal.dmi' icon_override = 'icons/obj/custom_items/kathira_journal.dmi' icon_state = "kath_journal" @@ -2381,6 +2136,97 @@ All custom items with worn sprites must follow the contained sprite system: http has_suit.verbs -= /obj/item/clothing/accessory/poncho/tajarancloak/fluff/kathira_cloak/verb/change_cloak ..() + +/obj/item/clothing/suit/storage/toggle/fluff/leonid_chokha //Old Rebel's Chokha - Leonid Myagmar - lucaken + name = "old rebel's chokha" + desc = "A not-so traditional Vysokan Chokha made out of beat-up gurmori leathers, worn-out to the point of seeming ancient. Though it might have been a Host-boy's garment once, it is now \ + swarmed with dozens of patches all with varying colours and origins - the most prominent of which is a large image of a crimson snake on a white plain, curled around a fire. It's the oldest \ + out of all the adornments." + icon = 'icons/obj/custom_items/leonid_chokha.dmi' + icon_override = 'icons/obj/custom_items/leonid_chokha.dmi' + icon_state = "leonid_chokha" + item_state = "leonid_chokha" + contained_sprite = TRUE + + +/obj/item/clothing/suit/storage/toggle/fluff/sezrak_coat //red Domelkoan Coat - Sezrak Han'san - captaingecko + name = "red Domelkoan Coa" + desc = "A warm coat made in Domelkos. This red coat is stuffed with yupmi fur and made out of reinforced cloth-like synthetic materials, both to keep the wearer warm in the cold winters of \ + Moroz, and to resist all but the rougher treatments... All the while remaining good-looking enough. Both shoulders on this coat feature the standard of the Han'san clan-house, presented in a \ + gilded color." + icon = 'icons/obj/custom_items/sezrak_coat.dmi' + icon_override = 'icons/obj/custom_items/sezrak_coat.dmi' + icon_state = "sezcoat" + item_state = "sezcoat" + contained_sprite = TRUE + +/obj/item/clothing/accessory/poncho/fluff/sezrak_cape //Red Han'san Cape - Sezrak Han'san - captaingecko + name = "red Han'san cape" + desc = "This is a cape loosely based on the style of Dominian nobility, the latest fashion across Dominian space, although it doesn't feature any of the colors belonging to the Great Houses, \ + and doesn't bear the symbolism of the ones worn by Tribunalist priests. The left shoulder-side bears the standards of the Han'san clan-house with a small, discreet symbol of gilded colors, \ + instead of the usual Green used for this house." + icon = 'icons/obj/custom_items/sezrak_coat.dmi' + icon_override = 'icons/obj/custom_items/sezrak_coat.dmi' + icon_state = "sez_cape" + item_state = "sez_cape" + contained_sprite = TRUE + +/obj/item/journal/fluff/mrakiizar_book //Worn Journal - Azradov Mrakiizar - kingoftheping + name = "worn journal" + desc = "A heavily worn journal-like hardcover book. It is filled with lots of handwritten notes, lists and some sketches in between. Both the contents in the book, aswell as the loose pages \ + tucked in between are mostly written in Siik'maas. The front has a strip of tape with the name 'Ahkrraazarjhri Maalhalkasanurran' on it." + icon = 'icons/obj/custom_items/mrakiizar_book.dmi' + icon_override = 'icons/obj/custom_items/mrakiizar_book.dmi' + icon_state = "mrakiizar_book" + item_state = "mrakiizar_book" + contained_sprite = TRUE + +/obj/item/journal/fluff/mrakiizar_book/update_icon() + ..() + if(open) + icon_state = pick("mrakiizar_book1","mrakiizar_book2","mrakiizar_book3","mrakiizar_book4") + +/obj/item/clothing/accessory/fluff/jaquelyn_necklace //Shrapnel Necklace - Jaquelyn Roberts - roostercat12 + name = "shrapnel necklace" + desc = "A necklace consisting of a piece of shrapnel on a silver chain, with a pink wire running around the back. You can feel a pulse similar to a heartbeat from a small device on the back \ + side of the Shrapnel, with the wire feeding into it." + icon = 'icons/obj/custom_items/jaquelyn_necklace.dmi' + icon_override = 'icons/obj/custom_items/jaquelyn_necklace.dmi' + icon_state = "jaquelyn_necklace" + item_state = "jaquelyn_necklace" + contained_sprite = TRUE + slot_flags = SLOT_EARS | SLOT_TIE + + +/obj/item/clothing/under/fluff/quoro_robes //Black Robes - Quoro Wurri'Til - witchbells + name = "black robes" + desc = "Some simple black robes, made to wear under something more elaborate. The fabric has a distinct texture to it, giving you the impression of activewear or swimsuits." + icon = 'icons/obj/custom_items/quoro_items.dmi' + icon_override = 'icons/obj/custom_items/quoro_items.dmi' + icon_state = "quoro_robes" + item_state = "quoro_robes" + contained_sprite = TRUE + +/obj/item/clothing/head/fluff/quoro_hat //Skrellian Silver Headband - Quoro Wurri'Til - witchbells + name = "skrellian silver headband" + desc = "A jeweled silver headband worn at the base of the headtails." + icon = 'icons/obj/custom_items/quoro_items.dmi' + icon_override = 'icons/obj/custom_items/quoro_items.dmi' + icon_state = "quoro_hat" + item_state = "quoro_hat" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/fluff/quoro_suit //Skrellian Fancy Robes - Quoro Wurri'Til - witchbells + name = "skrellian fancy robes" + desc = "An elaborate yet functional set of robes favored by the upper echelons of skrellian society, with a silver belt attached. A star is embroidered on the back, \ + symbolizing the Jargon Federation." + icon = 'icons/obj/custom_items/quoro_items.dmi' + icon_override = 'icons/obj/custom_items/quoro_items.dmi' + icon_state = "quoro_suit" + item_state = "quoro_suit" + contained_sprite = TRUE + + /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng/fluff/eden_cloak // Zeng-Hu Jargon division cloak - Eden Li - Huntime name = "Zeng-Hu cloak: Jargon Division" desc = "A cloak worn by Zeng-Hu personnel who worked with or in the Jargon Federation." @@ -2388,3 +2234,4 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/eden_cloak.dmi' icon_state = "ZH_cape_custom" item_state = "ZH_cape_custom" + diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm index d8f400e9127..63dab614b81 100644 --- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm +++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm @@ -38,7 +38,7 @@ . = data var/datum/signal/signal - signal = telecomms_process_active() + signal = telecomms_process_active(user.loc.z) VUEUI_SET_CHECK(data["isAI"], isAI(user), ., data) data["crewmembers"] = list() diff --git a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm index 956c804d466..d9933ba07e8 100644 --- a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm +++ b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm @@ -37,7 +37,7 @@ data["_PC"] = get_header_data(data["_PC"]) var/datum/signal/signal - signal = telecomms_process_active() + signal = telecomms_process_active(user.loc.z) var/list/mechs = list() var/list/robots = list() diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm index f74a108306b..4dc1b4454e9 100644 --- a/code/modules/nano/modules/crew_monitor.dm +++ b/code/modules/nano/modules/crew_monitor.dm @@ -17,7 +17,7 @@ // This checks if TCOMS is online using the test proc. If it isn't, the suit sensor data isn't loaded. var/datum/signal/signal - signal = telecomms_process_active() + signal = telecomms_process_active(user.loc.z) data["signal"] = 0 if(signal.data["done"] == 1) data["isAI"] = isAI(user) diff --git a/html/changelogs/SuitSensorFix.yml b/html/changelogs/SuitSensorFix.yml new file mode 100644 index 00000000000..0dc74823106 --- /dev/null +++ b/html/changelogs/SuitSensorFix.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed suit sensors acting weirdly with telecomms" diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi index c2e02d4e7c4..e93465bfe42 100644 Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ diff --git a/icons/obj/custom_items/daliyah_visa.dmi b/icons/obj/custom_items/daliyah_visa.dmi deleted file mode 100644 index ba46104615c..00000000000 Binary files a/icons/obj/custom_items/daliyah_visa.dmi and /dev/null differ diff --git a/icons/obj/custom_items/jaquelyn_necklace.dmi b/icons/obj/custom_items/jaquelyn_necklace.dmi new file mode 100644 index 00000000000..260f25a8e87 Binary files /dev/null and b/icons/obj/custom_items/jaquelyn_necklace.dmi differ diff --git a/icons/obj/custom_items/kir_bandanna.dmi b/icons/obj/custom_items/kir_bandanna.dmi deleted file mode 100644 index 248d3aa47c2..00000000000 Binary files a/icons/obj/custom_items/kir_bandanna.dmi and /dev/null differ diff --git a/icons/obj/custom_items/leonid_chokha.dmi b/icons/obj/custom_items/leonid_chokha.dmi new file mode 100644 index 00000000000..fb0115d6605 Binary files /dev/null and b/icons/obj/custom_items/leonid_chokha.dmi differ diff --git a/icons/obj/custom_items/lunea_gloves.dmi b/icons/obj/custom_items/lunea_gloves.dmi deleted file mode 100644 index 0c580276055..00000000000 Binary files a/icons/obj/custom_items/lunea_gloves.dmi and /dev/null differ diff --git a/icons/obj/custom_items/mrakiizar_book.dmi b/icons/obj/custom_items/mrakiizar_book.dmi new file mode 100644 index 00000000000..e9af53007d3 Binary files /dev/null and b/icons/obj/custom_items/mrakiizar_book.dmi differ diff --git a/icons/obj/custom_items/muhawir_items.dmi b/icons/obj/custom_items/muhawir_items.dmi deleted file mode 100644 index 2b5c61d6928..00000000000 Binary files a/icons/obj/custom_items/muhawir_items.dmi and /dev/null differ diff --git a/icons/obj/custom_items/oscar_helmet.dmi b/icons/obj/custom_items/oscar_helmet.dmi deleted file mode 100644 index 242776088ac..00000000000 Binary files a/icons/obj/custom_items/oscar_helmet.dmi and /dev/null differ diff --git a/icons/obj/custom_items/quoro_items.dmi b/icons/obj/custom_items/quoro_items.dmi new file mode 100644 index 00000000000..ea070d1e4d4 Binary files /dev/null and b/icons/obj/custom_items/quoro_items.dmi differ diff --git a/icons/obj/custom_items/sezrak_coat.dmi b/icons/obj/custom_items/sezrak_coat.dmi new file mode 100644 index 00000000000..905e418993d Binary files /dev/null and b/icons/obj/custom_items/sezrak_coat.dmi differ diff --git a/icons/obj/custom_items/zhilin_book.dmi b/icons/obj/custom_items/zhilin_book.dmi deleted file mode 100644 index ed6cf4b3ed0..00000000000 Binary files a/icons/obj/custom_items/zhilin_book.dmi and /dev/null differ diff --git a/icons/obj/custom_items/zhilin_necklace.dmi b/icons/obj/custom_items/zhilin_necklace.dmi deleted file mode 100644 index a5b737dfa10..00000000000 Binary files a/icons/obj/custom_items/zhilin_necklace.dmi and /dev/null differ