diff --git a/code/game/objects/items/devices/lighting/flare.dm b/code/game/objects/items/devices/lighting/flare.dm index 2c05130c0f5..0ce5d55b421 100644 --- a/code/game/objects/items/devices/lighting/flare.dm +++ b/code/game/objects/items/devices/lighting/flare.dm @@ -156,11 +156,7 @@ icon_state = "torch-empty" item_state = "torch-empty" icon = 'icons/obj/lighting.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_lighting.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_lighting.dmi', - ) - + contained_sprite = TRUE drop_sound = 'sound/items/drop/woodweapon.ogg' pickup_sound = 'sound/items/pickup/woodweapon.ogg' diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index 23ffb96af47..b694c1d600a 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -3,10 +3,6 @@ desc = "A hand-held emergency light." desc_info = "Use this item in your hand, to turn on the light. Click this light with the opposite hand, to remove the cell contained inside." icon = 'icons/obj/lighting.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_lighting.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_lighting.dmi', - ) icon_state = "flashlight" item_state = "flashlight" w_class = WEIGHT_CLASS_SMALL @@ -399,10 +395,6 @@ desc = "A mining lantern. Accepts larger cells than normal flashlights." icon_state = "lantern" item_state = "lantern" - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_mining.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_mining.dmi', - ) attack_verb = list("bludgeoned, bashed, whacked") matter = list(MATERIAL_STEEL = 200,MATERIAL_GLASS = 100) flashlight_power = 1 diff --git a/code/game/objects/items/devices/lighting/lamp.dm b/code/game/objects/items/devices/lighting/lamp.dm index 018bd56dfeb..e868c5e5ce5 100644 --- a/code/game/objects/items/devices/lighting/lamp.dm +++ b/code/game/objects/items/devices/lighting/lamp.dm @@ -86,7 +86,6 @@ desc = "A portable, beautiful and flashy stage light!" light_color = COLOR_ORANGE icon_state = "stage" - item_state = "stage" /obj/item/device/flashlight/lamp/holodeck name = "holographic lighting orb" @@ -97,7 +96,6 @@ light_color = "#ffcb9b" icon = 'icons/effects/props/holodeck/holodeck_tools.dmi' icon_state = "orb" - item_state = "orb" /obj/item/device/flashlight/lamp/holodeck/attack_hand(mob/user) toggle() @@ -109,4 +107,3 @@ light_color = "#ffcb9b" icon = 'icons/effects/props/holodeck/konyang/32x32.dmi' icon_state = "boxlamp" - item_state = "boxlamp" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index d48edcdf037..f653748e7fb 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -291,6 +291,7 @@ /obj/item/device/radio/headset/headset_service/alt name = "service radio bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "srv_headset_alt" item_state = "srv_headset_alt" @@ -320,6 +321,7 @@ /obj/item/device/radio/headset/heads/xo/alt name = "executive officer's bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "hop_headset_alt" item_state = "headset_alt" @@ -353,6 +355,7 @@ /obj/item/device/radio/headset/headset_eng/alt name = "engineering bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "eng_headset_alt" item_state = "headset_alt" @@ -382,6 +385,7 @@ /obj/item/device/radio/headset/heads/ce/alt name = "chief engineer's bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "ce_headset_alt" item_state = "headset_alt" @@ -415,6 +419,7 @@ /obj/item/device/radio/headset/headset_cargo/alt name = "cargo bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "cargo_headset_alt" item_state = "headset_alt" @@ -471,6 +476,7 @@ /obj/item/device/radio/headset/operations_manager/alt name = "operations manager bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "qm_headset_alt" item_state = "headset_alt" @@ -504,6 +510,7 @@ /obj/item/device/radio/headset/headset_med/alt name = "medical bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "med_headset_alt" item_state = "headset_alt" @@ -533,6 +540,7 @@ /obj/item/device/radio/headset/heads/cmo/alt name = "chief medical officer's bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "cmo_headset_alt" item_state = "headset_alt" @@ -566,6 +574,7 @@ /obj/item/device/radio/headset/headset_sci/alt name = "science bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "sci_headset_alt" /obj/item/device/radio/headset/alt/double/sci @@ -594,6 +603,7 @@ /obj/item/device/radio/headset/headset_xenoarch/alt name = "xenoarchaeology bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "sci_headset_alt" /obj/item/device/radio/headset/alt/double/xenoarch @@ -622,6 +632,7 @@ /obj/item/device/radio/headset/headset_anom/alt name = "anomalist bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "sci_headset_alt" /obj/item/device/radio/headset/alt/double/anom @@ -656,6 +667,7 @@ /obj/item/device/radio/headset/heads/rd/alt name = "research director's bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "rd_headset_alt" item_state = "headset_alt" @@ -689,6 +701,7 @@ /obj/item/device/radio/headset/headset_sec/alt name = "security bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "sec_headset_alt" item_state = "headset_alt" @@ -718,6 +731,7 @@ /obj/item/device/radio/headset/headset_warden/alt name = "warden bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "sec_headset_alt" item_state = "headset_alt" @@ -747,6 +761,7 @@ /obj/item/device/radio/headset/heads/hos/alt name = "head of security's bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "hos_headset_alt" item_state = "headset_alt" @@ -780,6 +795,7 @@ /obj/item/device/radio/headset/headset_com/alt name = "command bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" @@ -809,6 +825,7 @@ /obj/item/device/radio/headset/heads/captain/alt name = "captain's bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "cap_headset_alt" item_state = "headset_alt" @@ -886,6 +903,7 @@ /obj/item/device/radio/headset/syndicate/alt name = "military bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "syn_headset_alt" item_state = "headset_alt" @@ -981,6 +999,7 @@ /obj/item/device/radio/headset/ert/alt name = "emergency response team bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" @@ -1003,6 +1022,7 @@ /obj/item/device/radio/headset/representative/alt name = "representative bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" diff --git a/code/game/objects/items/devices/versebook.dm b/code/game/objects/items/devices/versebook.dm index def62acd7fc..9c9bf26c138 100644 --- a/code/game/objects/items/devices/versebook.dm +++ b/code/game/objects/items/devices/versebook.dm @@ -2,10 +2,6 @@ name = "\improper versebook" desc = "If you see this, someone fucked up. Make a issue request." desc_extended = "No, seriously. Make a issue request" - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_books.dmi', - ) icon = 'icons/obj/library.dmi' icon_state = "dominiabook" item_state = "dominia" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 999d6a07b77..eb4200dfa95 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -299,6 +299,8 @@ name = "comic book" desc = "A magazine presenting a fictional story through a sequence of images. Perfect for those long, boring shifts." w_class = WEIGHT_CLASS_SMALL + icon = 'icons/obj/library.dmi' + contained_sprite = TRUE icon_state = "comic" item_state = "comic" drop_sound = 'sound/items/drop/paper.ogg' @@ -308,16 +310,16 @@ name = "inspector 404 manga" desc = "Inspector 404 follows the adventures of the titular I404, a shell inspector from Konyang. This issue, #67, follows the \ 404, also known as Kyung-Sun's quest to bring down the corrupt Superintendent Hayashi." - icon_state = "comicinspector" - item_state = "comicinspector" + icon_state = "comic_inspector" + item_state = "comic_inspector" /obj/item/toy/comic/stormman name = "stormman manga" desc = "Stormman, often stylized as STORMMAN! is one of Konyang's most beloved anime series, following a masked superhero named Stormman \ who has the power to harness the weather to defend his homeworld while keeping his secret identity. Since its release, all kinds of merchandise \ have been made, including a conversion of the show to a paperback manga." - icon_state = "comicstormman" - item_state = "comicstormman" + icon_state = "comic_stormman" + item_state = "comic_stormman" /obj/item/toy/comic/outlandish_tales name = "outlandish tales magazine" @@ -328,13 +330,13 @@ aspects of fantasy, horror, and speculative fiction alongside Adhomian paranormal elements, frequently reimagining mythological creatures and events. Tajaran Otherworldly texts are usually \ published in magazines or on extranet sites." icon_state = "comicoutlandish" - item_state = "comicoutlandish" + item_state = "comic" /obj/item/toy/comic/azmarian name = "az'marian comic" desc = "A comic book series revolving around a superhero from Az'Mar, popular in the New Kingdom." icon_state = "comicazmarian" - item_state = "comicazmarian" + item_state = "comic" /obj/item/toy/comic/azmarian/issue_1 desc_extended = "Issue 1 - The Az'Marian Landing! - In this issue, the would-be hero departs from Az'Mar and lands in a war-torn \ @@ -389,7 +391,6 @@ newly regained powers to their fullest." /obj/item/toy/comic/witchfinder - icon = 'icons/obj/library.dmi' name = "Witchfinder novel" desc = "A popular genre of Dominian mystery literature, glorifying the Tribunal Investigations Constabulary and the work they do in \ defending the souls of the people of the Empire." @@ -399,7 +400,7 @@ authors of witchfinder novels, such as Novi Jadran's Andrija Jurina, even travel abroad as honored servants of His Imperial Majesty Boleslaw Keeser, both to \ promote Dominian arts among their foreign partners and to proselytize their state religion to eager masses." icon_state = "witchfindernovel" - item_state = "witchfindernovel" + item_state = "book" // // Toy Crossbows diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 49409b1c308..ddc1c75307b 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -3,10 +3,6 @@ desc = "A holy item, containing the written words of a religion." icon_state = "bible" item_state = "bible" - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' - ) icon = 'icons/obj/library.dmi' throw_speed = 1 throw_range = 5 diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index 71bcabca47b..4542d2baf24 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -343,6 +343,7 @@ /obj/item/device/radio/headset/ert/ccia/alt name = "central command internal affairs bowman headset" + icon = 'icons/obj/item/device/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 0250904cee6..2472c6647fe 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -190,10 +190,7 @@ /obj/item/book name = "book" icon = 'icons/obj/library.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' - ) + contained_sprite = TRUE icon_state = "book" desc_antag = "As a Cultist, this item can be reforged to become a cult tome." throw_speed = 1 diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 59a1b507f5a..4421f4ced2a 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -205,10 +205,7 @@ name = "SolCom manual" desc = "A manual designated to teach the user about the martial art of solarian combat, a style based on traditional human martial arts." icon = 'icons/obj/library.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' - ) + contained_sprite = TRUE icon_state ="cqcmanual" item_state ="book1" var/martial_art = /datum/martial_art/sol_combat diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index f02862bb4c7..3891868325e 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -13,8 +13,5 @@ icon = 'icons/obj/library.dmi' icon_state = "scroll" item_state = "scroll" - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' - ) + contained_sprite = TRUE can_prepare = 0 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 84a082f08dd..ebe2486f11d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -5677,17 +5677,6 @@ glass_desc = "And Our Lady did come down from the mountain, and She was flanked in radiant and ever-burning cosmic fires. And She spoke with the Lady Caladius for what seemed an eternity, \ and the Lady Caladius did finally emerge. And we happy few were so blessed as to hear her- the Prophetess Giovanna- say, 'Drink today not as warriors, but as immortals.'." -/singleton/reagent/alcohol/mimosa - name = "Mimosa" - color = "#d87606" - description = "Champagne and orange juice. A festive cocktail usually served at high-end events, such as weddings, business brunch, or even as a first-class drink on passenger transports." - strength = 35 - taste_description = "sparkling orange juice" - - glass_icon_state = "mimosa_glass" - glass_name = "glass of Mimosa" - glass_desc = "Champagne and orange juice. A festive cocktail usually served at high-end events, such as weddings, business brunch, or even as a first-class drink on passenger transports." - /singleton/reagent/alcohol/lights_edge name = "Light's Edge" color = "#592ada" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index da83637173d..71b54b0a1ad 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3175,13 +3175,6 @@ required_reagents = list(/singleton/reagent/drink/milk = 1, /singleton/reagent/nutriment/choconutspread = 1, /singleton/reagent/drink/milk/cream = 1) result_amount = 3 -/datum/chemical_reaction/drink/drink/mimosa - name = "Mimosa" - id = "mimosa" - result = /singleton/reagent/alcohol/mimosa - required_reagents = list(/singleton/reagent/alcohol/champagne = 1, /singleton/reagent/drink/orangejuice = 1) - result_amount = 2 - /datum/chemical_reaction/drink/lights_edge name = "Light's Edge" id = "lights_edge" diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index c85074a4e9a..81e673759b6 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -73,6 +73,13 @@ GLOBAL_LIST_EMPTY(gps_list) STOP_PROCESSING(SSprocessing, src) return ..() +/obj/item/device/gps/attack_self(mob/user, modifiers) + if(!emped) + ui_interact(user) + + var/turf/T = get_turf(src) + to_chat(user, SPAN_NOTICE("[icon2html(src, user)] [src] flashes [T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)].")) + /obj/item/device/gps/update_icon() ClearOverlays() if(emped) diff --git a/html/changelogs/SimpleMaroon-itspeak(edcap).yml b/html/changelogs/SimpleMaroon-itspeak(edcap).yml deleted file mode 100644 index 68bebce7834..00000000000 --- a/html/changelogs/SimpleMaroon-itspeak(edcap).yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: SimpleMaroon - -# 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 corporate peaked cap selection to the loadout for Security, the Captain, and the XO. They look like the Warden's hat, but also come in options with no logo for more customization." diff --git a/html/changelogs/SimpleMaroon-morepocketwatchstuff.yml b/html/changelogs/SimpleMaroon-morepocketwatchstuff.yml deleted file mode 100644 index 51e63040f20..00000000000 --- a/html/changelogs/SimpleMaroon-morepocketwatchstuff.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: SimpleMaroon - -# 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: - - qol: "Pocket watches now have held sprites for both open and closed states, as well as flipped sprites for when worn on the wrists." diff --git a/html/changelogs/SimpleMaroon-narrowsflag.yml b/html/changelogs/SimpleMaroon-narrowsflag.yml deleted file mode 100644 index 1beb56063ce..00000000000 --- a/html/changelogs/SimpleMaroon-narrowsflag.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: SimpleMaroon - -# 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: - - imageadd: "Added an HPS Narrows flag and banner to the loadout." diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index 101ca209198..658d31d4758 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -134,3 +134,42 @@ - qol: The armory now contains six total 5.56mm carbine magazines, instead of four magazines and two singular 5.56mm bullet casings. - bugfix: The shuttle airlock of the SPLF ghostrole now functions properly. +2025-01-25: + ASmallCuteCat: + - qol: More organs now have description text. Enjoy my stupid sense of humor, or + lack thereof. The taste of said organs has not been affected. + ChangeMe: + - rscadd: Added a changelog editing system that should cause fewer conflicts and + more accurate timestamps. + - rscdel: Killed innocent kittens. + Furrycactus: + - rscadd: Added a chemistry equipment locker to the Research chemistry lab, to allow + for easier storage, transport, and testing of any produced substances. + - rscadd: Added two large beakers to the Research chemistry lab. + - rscadd: Added a pipe connection from the connectors in Atmospherics to a connector + in storage behind the Bluespace Drive, to cut out the hardest and most tedious + portion of piping a gas mix to the drive. + MattAtlas: + - rscadd: Visible emotes now have runetext as well. + SimpleMaroon: + - rscadd: Added a corporate peaked cap selection to the loadout for Security, the + Captain, and the XO. They look like the Warden's hat, but also come in options + with no logo for more customization. + - imageadd: Added an HPS Narrows flag and banner to the loadout. + - qol: Pocket watches now have held sprites for both open and closed states, as + well as flipped sprites for when worn on the wrists. + Tag103: + - bugfix: Default gargoyle voidsuits and SFA gargoyle voidsuits no longer have their + sprites swapped with each other. + Wowzewow (Wezzy): + - imageadd: Resprites devices, fixes inhands, puts them in contained sprites. + - imageadd: Adds new mounted flash sprites. + - imagedel: Removes superfluous GPS item. + pocheto: + - imageadd: Added 25 new screens for Baseline IPCs. +2025-01-26: + Wowzewow (Wezzy): + - bugfix: Fixes books and flashlight bad icons. + - bugfix: Fixes the GPS. + - bugfix: Removes duplicate mimosa entry. Fixes invisible mimosa bug. + - bugfix: Fixes some mapped shirts with wrong paths. diff --git a/html/changelogs/furrycactus - atmos pipe tidying.yml b/html/changelogs/furrycactus - atmos pipe tidying.yml deleted file mode 100644 index 60442138f20..00000000000 --- a/html/changelogs/furrycactus - atmos pipe tidying.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: Furrycactus - -# 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 pipe connection from the connectors in Atmospherics to a connector in storage behind the Bluespace Drive, to cut out the hardest and most tedious portion of piping a gas mix to the drive." diff --git a/html/changelogs/furrycactus - d3 open turf.yml b/html/changelogs/furrycactus - d3 open turf.yml deleted file mode 100644 index 26d3bc32aaf..00000000000 --- a/html/changelogs/furrycactus - d3 open turf.yml +++ /dev/null @@ -1,59 +0,0 @@ -################################ -# 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: ChangeMe - -# 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 changelog editing system that should cause fewer conflicts and more accurate timestamps." - - rscdel: "Killed innocent kittens." diff --git a/html/changelogs/furrycactus - research chem additions.yml b/html/changelogs/furrycactus - research chem additions.yml deleted file mode 100644 index dbfb89100df..00000000000 --- a/html/changelogs/furrycactus - research chem additions.yml +++ /dev/null @@ -1,59 +0,0 @@ -################################ -# 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: Furrycactus - -# 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 chemistry equipment locker to the Research chemistry lab, to allow for easier storage, transport, and testing of any produced substances." - - rscadd: "Added two large beakers to the Research chemistry lab." diff --git a/html/changelogs/mattatlas-heygarconhounidea.yml b/html/changelogs/mattatlas-heygarconhounidea.yml deleted file mode 100644 index fd2c2ae17da..00000000000 --- a/html/changelogs/mattatlas-heygarconhounidea.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: MattAtlas - -# 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: "Visible emotes now have runetext as well." diff --git a/html/changelogs/more_organ_flavor_text.yml b/html/changelogs/more_organ_flavor_text.yml deleted file mode 100644 index cde7eb6da79..00000000000 --- a/html/changelogs/more_organ_flavor_text.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: ASmallCuteCat - -# 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: - - qol: "More organs now have description text. Enjoy my stupid sense of humor, or lack thereof. The taste of said organs has not been affected." diff --git a/html/changelogs/pocheto-pochetoscreens.yml b/html/changelogs/pocheto-pochetoscreens.yml deleted file mode 100644 index c5cf6a0944a..00000000000 --- a/html/changelogs/pocheto-pochetoscreens.yml +++ /dev/null @@ -1,58 +0,0 @@ -################################ -# 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: pocheto - -# 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: - - imageadd: "Added 25 new screens for Baseline IPCs." diff --git a/html/changelogs/tag103-guardianagainstevil.yml b/html/changelogs/tag103-guardianagainstevil.yml deleted file mode 100644 index 6fd268ba99d..00000000000 --- a/html/changelogs/tag103-guardianagainstevil.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Tag103 - -delete-after: True - -changes: - - bugfix: "Default gargoyle voidsuits and SFA gargoyle voidsuits no longer have their sprites swapped with each other." diff --git a/html/changelogs/wezzy_device_resprite.yml b/html/changelogs/wezzy_device_resprite.yml deleted file mode 100644 index b455716d1c8..00000000000 --- a/html/changelogs/wezzy_device_resprite.yml +++ /dev/null @@ -1,60 +0,0 @@ -################################ -# 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: Wowzewow (Wezzy) - -# 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: - - imageadd: "Resprites devices, fixes inhands, puts them in contained sprites." - - imageadd: "Adds new mounted flash sprites." - - imagedel: "Removes superfluous GPS item." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f0c80f33b05..a80b653a3ce 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand_books.dmi b/icons/mob/items/lefthand_books.dmi deleted file mode 100644 index 64ff13af387..00000000000 Binary files a/icons/mob/items/lefthand_books.dmi and /dev/null differ diff --git a/icons/mob/items/lefthand_lighting.dmi b/icons/mob/items/lefthand_lighting.dmi deleted file mode 100644 index 6cf6b6f25f5..00000000000 Binary files a/icons/mob/items/lefthand_lighting.dmi and /dev/null differ diff --git a/icons/mob/items/lefthand_mining.dmi b/icons/mob/items/lefthand_mining.dmi index b43a246f887..f32a95c1530 100644 Binary files a/icons/mob/items/lefthand_mining.dmi and b/icons/mob/items/lefthand_mining.dmi differ diff --git a/icons/mob/items/righthand_books.dmi b/icons/mob/items/righthand_books.dmi deleted file mode 100644 index 9ba34c2db3f..00000000000 Binary files a/icons/mob/items/righthand_books.dmi and /dev/null differ diff --git a/icons/mob/items/righthand_lighting.dmi b/icons/mob/items/righthand_lighting.dmi deleted file mode 100644 index 233d2235384..00000000000 Binary files a/icons/mob/items/righthand_lighting.dmi and /dev/null differ diff --git a/icons/mob/items/righthand_mining.dmi b/icons/mob/items/righthand_mining.dmi index 9a894f3c50e..b86b14ab3d2 100644 Binary files a/icons/mob/items/righthand_mining.dmi and b/icons/mob/items/righthand_mining.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 1320f4e5949..c06be6fa1c4 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index ce06c662984..3c5b87a7219 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 516020eabce..09683d07402 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm index 3a13aea9798..5d3e30fe163 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm @@ -37448,25 +37448,25 @@ /obj/structure/table/rack/clothing{ dir = 4 }, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ pixel_y = 4; pixel_x = 6 }, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ pixel_y = 4; pixel_x = 6 }, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ pixel_x = 6 }, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ pixel_x = 6 }, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ pixel_y = -4; pixel_x = 6 }, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ pixel_y = -4; pixel_x = 6 }, diff --git a/maps/away/ships/lone_spacer/lone_spacer.dmm b/maps/away/ships/lone_spacer/lone_spacer.dmm index 7c45634f608..ebb4c27cb1c 100644 --- a/maps/away/ships/lone_spacer/lone_spacer.dmm +++ b/maps/away/ships/lone_spacer/lone_spacer.dmm @@ -771,7 +771,7 @@ color = "#494949" }, /obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/accessory/dressshirt{ +/obj/item/clothing/under/dressshirt{ color = "#bbbbbb" }, /obj/item/clothing/pants/jeansblack, diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 53c799416e9..8bc2f030ad4 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -1200,7 +1200,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 6 }, -/obj/item/clothing/accessory/dressshirt/alt, +/obj/item/clothing/under/dressshirt/alt, /obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/kneepads, /obj/item/clothing/accessory/storage/overalls, diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index bfbfd69e53a..5dcb79b8e92 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -1214,24 +1214,24 @@ /area/shuttle/yacht_civ_shuttle) "lP" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/accessory/dressshirt/alt/vneck, +/obj/item/clothing/under/dressshirt/alt/vneck, /obj/item/clothing/accessory/sweater/argyle/crewneck{ color = "#44AA44" }, /obj/item/clothing/accessory/sweater/v_neck{ color = "#BB3333" }, -/obj/item/clothing/accessory/dressshirt, -/obj/item/clothing/accessory/dressshirt/alt{ +/obj/item/clothing/under/dressshirt, +/obj/item/clothing/under/dressshirt/alt{ color = "#DEDEDE" }, -/obj/item/clothing/accessory/dressshirt/asymmetric{ +/obj/item/clothing/under/dressshirt/asymmetric{ color = "#DEDEDE" }, -/obj/item/clothing/accessory/dressshirt/alt/rolled{ +/obj/item/clothing/under/dressshirt/alt/rolled{ color = "#3131B1" }, -/obj/item/clothing/accessory/dressshirt/alt/rolled{ +/obj/item/clothing/under/dressshirt/alt/rolled{ color = "#DEDEDE" }, /obj/item/clothing/accessory/sweater/argyle{