to add it to the group" + desc = "Drag and drop a button into this spot
to add it to the group." icon = 'icons/mob/screen_gen.dmi' icon_state = "reserved" // We want our whole 32x32 space to be clickable, so dropping's forgiving diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 2cf74f2d8a86..5fbf8c8ef26e 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -100,7 +100,7 @@ icon = 'icons/mob/screen_alert.dmi' icon_state = "default" name = "Alert" - desc = "Something seems to have gone wrong with this alert, so report this bug please" + desc = "Something seems to have gone wrong with this alert, so report this bug please." mouse_opacity = MOUSE_OPACITY_ICON /// How long before this alert automatically clears itself (in deciseconds). If zero, remains until cleared. var/timeout = 0 diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index fedb13714ace..097d3c409e62 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -65,7 +65,7 @@ */ /obj/item/tk_grab name = "Telekinetic Grab" - desc = "Magic" + desc = "Magic." icon = 'icons/obj/magic.dmi'//Needs sprites icon_state = "2" flags = NOBLUDGEON | ABSTRACT | DROPDEL diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index 639fc1737099..86ae6cf7e7d4 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -69,6 +69,7 @@ SUBSYSTEM_DEF(ticker) var/list/flagged_antag_rollers = list() /// List of biohazards keyed to the last time their population was sampled. var/list/biohazard_pop_times = list() + var/list/biohazard_included_admin_spawns = list() /datum/controller/subsystem/ticker/Initialize() login_music = pick(\ @@ -833,6 +834,9 @@ SUBSYSTEM_DEF(ticker) else SSblackbox.record_feedback("nested tally", "biohazards", 1, list("defeated", biohazard)) + for(var/biohazard in SSticker.biohazard_included_admin_spawns) + SSblackbox.record_feedback("nested tally", "biohazards", 1, list("included_admin_spawns", biohazard)) + /datum/controller/subsystem/ticker/proc/count_xenomorps() . = 0 for(var/datum/mind/xeno_mind in SSticker.mode.xenos) @@ -842,6 +846,9 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/sample_biohazard_population(biohazard) SSblackbox.record_feedback("ledger", "biohazard_pop_[BIOHAZARD_POP_INTERVAL_STR]_interval", biohazard_count(biohazard), biohazard) + if(any_admin_spawned_mobs(biohazard) && !(biohazard in biohazard_included_admin_spawns)) + biohazard_included_admin_spawns[biohazard] = TRUE + biohazard_pop_times[biohazard] = world.time /// Record the initial time that a biohazard spawned. @@ -849,6 +856,24 @@ SUBSYSTEM_DEF(ticker) SSblackbox.record_feedback("associative", "biohazard_starts", 1, list("type" = biohazard, "time_ds" = world.time - time_game_started)) sample_biohazard_population(biohazard) +/// Returns whether the given biohazard includes mobs that were admin spawned. +/// Only returns TRUE or FALSE, does not attempt to track which mobs were +/// admin-spawned and which ones weren't. +/datum/controller/subsystem/ticker/proc/any_admin_spawned_mobs(biohazard) + switch(biohazard) + if(TS_INFESTATION_GREEN_SPIDER, TS_INFESTATION_WHITE_SPIDER, TS_INFESTATION_PRINCESS_SPIDER, TS_INFESTATION_QUEEN_SPIDER, TS_INFESTATION_PRINCE_SPIDER) + for(var/mob/living/simple_animal/hostile/poison/terror_spider/S in GLOB.ts_spiderlist) + if(S.admin_spawned) + return TRUE + if(BIOHAZARD_XENO) + for(var/datum/mind/xeno_mind in SSticker.mode.xenos) + if(xeno_mind.current?.admin_spawned) + return TRUE + if(BIOHAZARD_BLOB) + for(var/atom/blob_overmind in SSticker.mode.blob_overminds) + if(blob_overmind.admin_spawned) + return TRUE + /datum/controller/subsystem/ticker/proc/biohazard_count(biohazard) switch(biohazard) if(TS_INFESTATION_GREEN_SPIDER, TS_INFESTATION_WHITE_SPIDER, TS_INFESTATION_PRINCESS_SPIDER, TS_INFESTATION_QUEEN_SPIDER) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 0d1e158d9baf..405e3d44a490 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -541,6 +541,8 @@ else item = "[VV_HTML_ENCODE(name)] = /list ([length(L)])" + else if(name in GLOB.bitfields) + item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(translate_bitfield(VV_BITFIELD, name, value))]" else item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(value)]" diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index a808c7cc1f5b..debafbadd42f 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -67,7 +67,7 @@ /datum/dog_fashion/head/chef name = "Sous chef REAL_NAME" - desc = "Your food will be taste-tested. All of it." + desc = "Your food will be taste-tested. All of it." /datum/dog_fashion/head/captain @@ -252,7 +252,7 @@ /datum/dog_fashion/head/not_ian name = "Definitely Not REAL_NAME" - desc = "That's Definitely Not Dogname" + desc = "That's Definitely Not Dogname." /datum/dog_fashion/head/not_ian/New(mob/M) ..() diff --git a/code/datums/revision.dm b/code/datums/revision.dm index 10d5ee1d09d6..5b843266268b 100644 --- a/code/datums/revision.dm +++ b/code/datums/revision.dm @@ -100,6 +100,11 @@ GLOBAL_PROTECT(revision_info) // Dont mess with this else msg += "Server Commit: Unable to determine" + msg += "RUST-G Build: [rustg_get_version()]" + + if(world.TgsAvailable()) + msg += "TGS Version: [world.TgsVersion()] (API: [world.TgsApiVersion()])" + if(world.TgsAvailable() && length(GLOB.revision_info.testmerges)) msg += "Active Testmerges:" msg += GLOB.revision_info.get_testmerge_chatmessage(FALSE) diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 98ccb16f1ea7..de957d20cec7 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -59,7 +59,7 @@ /datum/map_template/ruin/lavaland/althland_excavation name = "Althland Excavation" id = "althland-excavation" - description = "An abandoned mining pit, once operated by the late Althland Mining Corporation, stands as a testament to the extensive efforts of numerous labor groups who endeavored to exploit the ore-rich depths of the planet. \ + description = "An abandoned mining pit, once operated by the late Althland Mining Corporation, stands as a testament to the extensive efforts of numerous labor groups who endeavored to exploit the ore-rich depths of the planet. \ Now, it lies abandoned, wholly reclaimed by the hostile environment, transforming into yet another relic of a lost company." cost = 5 suffix = "lavaland_surface_althland_excavation.dmm" diff --git a/code/datums/ruins/space_ruins.dm b/code/datums/ruins/space_ruins.dm index 12cd3bc7ce25..bb9fe505f34c 100644 --- a/code/datums/ruins/space_ruins.dm +++ b/code/datums/ruins/space_ruins.dm @@ -213,8 +213,9 @@ id = "dj" suffix = "dj.dmm" name = "Soviet DJ Station" - description = "An old soviet era listening station, long since defunct and lifeless, however the equipment is likely still in working condition." + description = "A USSP listening post masquerading as a popular Soviet entertainment broadcaster, keeping tabs on Nanotrasen activity in the system and relaying it back to the Union." cost = 2 + allow_duplicates = FALSE /datum/map_template/ruin/space/druglab id = "druglab" @@ -242,8 +243,9 @@ /datum/map_template/ruin/space/ussp_tele id = "ussp_tele" suffix = "ussp_tele.dmm" - name = "USSP Teleporter" - description = "An old, almost fully destroyed teleporter, seemingly part of what used to be a much larger structure." + name = "Derelict USSP Teleporter" + description = "An experimental teleporter of USSP origin, some terrible calamity has ripped it free from a larger structure and sent drifting through space." + allow_duplicates = FALSE // One uniquely flavoured abandoned tele to keep the flavour fresh. /datum/map_template/ruin/space/ussp id = "ussp" diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 3c226aa476ca..5657828fd3f3 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(spells, typesof(/datum/spell)) /datum/spell var/name = "Spell" // Only rename this if the spell you're making is not abstract - var/desc = "A wizard spell" + var/desc = "A wizard spell." var/school = "evocation" //not relevant at now, but may be important later if there are changes to how spells work. the ones I used for now will probably be changed... maybe spell presets? lacking flexibility but with some other benefit? ///recharge time in deciseconds var/base_cooldown = 10 SECONDS diff --git a/code/datums/spells/alien_spells/transfer_plasma.dm b/code/datums/spells/alien_spells/transfer_plasma.dm index 1ba29d900814..56fc7dace178 100644 --- a/code/datums/spells/alien_spells/transfer_plasma.dm +++ b/code/datums/spells/alien_spells/transfer_plasma.dm @@ -1,6 +1,6 @@ /datum/spell/alien_spell/transfer_plasma name = "Transfer Plasma" - desc = "Transfers 50 plasma to a nearby alien" + desc = "Transfers 50 plasma to a nearby alien." action_icon_state = "alien_transfer" plasma_cost = 50 diff --git a/code/datums/spells/conjure_item.dm b/code/datums/spells/conjure_item.dm index 0aad4922e64b..45c0b465f24d 100644 --- a/code/datums/spells/conjure_item.dm +++ b/code/datums/spells/conjure_item.dm @@ -1,6 +1,6 @@ /datum/spell/conjure_item name = "Summon weapon" - desc = "A generic spell that should not exist. This summons an instance of a specific type of item, or if one already exists, un-summons it." + desc = "A generic spell that should not exist. This summons an instance of a specific type of item, or if one already exists, un-summons it." invocation_type = "none" clothes_req = FALSE var/obj/item/item diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index a4e1727c1440..0812bae7a352 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -10,7 +10,7 @@ /datum/spell/aoe/conjure/build/floor name = "Summon Cult Floor" - desc = "This spell constructs a cult floor" + desc = "This spell constructs a cult floor." action_icon_state = "floorconstruct" action_background_icon_state = "bg_cult" school = "conjuration" @@ -24,7 +24,7 @@ /datum/spell/aoe/conjure/build/wall name = "Summon Cult Wall" - desc = "This spell constructs a cult wall" + desc = "This spell constructs a cult wall." action_icon_state = "cultforcewall" action_background_icon_state = "bg_cult" school = "conjuration" @@ -38,7 +38,7 @@ /datum/spell/aoe/conjure/build/wall/reinforced name = "Greater Construction" - desc = "This spell constructs a reinforced metal wall" + desc = "This spell constructs a reinforced metal wall." school = "conjuration" base_cooldown = 300 clothes_req = FALSE @@ -89,7 +89,7 @@ /datum/spell/aoe/conjure/build/lesserforcewall name = "Shield" - desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire" + desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire." action_icon_state = "cultforcewall" action_background_icon_state = "bg_cult" school = "transmutation" @@ -102,7 +102,7 @@ summon_lifespan = 200 /obj/effect/forcefield/cult - desc = "That eerie looking obstacle seems to have been pulled from another dimension through sheer force" + desc = "That eerie looking obstacle seems to have been pulled from another dimension through sheer force." name = "eldritch wall" icon = 'icons/effects/cult_effects.dmi' icon_state = "m_shield_cult" @@ -110,7 +110,7 @@ /datum/spell/ethereal_jaunt/shift name = "Phase Shift" - desc = "This spell allows you to pass through walls" + desc = "This spell allows you to pass through walls." action_icon_state = "phaseshift" action_background_icon_state = "bg_cult" base_cooldown = 200 diff --git a/code/datums/spells/mimic.dm b/code/datums/spells/mimic.dm index ec3c2bbc3e78..96b7f8081cc3 100644 --- a/code/datums/spells/mimic.dm +++ b/code/datums/spells/mimic.dm @@ -1,6 +1,6 @@ /datum/spell/mimic name = "Mimic" - desc = "Learn a new form to mimic or become one of your known forms" + desc = "Learn a new form to mimic or become one of your known forms." clothes_req = FALSE base_cooldown = 3 SECONDS action_icon_state = "morph_mimic" diff --git a/code/datums/spells/spacetime_dist.dm b/code/datums/spells/spacetime_dist.dm index 4070c7a73405..e487936fe03f 100644 --- a/code/datums/spells/spacetime_dist.dm +++ b/code/datums/spells/spacetime_dist.dm @@ -75,7 +75,7 @@ /obj/effect/cross_action name = "cross me" - desc = "for crossing" + desc = "for crossing." anchored = TRUE /obj/effect/cross_action/spacetime_dist diff --git a/code/datums/spells/wizard_spells.dm b/code/datums/spells/wizard_spells.dm index 89bdbdd8c496..3b70407a1a89 100644 --- a/code/datums/spells/wizard_spells.dm +++ b/code/datums/spells/wizard_spells.dm @@ -272,7 +272,7 @@ /datum/spell/aoe/conjure/construct name = "Artificer" - desc = "This spell conjures a construct which may be controlled by Shades" + desc = "This spell conjures a construct which may be controlled by Shades." school = "conjuration" base_cooldown = 600 @@ -288,7 +288,7 @@ /datum/spell/aoe/conjure/creature name = "Summon Creature Swarm" - desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth" + desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth." school = "conjuration" base_cooldown = 1200 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 1a7e58fc0acd..a45c6cb99fbd 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1131,7 +1131,7 @@ /atom/movable/screen/alert/status_effect/bubblegum_curse name = "I SEE YOU" - desc = "YOUR SOUL WILL BE MINE FOR YOUR INSOLENCE" + desc = "YOUR SOUL WILL BE MINE FOR YOUR INSOLENCE." icon_state = "bubblegumjumpscare" /atom/movable/screen/alert/status_effect/bubblegum_curse/Initialize(mapload) @@ -1342,7 +1342,7 @@ /obj/effect/bubblegum_warning name = "bloody rift" - desc = "You feel like even being *near* this is a bad idea" + desc = "You feel like even being *near* this is a bad idea." icon = 'icons/obj/biomass.dmi' icon_state = "rift" color = "red" diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 71959a987b71..18a1484f6698 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /// What category is the item listed under var/category = "item category" /// Description of the item in the uplink - var/desc = "Item Description" + var/desc = "Item Description." /// Used for discounts. Any unique string will do. var/reference /// What is spawned when we purchase this? diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 5021d643554d..2d00ff60d72b 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -748,7 +748,7 @@ /datum/uplink_item/explosives/detomatix name = "Detomatix PDA Cartridge" - desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer." + desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient down for a short period, and deafen them for longer." reference = "DEPC" item = /obj/item/cartridge/syndicate cost = 30 diff --git a/code/game/area/areas/ruins/space_areas.dm b/code/game/area/areas/ruins/space_areas.dm index f311dffe402d..17fe9567e185 100644 --- a/code/game/area/areas/ruins/space_areas.dm +++ b/code/game/area/areas/ruins/space_areas.dm @@ -45,12 +45,11 @@ //DJSTATION /area/ruin/space/djstation - name = "\improper Ruskie DJ Station" + name = "\improper Soviet DJ Station" icon_state = "DJ" - there_can_be_many = TRUE /area/ruin/space/djstation/solars - name = "\improper Ruskie DJ Station Solars" + name = "\improper Soviet DJ Station Solars" icon_state = "DJ" //Methlab @@ -135,7 +134,6 @@ /area/ruin/space/derelict/teleporter name = "\improper Derelict Teleporter" icon_state = "teleporter" - there_can_be_many = TRUE /area/ruin/space/derelict/eva name = "Derelict EVA Storage" @@ -219,6 +217,9 @@ name = "\improper Telecommunications Sat" icon_state = "tcomms" tele_proof = TRUE // No patrick, you can not syndicate teleport or hand teleport instantly into or out of this ruin + ambientsounds = list('sound/ambience/dvorak_ambience_final.ogg') + min_ambience_cooldown = 110 SECONDS // 3 seconds longer than the length of the song + max_ambience_cooldown = 170 SECONDS // A minute break at most /area/ruin/space/telecomms/powercontrol name = "\improper Telecommunications Power Control" diff --git a/code/game/dna/mutations/mutation_powers.dm b/code/game/dna/mutations/mutation_powers.dm index 75efba0c78a9..f9cb5574c824 100644 --- a/code/game/dna/mutations/mutation_powers.dm +++ b/code/game/dna/mutations/mutation_powers.dm @@ -818,9 +818,10 @@ M.change_gender(FEMALE) if(eyes_organ) - var/new_eyes = input("Please select eye color.", "Character Generation", eyes_organ.eye_color) as null|color - if(new_eyes) - M.change_eye_color(new_eyes) + var/new_eyes = tgui_input_color(user, "Please select eye color.", "Character Generation", eyes_organ.eye_color) + if(isnull(new_eyes)) + return + M.change_eye_color(new_eyes) if(istype(head_organ)) //Alt heads. @@ -838,14 +839,14 @@ if(new_style) M.change_hair(new_style) - var/new_hair = input("Please select hair color.", "Character Generation", head_organ.hair_colour) as null|color - if(new_hair) + var/new_hair = tgui_input_color(user, "Please select hair color.", "Character Generation", head_organ.hair_colour) + if(!isnull(new_hair)) M.change_hair_color(new_hair) var/datum/sprite_accessory/hair_style = GLOB.hair_styles_public_list[head_organ.h_style] if(hair_style.secondary_theme && !hair_style.no_sec_colour) - new_hair = input("Please select secondary hair color.", "Character Generation", head_organ.sec_hair_colour) as null|color - if(new_hair) + new_hair = tgui_input_color(user, "Please select secondary hair color.", "Character Generation", head_organ.sec_hair_colour) + if(!isnull(new_hair)) M.change_hair_color(new_hair, TRUE) // facial hair @@ -855,25 +856,25 @@ if(new_style) M.change_facial_hair(new_style) - var/new_facial = input("Please select facial hair color.", "Character Generation", head_organ.facial_colour) as null|color - if(new_facial) + var/new_facial = tgui_input_color(user, "Please select facial hair color.", "Character Generation", head_organ.facial_colour) + if(!isnull(new_facial)) M.change_facial_hair_color(new_facial) var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[head_organ.f_style] if(facial_hair_style.secondary_theme && !facial_hair_style.no_sec_colour) - new_facial = input("Please select secondary facial hair color.", "Character Generation", head_organ.sec_facial_colour) as null|color - if(new_facial) + new_facial = tgui_input_color(user, "Please select secondary facial hair color.", "Character Generation", head_organ.sec_facial_colour) + if(!isnull(new_facial)) M.change_facial_hair_color(new_facial, TRUE) //Head accessory. if(head_organ.dna.species.bodyflags & HAS_HEAD_ACCESSORY) var/list/valid_head_accessories = M.generate_valid_head_accessories() var/new_head_accessory = tgui_input_list(user, "Please select head accessory style", "Character Generation", valid_head_accessories) - if(new_head_accessory) + if(!isnull(new_head_accessory)) M.change_head_accessory(new_head_accessory) - var/new_head_accessory_colour = input("Please select head accessory colour.", "Character Generation", head_organ.headacc_colour) as null|color - if(new_head_accessory_colour) + var/new_head_accessory_colour = tgui_input_color(user, "Please select head accessory color.", "Character Generation", head_organ.headacc_colour) + if(!isnull(new_head_accessory_colour)) M.change_head_accessory_color(new_head_accessory_colour) @@ -882,7 +883,7 @@ var/list/valid_body_accessories = M.generate_valid_body_accessories() if(length(valid_body_accessories) > 1) //By default valid_body_accessories will always have at the very least a 'none' entry populating the list, even if the user's species is not present in any of the list items. var/new_body_accessory = tgui_input_list(user, "Please select body accessory style", "Character Generation", valid_body_accessories) - if(new_body_accessory) + if(!isnull(new_body_accessory)) M.change_body_accessory(new_body_accessory) if(istype(head_organ)) @@ -890,32 +891,32 @@ if(M.dna.species.bodyflags & HAS_HEAD_MARKINGS) var/list/valid_head_markings = M.generate_valid_markings("head") var/new_marking = tgui_input_list(user, "Please select head marking style", "Character Generation", valid_head_markings) - if(new_marking) + if(!isnull(new_marking)) M.change_markings(new_marking, "head") - var/new_marking_colour = input("Please select head marking colour.", "Character Generation", M.m_colours["head"]) as null|color - if(new_marking_colour) + var/new_marking_colour = tgui_input_color(user, "Please select head marking color.", "Character Generation", M.m_colours["head"]) + if(!isnull(new_marking_colour)) M.change_marking_color(new_marking_colour, "head") //Body markings. if(M.dna.species.bodyflags & HAS_BODY_MARKINGS) var/list/valid_body_markings = M.generate_valid_markings("body") var/new_marking = tgui_input_list(user, "Please select body marking style", "Character Generation", valid_body_markings) - if(new_marking) + if(!isnull(new_marking)) M.change_markings(new_marking, "body") - var/new_marking_colour = input("Please select body marking colour.", "Character Generation", M.m_colours["body"]) as null|color - if(new_marking_colour) + var/new_marking_colour = tgui_input_color(user, "Please select body marking color.", "Character Generation", M.m_colours["body"]) + if(!isnull(new_marking_colour)) M.change_marking_color(new_marking_colour, "body") //Tail markings. if(M.dna.species.bodyflags & HAS_TAIL_MARKINGS) var/list/valid_tail_markings = M.generate_valid_markings("tail") var/new_marking = tgui_input_list("Please select tail marking style", "Character Generation", valid_tail_markings) - if(new_marking) + if(!isnull(new_marking)) M.change_markings(new_marking, "tail") - var/new_marking_colour = input("Please select tail marking colour.", "Character Generation", M.m_colours["tail"]) as null|color - if(new_marking_colour) + var/new_marking_colour = tgui_input_color(user, "Please select tail marking color.", "Character Generation", M.m_colours["tail"]) + if(!isnull(new_marking_colour)) M.change_marking_color(new_marking_colour, "tail") //Skin tone. @@ -944,8 +945,8 @@ //Skin colour. if(M.dna.species.bodyflags & HAS_SKIN_COLOR) - var/new_body_colour = input("Please select body colour.", "Character Generation", M.skin_colour) as null|color - if(new_body_colour) + var/new_body_colour = tgui_input_color(user, "Please select body color.", "Character Generation", M.skin_colour) + if(!isnull(new_body_colour)) M.change_skin_color(new_body_colour) M.update_dna() diff --git a/code/game/gamemodes/cult/cult_actions.dm b/code/game/gamemodes/cult/cult_actions.dm index 71fc8388bc91..315350410ebb 100644 --- a/code/game/gamemodes/cult/cult_actions.dm +++ b/code/game/gamemodes/cult/cult_actions.dm @@ -110,7 +110,7 @@ //Draw rune /datum/action/innate/cult/use_dagger name = "Draw Blood Rune" - desc = "Use the ritual dagger to create a powerful blood rune" + desc = "Use the ritual dagger to create a powerful blood rune." button_overlay_icon_state = "blood_dagger" default_button_position = "10:29,4:-2" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index e298a454a269..eea528a729b4 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list( /obj/effect/gateway name = "gateway" - desc = "You're pretty sure that the abyss is staring back" + desc = "You're pretty sure that the abyss is staring back." icon = 'icons/obj/cult.dmi' icon_state = "hole" density = TRUE diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 03647190c90a..e20ec8dba5e3 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -16,7 +16,7 @@ /obj/item/melee/cultblade/dagger/adminbus name = "ritual dagger of scribing, +1" - desc = "VERY fast culto scribing at incredible hihg speed" + desc = "VERY fast culto scribing at incredible high speed!" force = 16 scribe_multiplier = 0.1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 540dd69358bc..766ed1eeb669 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -516,8 +516,8 @@ M.key = theghost.key dust_if_respawnable(theghost) else - message_admins("[M] ([M.key] has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take [M.p_their()] place.") - to_chat(M, "You have been converted into [role_type] with an active jobban. Any further violations of the rules on your part are likely to result in a permanent ban.") + message_admins("[M] ([M.key]) has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take [M.p_their()] place.") + to_chat(M, "You have been converted into [role_type] with an active jobban. Your body was offered up but there were no ghosts to take over. You will be allowed to continue as [role_type], but any further violations of the rules on your part are likely to result in a permanent ban.") /proc/printplayer(datum/mind/ply, fleecheck) var/jobtext = "" diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 9f7d0fa04029..7c88c119add1 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -230,5 +230,5 @@ src.text += "Our intelligence suggests a [prob_right_job]% chance that a [changeling_job] on board your station has been replaced by the alien. " src.text += "Additionally, the report indicates a [prob_right_dude]% chance that [changeling_name] may have been in contact with the lifeform at a recent social gathering. " */ - src.text += "These lifeforms are assosciated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. " + src.text += "These lifeforms are associated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. " src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!" diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 754e1619a3b2..cd0372096480 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -297,7 +297,7 @@ CONTENTS: user.do_attack_animation(L) if(isrobot(L)) - L.apply_damage(120, STAMINA) //Force a reboot instantly + L.apply_damage(80, STAMINA) //Force a reboot on two hits for consistency. return if(ishuman(L)) @@ -327,8 +327,8 @@ CONTENTS: L.lastattacker = user.real_name L.lastattackerckey = user.ckey - L.Stun(14 SECONDS) - L.Weaken(14 SECONDS) + L.KnockDown(7 SECONDS) + L.apply_damage(80, STAMINA) L.Stuttering(14 SECONDS) L.visible_message("[user] has stunned [L] with [src]!", \ @@ -337,18 +337,22 @@ CONTENTS: add_attack_logs(user, L, "Stunned with [src]") -/obj/item/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) - if(L.IsStunned() || L.IsSleeping()) - L.visible_message("[user] has induced sleep in [L] with [src]!", \ +/obj/item/abductor_baton/proc/SleepAttack(mob/living/L, mob/living/user) + var/mob/living/carbon/C = L + if(!iscarbon(L)) + return + if((C.getStaminaLoss() < 100) && !C.IsSleeping()) + C.AdjustDrowsy(2 SECONDS) + to_chat(user, "Sleep inducement works fully only on stunned or asleep specimens!") + C.visible_message("[user] tried to induce sleep in [L] with [src]!", \ + "You suddenly feel drowsy!") + return + if(do_mob(user, C, 2.5 SECONDS)) + C.visible_message("[user] has induced sleep in [L] with [src]!", \ "You suddenly feel very drowsy!") playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1) - L.Sleeping(120 SECONDS) - add_attack_logs(user, L, "Put to sleep with [src]") - else - L.AdjustDrowsy(2 SECONDS) - to_chat(user, "Sleep inducement works fully only on stunned specimens!") - L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ - "You suddenly feel drowsy!") + C.Sleeping(120 SECONDS) + add_attack_logs(user, C, "Put to sleep with [src]") /obj/item/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) @@ -358,7 +362,7 @@ CONTENTS: playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) C.visible_message("[user] begins restraining [C] with [src]!", \ "[user] begins shaping an energy field around your hands!") - if(do_mob(user, C, 30)) + if(do_mob(user, C, 3 SECONDS)) if(!C.handcuffed) C.handcuffed = new /obj/item/restraints/handcuffs/energy(C) C.update_handcuffed() diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 0370c73435df..9d13aa35d047 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -1,6 +1,6 @@ /obj/machinery/abductor/gland_dispenser name = "Replacement Organ Storage" - desc = "A tank filled with replacement organs" + desc = "A tank filled with replacement organs." icon = 'icons/obj/abductor.dmi' icon_state = "dispenser" density = TRUE diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index fb36aa273a9e..b8e0fc8fdfbd 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -12,6 +12,7 @@ var/flash = "Idle." var/obj/machinery/abductor/console/console var/mob/living/carbon/human/occupant + COOLDOWN_DECLARE(spam_cooldown) /obj/machinery/abductor/experiment/Destroy() eject_abductee() @@ -217,10 +218,14 @@ update_icon(UPDATE_ICON_STATE) /obj/machinery/abductor/experiment/relaymove() + if(!COOLDOWN_FINISHED(src, spam_cooldown)) + return + + COOLDOWN_START(src, spam_cooldown, 2 SECONDS) if(!occupant) return to_chat(occupant, "You start trying to break free!") - if(!do_after(occupant, 20 SECONDS, FALSE, src)) + if(!do_after_once(occupant, 20 SECONDS, FALSE, src)) return var/list/possible_results = list( CALLBACK(src, PROC_REF(electrocute_abductee)) = 1, diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm index 38cf4478ad5b..91da91fb338e 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm @@ -1,6 +1,6 @@ /obj/machinery/abductor/pad name = "Alien Telepad" - desc = "Use this to transport to and from human habitat" + desc = "Use this to transport to and from human habitat." icon = 'icons/obj/abductor.dmi' icon_state = "alien-pad-idle" anchored = TRUE diff --git a/code/game/gamemodes/miniantags/demons/demon.dm b/code/game/gamemodes/miniantags/demons/demon.dm index aee63738718a..50f053ee75c9 100644 --- a/code/game/gamemodes/miniantags/demons/demon.dm +++ b/code/game/gamemodes/miniantags/demons/demon.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/demon name = "a generic demon" - desc = "you shouldnt be reading this, file a github report" + desc = "you shouldnt be reading this, file a github report." speak_emote = list("gurgles") emote_hear = list("wails","screeches") response_help = "thinks better of touching" diff --git a/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm b/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm index e1a600950e52..df69ab5e4d21 100644 --- a/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm +++ b/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/demon/shadow name = "shadow demon" - desc = "A creature that's barely tangible, you can feel its gaze piercing you" + desc = "A creature that's barely tangible, you can feel its gaze piercing you." icon = 'icons/mob/mob.dmi' icon_state = "shadow_demon" icon_living = "shadow_demon" diff --git a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm index f045de09513f..0d87e2ed00af 100644 --- a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm +++ b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm @@ -104,7 +104,7 @@ /datum/spell/sense_victims name = "Sense Victims" - desc = "Sense the location of heretics" + desc = "Sense the location of heretics." base_cooldown = 0 clothes_req = FALSE cooldown_min = 0 diff --git a/code/game/gamemodes/wizard/magic_tarot.dm b/code/game/gamemodes/wizard/magic_tarot.dm index 69ac8f6f33b7..bff357282ced 100644 --- a/code/game/gamemodes/wizard/magic_tarot.dm +++ b/code/game/gamemodes/wizard/magic_tarot.dm @@ -957,7 +957,7 @@ /datum/tarot/reversed/judgement name = "XX - Judgement?" - desc = "May you redeem those found wanting" //Who wants more, but ghosts for something interesting + desc = "May you redeem those found wanting." //Who wants more, but ghosts for something interesting extended_desc = "nudges the future events of this shift to be more... interesting." card_icon = "judgement?" diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 87354c6ab773..3290f43a6844 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -207,7 +207,7 @@ continue if(G.slot) - if(H.equip_to_slot_or_del(G.spawn_item(H), G.slot, TRUE)) + if(H.equip_to_slot_or_del(G.spawn_item(H, H.client.prefs.active_character.get_gear_metadata(G)), G.slot, TRUE)) to_chat(H, "Equipping you with [G.display_name]!") else gear_leftovers += G @@ -227,7 +227,7 @@ if(length(gear_leftovers)) for(var/datum/gear/G in gear_leftovers) - var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.active_character.loadout_gear[G.display_name])) + var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.active_character.get_gear_metadata(G))) if(istype(placed_in)) if(isturf(placed_in)) to_chat(H, "Placing [G.display_name] on [placed_in]!") diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index 45f1e821e954..27c681eb801e 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -45,7 +45,7 @@ l_ear = /obj/item/radio/headset/heads/cmo id = /obj/item/card/id/cmo suit_store = /obj/item/flashlight/pen - l_hand = /obj/item/storage/firstaid/doctor + l_hand = /obj/item/storage/firstaid/regular/doctor pda = /obj/item/pda/heads/cmo backpack_contents = list( /obj/item/melee/classic_baton/telescopic = 1 @@ -86,7 +86,7 @@ l_ear = /obj/item/radio/headset/headset_med id = /obj/item/card/id/medical suit_store = /obj/item/flashlight/pen - l_hand = /obj/item/storage/firstaid/doctor + l_hand = /obj/item/storage/firstaid/regular/doctor pda = /obj/item/pda/medical backpack = /obj/item/storage/backpack/medic diff --git a/code/game/machinery/camera/camera_presets.dm b/code/game/machinery/camera/camera_presets.dm index c3ea1f9fa37d..64ab059fd8b0 100644 --- a/code/game/machinery/camera/camera_presets.dm +++ b/code/game/machinery/camera/camera_presets.dm @@ -33,6 +33,82 @@ upgradeXRay() upgradeMotion() +// DVORAK +/obj/machinery/camera/tracking_head + icon_state = "camera_base" + var/obj/effect/camera_head/camera_overlay + +/obj/machinery/camera/tracking_head/Initialize(mapload) + . = ..() + AddComponent(/datum/component/proximity_monitor, _radius = 6) + camera_overlay = new(get_turf(src)) + switch(dir) + if(NORTH) + camera_overlay.pixel_x = 2 + camera_overlay.pixel_y = 6 + + if(EAST) + camera_overlay.pixel_x = 6 + camera_overlay.pixel_y = 23 + + if(SOUTH) + camera_overlay.pixel_x = 4 + camera_overlay.pixel_y = 20 + + if(WEST) + camera_overlay.pixel_x = 20 + camera_overlay.pixel_y = 23 + + camera_overlay.dir = dir + RegisterSignal(src, COMSIG_CAMERA_OFF, PROC_REF(prime_the_camera)) + +/obj/machinery/camera/tracking_head/Destroy() + . = ..() + QDEL_NULL(camera_overlay) + UnregisterSignal(src, COMSIG_CAMERA_OFF) + +/obj/machinery/camera/tracking_head/process() + return PROCESS_KILL + +/obj/machinery/camera/tracking_head/update_icon_state() + return + +/obj/machinery/camera/tracking_head/update_overlays() + return + +/obj/machinery/camera/tracking_head/HasProximity(atom/movable/AM) + if(!isrobot(AM) && !iscarbon(AM)) // Only care about carbons and borgs. + return + if(camera_overlay.dir == get_dir(src, AM)) + return + camera_overlay.dir = get_dir(src, AM) + playsound(get_turf(src), pick('sound/effects/turret/move1.wav', 'sound/effects/turret/move2.wav'), 10, TRUE, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0) + +/obj/machinery/camera/tracking_head/proc/prime_the_camera() + SIGNAL_HANDLER //COMSIG_CAMERA_OFF + visible_message("[src] begins to spark violently!") + do_sparks(4, 0, src) + addtimer(CALLBACK(src, PROC_REF(explode_the_camera)), 2.5 SECONDS) + +/obj/machinery/camera/tracking_head/proc/explode_the_camera() + if(QDELETED(src)) + return + explosion(loc, -1, -1, 2, flame_range = 4) + qdel(src) + +/obj/effect/camera_head + icon = 'icons/obj/followingcamera.dmi' + icon_state = "camera_head" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +/obj/machinery/camera/tracking_head/dvorak + non_chunking_camera = TRUE + network = list("DVORAK") //Shouldn't show on any camera net, be it camera bugs or station or AI. + +/obj/machinery/camera/motion/dvorak + non_chunking_camera = TRUE + network = list("DVORAK") //Shouldn't show on any camera net, be it camera bugs or station or AI. + // This camera type automatically sets it's name to whatever the area that it's in is called. /obj/machinery/camera/autoname/Initialize(mapload) var/static/list/autonames_in_areas = list() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 481b309979ca..25e4a9d8b6db 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/arcade name = "random arcade" - desc = "random arcade machine" + desc = "random arcade machine." icon = 'icons/obj/computer.dmi' icon_state = "arcade" icon_keyboard = null diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 07a63c0574f8..f0f9942e1445 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -630,7 +630,7 @@ /obj/machinery/computer/cryopod/robot name = "robotic storage console" - desc = "An interface between crew and the robotic storage systems" + desc = "An interface between crew and the robotic storage systems." icon = 'icons/obj/robot_storage.dmi' icon_state = "console" circuit = /obj/item/circuitboard/robotstoragecontrol diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index dcb9603a536d..f27d0283bb92 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -215,7 +215,7 @@ /obj/machinery/door/airlock/bananium name = "bananium airlock" - desc = "Honkhonkhonk" + desc = "Honkhonkhonk!" icon = 'icons/obj/doors/airlocks/station/bananium.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_bananium doorOpen = 'sound/items/bikehorn.ogg' diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm index 29cff395050e..a1207bac1c75 100644 --- a/code/game/machinery/dye_generator.dm +++ b/code/game/machinery/dye_generator.dm @@ -44,7 +44,9 @@ src.add_fingerprint(user) if(stat & (BROKEN|NOPOWER)) return - var/temp = input(usr, "Choose a dye color", "Dye Color") as color + var/temp = tgui_input_color(user, "Please select a dye color", "Dye Color") + if(isnull(temp)) + return dye_color = temp set_light(2, l_color = temp) diff --git a/code/game/machinery/pipe/pipe_construction.dm b/code/game/machinery/pipe/pipe_construction.dm index 2a8771237ccd..9f43313f6779 100644 --- a/code/game/machinery/pipe/pipe_construction.dm +++ b/code/game/machinery/pipe/pipe_construction.dm @@ -531,7 +531,7 @@ /obj/item/pipe_meter name = "meter" - desc = "A meter that can be laid on pipes" + desc = "A meter that can be laid on pipes." icon = 'icons/obj/pipe-item.dmi' icon_state = "meter" item_state = "buildpipe" @@ -557,7 +557,7 @@ /obj/item/pipe_gsensor name = "gas sensor" - desc = "A sensor that can be hooked to a computer" + desc = "A sensor that can be hooked to a computer." icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor0" item_state = "buildpipe" diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm index 6b9d4d3542a2..88a28d0a99c3 100644 --- a/code/game/machinery/vendors/contraband_vendors.dm +++ b/code/game/machinery/vendors/contraband_vendors.dm @@ -50,7 +50,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/syndicate, 32 /obj/machinery/economy/vending/syndisnack name = "\improper Getmore Chocolate Corp" - desc = "A modified snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" + desc = "A modified snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars." slogan_list = list("Try our new nougat bar!", "Twice the calories for half the price!") diff --git a/code/game/machinery/wall_holosign.dm b/code/game/machinery/wall_holosign.dm index ebfb2089ee48..02c5de4cb1de 100644 --- a/code/game/machinery/wall_holosign.dm +++ b/code/game/machinery/wall_holosign.dm @@ -1,7 +1,7 @@ ////////////////////HOLOSIGN/////////////////////////////////////// /obj/machinery/holosign name = "holosign" - desc = "Small wall-mounted holographic projector" + desc = "Small wall-mounted holographic projector." icon = 'icons/obj/holosign.dmi' icon_state = "sign_off" layer = 4 diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index f1825b567596..7188b0fd10e1 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/phazon - desc = "An experimental, phase-shifting exosuit developed by Nanotrasen's research division" name = "Phazon" + desc = "An experimental, phase-shifting exosuit developed by Nanotrasen's research division." icon_state = "phazon" initial_icon = "phazon" step_in = 2 diff --git a/code/game/mecha/equipment/tools/janitor_tools.dm b/code/game/mecha/equipment/tools/janitor_tools.dm index 866fc0c13132..5980499582d3 100644 --- a/code/game/mecha/equipment/tools/janitor_tools.dm +++ b/code/game/mecha/equipment/tools/janitor_tools.dm @@ -29,6 +29,10 @@ var/refill_cost = 10 /// What reagent to refill with var/refill_reagent = "water" + /// Is the holosign deployer on? + var/holosign_enabled = TRUE + /// Internal holosign deployer + var/obj/item/holosign_creator/janitor/holosign_controller = new /obj/item/holosign_creator/janitor /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/Initialize(mapload) . = ..() @@ -66,6 +70,8 @@ for(var/turf/current_target_turf in view(1, target)) current_target_turf.cleaning_act(chassis.occupant, src, mop_speed, "mop", ".", skip_do_after = TRUE) chassis.occupant_message("You mop \the [target].") + if(holosign_enabled) + holosign_controller.afterattack(target_turf, chassis.occupant, TRUE) /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/post_clean(atom/target, mob/user) var/turf/T = get_turf(target) @@ -86,7 +92,7 @@ /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/get_equip_info() var/output = ..() if(output) - return "[output] \[Refill [refill_enabled? "Enabled" : "Disabled"]\] \[[reagents.total_volume]\]" + return "[output] \[Refill [refill_enabled? "Enabled" : "Disabled"]\] \[[reagents.total_volume]\] \[Holosigns [holosign_enabled? "Enabled" : "Disabled"]\]" /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/Topic(href, href_list) if(..()) @@ -99,6 +105,13 @@ else STOP_PROCESSING(SSobj, src) update_equip_info() + return + if(afilter.get("toggle_holosign")) + holosign_enabled = !holosign_enabled + if(!holosign_enabled) + holosign_controller.attack_self(chassis.occupant) + update_equip_info() + return #undef MOP_SOUND_CD diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 13aff91eff77..9ab8e2b09051 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2,7 +2,7 @@ /obj/mecha name = "Mecha" - desc = "Exosuit" + desc = "Exosuit." icon = 'icons/mecha/mecha.dmi' density = TRUE //Dense. To raise the heat. diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 988b0b95083d..e73662442d67 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -164,8 +164,8 @@ Additionally, it has seen some use among atmospherics crews and is admired for its ability to control even the toughest of plasmafires while protecting its pilot." /obj/mecha/working/ripley/deathripley - desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE" name = "DEATH-RIPLEY" + desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE!" icon_state = "deathripley" initial_icon = "deathripley" step_in = 3 diff --git a/code/game/objects/effects/decals/contraband_posters.dm b/code/game/objects/effects/decals/contraband_posters.dm index f08197f69983..235c6d836bb9 100644 --- a/code/game/objects/effects/decals/contraband_posters.dm +++ b/code/game/objects/effects/decals/contraband_posters.dm @@ -462,7 +462,7 @@ /obj/structure/sign/poster/official/work_for_a_future name = "Work For A Future" - desc = " A poster encouraging you to work for your future." + desc = "A poster encouraging you to work for your future." icon_state = "poster17_legit" /obj/structure/sign/poster/official/soft_cap_pop_art @@ -512,7 +512,7 @@ /obj/structure/sign/poster/official/fruit_bowl name = "Fruit Bowl" - desc = " Simple, yet awe-inspiring." + desc = "Simple, yet awe-inspiring." icon_state = "poster27_legit" /obj/structure/sign/poster/official/pda_ad @@ -527,7 +527,7 @@ /obj/structure/sign/poster/official/nanomichi_ad name = "Nanomichi Ad" - desc = " A poster advertising Nanomichi brand audio cassettes." + desc = "A poster advertising Nanomichi brand audio cassettes." icon_state = "poster30_legit" /obj/structure/sign/poster/official/twelve_gauge diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index da690df7b013..2aedd7886c03 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -33,7 +33,7 @@ /obj/effect/decal/remains/slime name = "You shouldn't see this" - desc = "Noooooooooooooooooooooo" + desc = "Noooooooooooooooooooooo!" icon = 'icons/effects/blood.dmi' icon_state = "remains" diff --git a/code/game/objects/effects/map_effects/mapmanip.dm b/code/game/objects/effects/map_effects/mapmanip.dm index 4e73fa92f384..28dcc3a4ed2b 100644 --- a/code/game/objects/effects/map_effects/mapmanip.dm +++ b/code/game/objects/effects/map_effects/mapmanip.dm @@ -32,3 +32,15 @@ name = "mapmanip marker helper, submap edge" icon = 'icons/effects/mapping_helpers.dmi' icon_state = "mapmanip_submap_edge" + +/obj/effect/map_effect/marker/mapmanip/submap/insert/space_ruin/dvorak/vendor_room + name = "DVORAK vending machine room" + +/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/dvorak/vendor_room + name = "DVORAK vending machine room" + +/obj/effect/map_effect/marker/mapmanip/submap/insert/space_ruin/dvorak/turret_room + name = "DVORAK turret room" + +/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/dvorak/turret_room + name = "DVORAK turret room" diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 756be876e05c..af4bd5f1e324 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -101,7 +101,7 @@ /obj/effect/mine/pickup name = "pickup" - desc = "pick me up" + desc = "pick me up." icon = 'icons/effects/effects.dmi' icon_state = "electricity2" density = FALSE diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 4a0e7885729b..dbba0c2e051c 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -1,6 +1,6 @@ /obj/structure/spider name = "web" - desc = "it's stringy and sticky" + desc = "it's stringy and sticky." icon = 'icons/effects/effects.dmi' icon_state = "stickyweb1" anchored = TRUE @@ -52,7 +52,7 @@ /obj/structure/spider/eggcluster name = "egg cluster" - desc = "They seem to pulse slightly with an inner life" + desc = "They seem to pulse slightly with an inner life." icon_state = "eggs" var/amount_grown = 0 var/player_spiders = FALSE @@ -232,7 +232,7 @@ /obj/structure/spider/cocoon name = "cocoon" - desc = "Something wrapped in silky spider web" + desc = "Something wrapped in silky spider web." icon_state = "cocoon1" max_integrity = 60 diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 13fb3a5cf097..b398722ace5c 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -292,7 +292,9 @@ if(!Adjacent(usr) || usr.incapacitated()) return if(href_list["color"]) - var/temp = input(usr, "Please select colour.", "Crayon colour") as color + var/temp = tgui_input_color(usr, "Please select crayon color.", "Crayon color") + if(isnull(temp)) + return colour = temp update_window(usr) else @@ -328,7 +330,9 @@ if("Change Drawing") ..() if("Change Color") - colour = input(user,"Choose Color") as color + colour = tgui_input_color(user,"Please select a paint color.","Spray Can Color") + if(isnull(colour)) + return update_icon() /obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user as mob, proximity) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index d99d5cb4af75..19c8c7319d64 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -169,6 +169,6 @@ /// ported from bay, this goes 'inside' the AI. /obj/item/encryptionkey/heads/ai_integrated name = "AI Integrated Encryption Key" - desc = "Integrated encryption key" + desc = "Integrated encryption key." icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Procedure" = 1) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 465a5da14c5d..f13c7847f476 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -6,7 +6,7 @@ name = "tank transfer valve" icon_state = "valve_1" item_state = "ttv" - desc = "Regulates the transfer of air between two tanks" + desc = "Regulates the transfer of air between two tanks." var/obj/item/tank/tank_one = null var/obj/item/tank/tank_two = null var/obj/item/assembly/attached_device = null diff --git a/code/game/objects/items/mountable_frames/air_alarm_frame.dm b/code/game/objects/items/mountable_frames/air_alarm_frame.dm index 7bae7f6ef710..201e9cb4948b 100644 --- a/code/game/objects/items/mountable_frames/air_alarm_frame.dm +++ b/code/game/objects/items/mountable_frames/air_alarm_frame.dm @@ -1,7 +1,7 @@ /// Handheld air alarm frame, for placing on walls. /obj/item/mounted/frame/alarm_frame name = "air alarm frame" - desc = "Used for building Air Alarms" + desc = "Used for building Air Alarms." icon = 'icons/obj/monitors.dmi' icon_state = "alarm_bitem" diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm index 5e96e6947310..d4dff1e66e4c 100644 --- a/code/game/objects/items/mountable_frames/apc_frame.dm +++ b/code/game/objects/items/mountable_frames/apc_frame.dm @@ -1,6 +1,6 @@ /obj/item/mounted/frame/apc_frame name = "APC frame" - desc = "Used for repairing or building APCs" + desc = "Used for repairing or building APCs." icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" diff --git a/code/game/objects/items/mountable_frames/buttons_switches.dm b/code/game/objects/items/mountable_frames/buttons_switches.dm index dd57c87dc40a..0f1bd7434e96 100644 --- a/code/game/objects/items/mountable_frames/buttons_switches.dm +++ b/code/game/objects/items/mountable_frames/buttons_switches.dm @@ -1,6 +1,6 @@ /obj/item/mounted/frame/driver_button name = "mass driver button frame" - desc = "Used for repairing or building mass driver buttons" + desc = "Used for repairing or building mass driver buttons." icon = 'icons/obj/objects.dmi' icon_state = "launcherbtt_frame" @@ -13,7 +13,7 @@ /obj/item/mounted/frame/light_switch name = "light switch frame" - desc = "Used for repairing or building light switches" + desc = "Used for repairing or building light switches." icon = 'icons/obj/power.dmi' icon_state = "light-p" @@ -26,7 +26,7 @@ /obj/item/mounted/frame/light_switch/windowtint name = "window tint control button frame" - desc = "Used for repairing or building window tint control buttons" + desc = "Used for repairing or building window tint control buttons." /obj/item/mounted/frame/light_switch/windowtint/do_build(turf/on_wall, mob/user) new /obj/machinery/button/windowtint(get_turf(user), get_dir(user, on_wall)) diff --git a/code/game/objects/items/mountable_frames/extinguisher_frame.dm b/code/game/objects/items/mountable_frames/extinguisher_frame.dm index b151cdb2ab30..3347a0c2462c 100644 --- a/code/game/objects/items/mountable_frames/extinguisher_frame.dm +++ b/code/game/objects/items/mountable_frames/extinguisher_frame.dm @@ -1,6 +1,6 @@ /obj/item/mounted/frame/extinguisher name = "Extinguisher Cabinet Frame" - desc = "Used for building extinguisher cabinet" + desc = "Used for building extinguisher cabinet." icon = 'icons/obj/closet.dmi' icon_state = "extinguisher_frame" diff --git a/code/game/objects/items/mountable_frames/fire_alarm.dm b/code/game/objects/items/mountable_frames/fire_alarm.dm index 9238684af1f3..a17dd96c001f 100644 --- a/code/game/objects/items/mountable_frames/fire_alarm.dm +++ b/code/game/objects/items/mountable_frames/fire_alarm.dm @@ -1,6 +1,6 @@ /obj/item/mounted/frame/firealarm name = "fire alarm frame" - desc = "Used for building Fire Alarms" + desc = "Used for building Fire Alarms." icon = 'icons/obj/monitors.dmi' icon_state = "firealarm_frame" diff --git a/code/game/objects/items/mountable_frames/intercom_frame.dm b/code/game/objects/items/mountable_frames/intercom_frame.dm index b160a437f768..c1468045d5c1 100644 --- a/code/game/objects/items/mountable_frames/intercom_frame.dm +++ b/code/game/objects/items/mountable_frames/intercom_frame.dm @@ -1,6 +1,6 @@ /obj/item/mounted/frame/intercom name = "Intercom Frame" - desc = "Used for building intercoms" + desc = "Used for building intercoms." icon = 'icons/obj/monitors.dmi' icon_state = "intercom-frame" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b50ff4b90e8b..1d23ae613ad3 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -155,7 +155,7 @@ */ /obj/item/toy/blink name = "electronic blink toy game" - desc = "Blink. Blink. Blink. Ages 8 and up." + desc = "Blink. Blink. Blink. Ages 8 and up." icon = 'icons/obj/radio.dmi' icon_state = "beacon" item_state = "signaler" @@ -539,7 +539,7 @@ /obj/random/carp_plushie name = "Random Carp Plushie" - desc = "This is a random plushie" + desc = "This is a random plushie." icon = 'icons/obj/toy.dmi' icon_state = "carpplushie" @@ -656,7 +656,7 @@ /obj/random/plushie name = "Random Plushie" - desc = "This is a random plushie" + desc = "This is a random plushie." icon = 'icons/obj/toy.dmi' icon_state = "redfox" @@ -1342,7 +1342,7 @@ /obj/random/figure name = "Random Action Figure" - desc = "This is a random toy action figure" + desc = "This is a random toy action figure." icon = 'icons/obj/toy.dmi' icon_state = "nuketoy" @@ -1667,7 +1667,7 @@ /obj/random/mech name = "Random Mech Prize" - desc = "This is a random prize" + desc = "This is a random prize." icon = 'icons/obj/toy.dmi' icon_state = "ripleytoy" diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm index fadfd8f4a5be..06905ac57389 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_death_alarm.dm @@ -8,6 +8,8 @@ var/mobname = "Unknown" var/static/list/stealth_areas = typecacheof(list(/area/syndicate_mothership, /area/shuttle/syndicate_elite)) + /// Tracking to prevent multiple EMPs in the same tick from flooding radio. + COOLDOWN_DECLARE(emp_spam_lock) /obj/item/bio_chip/death_alarm/implant(mob/target) . = ..() @@ -26,8 +28,11 @@ a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm") qdel(src) if("emp") + if(!COOLDOWN_FINISHED(src, emp_spam_lock)) + return var/name = prob(50) ? t.name : pick(SSmapping.teleportlocs) a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm") + COOLDOWN_START(src, emp_spam_lock, 0.1 SECONDS) else if(is_type_in_typecache(t, stealth_areas)) //give the syndies a bit of stealth diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm index 649ada0a5f63..c1b86fc5d4c0 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm @@ -1,6 +1,6 @@ /obj/item/bio_chip/traitor name = "Mindslave Bio-chip" - desc = "Divide and Conquer" + desc = "Divide and Conquer!" origin_tech = "programming=5;biotech=5;syndicate=8" activated = FALSE implant_data = /datum/implant_fluff/traitor diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 0b5917ebc93e..1625e1329b3c 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -486,7 +486,7 @@ /obj/item/dnainjector/stuttmut name = "DNA-Injector (Stutt.)" - desc = "Makes you s-s-stuttterrr" + desc = "Makes you s-s-stuttterrr." datatype = DNA2_BUF_SE value = 0xFFF forcedmutation = TRUE diff --git a/code/game/objects/items/weapons/holosign_projector.dm b/code/game/objects/items/weapons/holosign_projector.dm index 3a8e3873203d..5d30939ad2e9 100644 --- a/code/game/objects/items/weapons/holosign_projector.dm +++ b/code/game/objects/items/weapons/holosign_projector.dm @@ -1,6 +1,6 @@ /obj/item/holosign_creator name = "holographic sign projector" - desc = "This shouldnt exist, if it does, tell a coder" + desc = "This shouldnt exist, if it does, tell a coder." icon = 'icons/obj/device.dmi' icon_state = "signmaker" item_state = "electronic" diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index c0d9d2bab514..81889cfe1020 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -22,7 +22,7 @@ copyright = TRUE protected = FALSE //No reason players shouldn't write in regular manuals name = "Book Manual" - desc = "Please make a report on the github if you somehow get ahold of one of these in-game" + desc = "Please make a report on the github if you somehow get ahold of one of these in-game." summary = "This is a manual procured by Nanotrasen, it contains important information!" //Pages has to be a list of strings, it will break the book otherwise pages = list({"How did we get here? Anyway, if you are reading this please make a report on the Github as you should not @@ -824,7 +824,7 @@ /obj/item/book/manual/wiki name = "Wiki Book Manual" - desc = "This REALLY shouldn't exist in-game, please contact a coder" + desc = "This REALLY shouldn't exist in-game, please contact a coder." copyright = TRUE protected = TRUE //We absolutely do not want players editing these books, it might fuck up the iframes in them :) pages = null //we don't want people opening this book until it fully initializes @@ -901,7 +901,7 @@ /obj/item/book/manual/wiki/hydroponics name = "General Hydroponics" - desc = "A guide outlining the principles of hydroponics" + desc = "A guide outlining the principles of hydroponics." icon_state ="bookHydroponicsGeneral" author = "Nanotrasen" title = "General Hydroponics" @@ -909,7 +909,7 @@ /obj/item/book/manual/wiki/botanist name = "The Station Botanist Handbook" - desc = "A handbook with instructions and tips for station botanists" + desc = "A handbook with instructions and tips for station botanists." icon_state ="bookHydroponicsBotanist" author = "Nanotrasen" title = "The Station Botanist Handbook" diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm index 9722f91518f1..d57920135962 100644 --- a/code/game/objects/items/weapons/misc_items.dm +++ b/code/game/objects/items/weapons/misc_items.dm @@ -154,7 +154,7 @@ name = "lightning" icon = 'icons/obj/lightning.dmi' icon_state = "lightning" - desc = "test lightning" + desc = "test lightning." /obj/item/lightning/New() ..() diff --git a/code/game/objects/items/weapons/picket_signs.dm b/code/game/objects/items/weapons/picket_signs.dm index 227a032fb92d..aa928f6c7fd1 100644 --- a/code/game/objects/items/weapons/picket_signs.dm +++ b/code/game/objects/items/weapons/picket_signs.dm @@ -1,8 +1,8 @@ /obj/item/picket_sign + name = "blank picket sign" + desc = "It's blank." icon_state = "picket" item_state = "picket" - name = "blank picket sign" - desc = "It's blank" force = 5 w_class = WEIGHT_CLASS_BULKY attack_verb = list("bashed","smacked") diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index fadff4057acd..e49cb9b63062 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -255,7 +255,7 @@ /obj/item/storage/backpack/satcheldeluxe name = "leather satchel" - desc = "An NT Deluxe satchel, with the finest quality leather and the company logo in a thin gold stitch" + desc = "An NT Deluxe satchel, with the finest quality leather and the company logo in a thin gold stitch." icon_state = "nt_deluxe" item_state = "satchel" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index e58bb74b023d..9f8d789aa134 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -137,7 +137,7 @@ /obj/item/storage/belt/utility/chief name = "advanced toolbelt" - desc = "Holds tools, looks snazzy, and fits nicely into a bag" + desc = "Holds tools, looks snazzy, and fits nicely into a bag." icon_state = "utilitybelt_ce" item_state = "utility_ce" storable = TRUE @@ -356,7 +356,7 @@ /obj/item/storage/belt/soulstone name = "soul stone belt" - desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" + desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away." icon_state = "soulstonebelt" item_state = "soulstonebelt" storage_slots = 6 @@ -384,7 +384,7 @@ /obj/item/storage/belt/military name = "military belt" - desc = "A syndicate belt designed to be used by boarding parties. Its style is modelled after the hardsuits they wear." + desc = "A syndicate belt designed to be used by boarding parties. Its style is modelled after the hardsuits they wear." icon_state = "militarybelt" item_state = "military" max_w_class = WEIGHT_CLASS_SMALL @@ -844,7 +844,7 @@ /obj/item/storage/belt/bluespace/owlman name = "Owlman's utility belt" - desc = "Sometimes people choose justice. Sometimes, justice chooses you..." + desc = "Sometimes people choose justice. Sometimes, justice chooses you..." icon_state = "securitybelt" item_state = "security" storage_slots = 6 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 7cc4a1f8f835..faaf28381eb8 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -820,7 +820,7 @@ /obj/item/storage/box/syndidonkpockets name = "box of donk-pockets" - desc = "This box feels slightly warm" + desc = "This box feels slightly warm." icon_state = "donk_box" /obj/item/storage/box/syndidonkpockets/populate_contents() diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 9d4fc1cc96a7..77db50a1f2b5 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -305,7 +305,7 @@ /obj/item/storage/fancy/cigarettes/syndicate name = "\improper Syndicate Cigarettes" - desc = "A packet of six evil-looking cigarettes, A label on the packaging reads, \"Donk Co\"" + desc = "A packet of six evil-looking cigarettes, A label on the packaging reads, \"Donk Co\"." icon_state = "syndiepacket" item_state = "syndiepacket" cigarette_type = /obj/item/clothing/mask/cigarette/syndicate diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 088781d37e9b..8fdfc8c4b562 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -9,9 +9,9 @@ * First Aid Kits */ /obj/item/storage/firstaid - name = "first-aid kit" - desc = "It's an emergency medical kit for those serious boo-boos." - icon_state = "firstaid" + name = "generic first-aid kit" + desc = "If you can see this, make a bug report on GitHub, something went wrong!" + icon_state = "genericfirstaid" throw_speed = 2 throw_range = 8 req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots. @@ -25,29 +25,9 @@ var/robot_arm // This is for robot construction -/obj/item/storage/firstaid/fire - name = "fire first-aid kit" - desc = "A medical kit that contains several medical patches and pills for treating burns. Contains one epinephrine syringe for emergency use and a health analyzer." - icon_state = "ointment" - item_state = "firstaid-ointment" - med_bot_skin = "ointment" - -/obj/item/storage/firstaid/fire/Initialize(mapload) - . = ..() - icon_state = pick("ointment", "firefirstaid") - -/obj/item/storage/firstaid/fire/populate_contents() - new /obj/item/reagent_containers/applicator/burn(src) - new /obj/item/reagent_containers/patch/silver_sulf/small(src) - new /obj/item/healthanalyzer(src) - new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) - new /obj/item/reagent_containers/pill/salicylic(src) - -/obj/item/storage/firstaid/fire/empty/populate_contents() - return - /obj/item/storage/firstaid/regular - desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" + name = "first-aid kit" + desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer." icon_state = "firstaid" /obj/item/storage/firstaid/regular/populate_contents() @@ -62,11 +42,10 @@ /obj/item/storage/firstaid/regular/empty/populate_contents() return -/obj/item/storage/firstaid/doctor - desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" - icon_state = "firstaid" +/obj/item/storage/firstaid/regular/doctor + desc = "A medical kit designed for Nanotrasen medical personnel." -/obj/item/storage/firstaid/doctor/populate_contents() +/obj/item/storage/firstaid/regular/doctor/populate_contents() new /obj/item/reagent_containers/applicator/brute(src) new /obj/item/reagent_containers/applicator/burn(src) new /obj/item/reagent_containers/patch/styptic(src) @@ -75,6 +54,27 @@ new /obj/item/healthanalyzer/advanced(src) new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) +/obj/item/storage/firstaid/fire + name = "fire first-aid kit" + desc = "A medical kit that contains several medical patches and pills for treating burns. Contains one epinephrine syringe for emergency use and a health analyzer." + icon_state = "ointment" + item_state = "firstaid-ointment" + med_bot_skin = "ointment" + +/obj/item/storage/firstaid/fire/Initialize(mapload) + . = ..() + icon_state = pick("ointment", "firefirstaid") + +/obj/item/storage/firstaid/fire/populate_contents() + new /obj/item/reagent_containers/applicator/burn(src) + new /obj/item/reagent_containers/patch/silver_sulf/small(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) + new /obj/item/reagent_containers/pill/salicylic(src) + +/obj/item/storage/firstaid/fire/empty/populate_contents() + return + /obj/item/storage/firstaid/toxin name = "toxin first aid kit" desc = "A medical kit designed to counter poisoning by common toxins. Contains three pills and syringes, and a health analyzer to determine the health of the patient." @@ -171,8 +171,8 @@ /obj/item/storage/firstaid/tactical name = "first-aid kit" - icon_state = "bezerk" desc = "I hope you've got insurance." + icon_state = "bezerk" max_w_class = WEIGHT_CLASS_NORMAL treatment_oxy = "perfluorodecalin" treatment_brute = "bicaridine" @@ -195,8 +195,10 @@ /obj/item/storage/firstaid/surgery name = "field surgery kit" - icon_state = "duffel-med" desc = "A kit for surgery in the field." + icon_state = "duffel-med" + lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' max_w_class = WEIGHT_CLASS_BULKY max_combined_w_class = 21 storage_slots = 10 @@ -217,8 +219,8 @@ /obj/item/storage/firstaid/ert name = "ert first-aid kit" - icon_state = "bezerk" desc = "A medical kit used by Nanotrasen emergency response team personnel." + icon_state = "bezerk" med_bot_skin = "bezerk" /obj/item/storage/firstaid/ert/populate_contents() @@ -233,8 +235,8 @@ /obj/item/storage/firstaid/ert_amber name = "amber ert first-aid kit" - icon_state = "firstaid" desc = "A medical kit used by Amber level emergency response team personnel." + icon_state = "firstaid" /obj/item/storage/firstaid/ert_amber/populate_contents() new /obj/item/healthanalyzer/advanced(src) @@ -247,8 +249,8 @@ /obj/item/storage/firstaid/fake_tactical name = "tactical first-aid kit" - icon_state = "bezerk" desc = "I hope you've got insurance. The paint is still wet." + icon_state = "bezerk" med_bot_skin = "bezerk" /obj/item/storage/firstaid/fake_tactical/populate_contents() diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index ff5a40bcfe2f..b47ad6db64b7 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -2,8 +2,8 @@ * # Banhammer */ /obj/item/banhammer - desc = "A banhammer" name = "banhammer" + desc = "A banhammer." icon = 'icons/obj/toy.dmi' icon_state = "toyhammer" slot_flags = SLOT_FLAG_BELT @@ -164,7 +164,7 @@ /obj/item/throwing_star name = "throwing star" - desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts" + desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts." icon = 'icons/obj/weapons/melee.dmi' icon_state = "throwingstar" item_state = "eshield0" diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index b2ac5b651552..f8d9ec9f95a8 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1,7 +1,7 @@ // TODO: Refactor these into spawners /obj/random name = "Random Object" - desc = "This item type is used to spawn random objects at round-start" + desc = "This item type is used to spawn random objects at round-start." icon = 'icons/misc/mark.dmi' icon_state = "rup" var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything @@ -28,7 +28,7 @@ /obj/random/tool name = "Random Tool" - desc = "This is a random tool" + desc = "This is a random tool." icon = 'icons/obj/tools.dmi' icon_state = "random_tool" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 32052fae8489..522fc7261de6 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -94,7 +94,7 @@ LINEN BINS /obj/item/bedsheet/rainbow name = "rainbow bedsheet" - desc = "A multi_colored blanket. It's actually several different sheets cut up and sewn together." + desc = "A multi_colored blanket. It's actually several different sheets cut up and sewn together." icon_state = "sheetrainbow" item_state = "bedsheetrainbow" item_color = "rainbow" @@ -124,7 +124,7 @@ LINEN BINS /obj/item/bedsheet/mime name = "mime's blanket" - desc = "A very soothing striped blanket. All the noise just seems to fade out when you're under the covers in this." + desc = "A very soothing striped blanket. All the noise just seems to fade out when you're under the covers in this." icon_state = "sheetmime" item_state = "bedsheetmime" item_color = "mime" @@ -133,7 +133,7 @@ LINEN BINS /obj/item/bedsheet/clown name = "clown's blanket" - desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas." + desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas." icon_state = "sheetclown" item_state = "bedsheetclown" item_color = "clown" @@ -165,7 +165,7 @@ LINEN BINS /obj/item/bedsheet/medical name = "medical blanket" - desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station." + desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station." icon_state = "sheetmedical" item_state = "bedsheetmedical" item_color = "medical" @@ -174,7 +174,7 @@ LINEN BINS /obj/item/bedsheet/cmo name = "chief medical officer's bedsheet" - desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime." + desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime." icon_state = "sheetcmo" item_state = "bedsheetcmo" item_color = "cmo" @@ -183,7 +183,7 @@ LINEN BINS /obj/item/bedsheet/hos name = "head of security's bedsheet" - desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!" + desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!" icon_state = "sheethos" item_state = "bedsheethos" item_color = "hosred" @@ -192,7 +192,7 @@ LINEN BINS /obj/item/bedsheet/hop name = "head of personnel's bedsheet" - desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio." + desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio." icon_state = "sheethop" item_state = "bedsheethop" item_color = "hop" @@ -201,7 +201,7 @@ LINEN BINS /obj/item/bedsheet/ce name = "chief engineer's bedsheet" - desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil." + desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil." icon_state = "sheetce" item_state = "bedsheetce" item_color = "chief" @@ -210,7 +210,7 @@ LINEN BINS /obj/item/bedsheet/qm name = "quartermaster's bedsheet" - desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper." + desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper." icon_state = "sheetqm" item_state = "bedsheetqm" item_color = "qm" @@ -244,7 +244,7 @@ LINEN BINS /obj/item/bedsheet/cult name = "cultist's bedsheet" - desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence." + desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence." icon_state = "sheetcult" item_state = "bedsheetcult" item_color = "cult" @@ -253,7 +253,7 @@ LINEN BINS /obj/item/bedsheet/wiz name = "wizard's bedsheet" - desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!" + desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!" icon_state = "sheetwiz" item_state = "bedsheetwiz" item_color = "wiz" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index a4ac2ddb6cd3..6973172c23ee 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -13,6 +13,8 @@ var/opened_door_sprite /// Overwrites icon_state for the closed door sprite. Only necessary if the closed door sprite has a different name than the icon_state. var/closed_door_sprite + /// Added to initial(icon_state) if not null. Used for IC customization, e.g. when painting cardboard boxes. + var/custom_skin var/opened = FALSE var/welded = FALSE var/locked = FALSE @@ -66,9 +68,9 @@ . = ..() if(!enable_door_overlay) if(opened) - icon_state = "[initial(icon_state)]_open" + icon_state = "[initial(icon_state)][custom_skin]_open" else - icon_state = initial(icon_state) + icon_state = "[initial(icon_state)][custom_skin]" /obj/structure/closet/proc/closet_update_overlays(list/new_overlays) . = new_overlays diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index fb8aaf79bbe8..0e0a292418b9 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -96,6 +96,5 @@ return decalselection = replacetext(decalselection, " ", "_") decalselection = lowertext(decalselection) - icon_opened = ("cardboard_open_"+decalselection) - icon_closed = ("cardboard_"+decalselection) + custom_skin = "_[decalselection]" update_icon() // a proc declared in the closets parent file used to update opened/closed sprites on normal closets diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index d2c956ece582..a0c584d5be6d 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -1,7 +1,7 @@ /// this type path is a crime, ponies what the fuck /obj/structure/closet/statue name = "statue" - desc = "An incredibly lifelike marble carving" + desc = "An incredibly lifelike marble carving." icon = 'icons/obj/statue.dmi' icon_state = "human_male" density = TRUE diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 3ae4503676e6..087f4bc0f5d6 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -19,7 +19,7 @@ /obj/structure/closet/walllocker/emerglocker name = "emergency locker" - desc = "A wall mounted locker with emergency supplies" + desc = "A wall mounted locker with emergency supplies." icon_state = "emerg" door_anim_time = 0 icon_closed = "emerg" diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 7d2ed5496b72..c569526f0b63 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -41,7 +41,7 @@ /obj/structure/curtain/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/toy/crayon)) - color = input(user, "Choose Color") as color + color = tgui_input_color(user,"Please choose a color.", "Curtain Color") return return ..() diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 8dd48277574e..9b69c2d2b648 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -83,5 +83,5 @@ /obj/structure/fluff/divine/conduit name = "conduit" - desc = "It allows a deity to extend their reach. Their powers are just as potent near a conduit as a nexus." + desc = "It allows a deity to extend their reach. Their powers are just as potent near a conduit as a nexus." icon_state = "conduit" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 7bd5ac80e096..53aa311de808 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -111,7 +111,7 @@ /obj/structure/sign/securearea name = "\improper SECURE AREA" - desc = "A warning sign which reads 'SECURE AREA'" + desc = "A warning sign which reads 'SECURE AREA'." icon_state = "securearea" /obj/structure/sign/wait @@ -129,22 +129,22 @@ /obj/structure/sign/biohazard name = "\improper BIOHAZARD" - desc = "A warning sign which reads 'BIOHAZARD'" + desc = "A warning sign which reads 'BIOHAZARD'." icon_state = "bio" /obj/structure/sign/electricshock name = "\improper HIGH VOLTAGE" - desc = "A warning sign which reads 'HIGH VOLTAGE'" + desc = "A warning sign which reads 'HIGH VOLTAGE'." icon_state = "shock" /obj/structure/sign/examroom name = "\improper EXAM" - desc = "A guidance sign which reads 'EXAM ROOM'" + desc = "A guidance sign which reads 'EXAM ROOM'." icon_state = "examroom" /obj/structure/sign/vacuum name = "\improper HARD VACUUM AHEAD" - desc = "A warning sign which reads 'HARD VACUUM AHEAD'" + desc = "A warning sign which reads 'HARD VACUUM AHEAD'." icon_state = "space" /obj/structure/sign/vacuum/external @@ -154,29 +154,29 @@ /obj/structure/sign/deathsposal name = "\improper DISPOSAL LEADS TO SPACE" - desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'" + desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'." icon_state = "deathsposal" /obj/structure/sign/pods name = "\improper ESCAPE PODS" - desc = "A warning sign which reads 'ESCAPE PODS'" + desc = "A warning sign which reads 'ESCAPE PODS'." icon_state = "pods" /obj/structure/sign/fire name = "\improper DANGER: FIRE" - desc = "A warning sign which reads 'DANGER: FIRE'" + desc = "A warning sign which reads 'DANGER: FIRE'." icon_state = "fire" resistance_flags = FIRE_PROOF /obj/structure/sign/nosmoking_1 name = "\improper NO SMOKING" - desc = "A warning sign which reads 'NO SMOKING'" + desc = "A warning sign which reads 'NO SMOKING'." icon_state = "nosmoking" resistance_flags = FLAMMABLE /obj/structure/sign/nosmoking_2 name = "\improper NO SMOKING" - desc = "A warning sign which reads 'NO SMOKING'" + desc = "A warning sign which reads 'NO SMOKING'." icon_state = "nosmoking2" /obj/structure/sign/radiation @@ -289,12 +289,12 @@ /obj/structure/sign/chemistry name = "\improper CHEMISTRY" - desc = "A warning sign which reads 'CHEMISTRY'" + desc = "A warning sign which reads 'CHEMISTRY'." icon_state = "chemistry1" /obj/structure/sign/botany name = "\improper HYDROPONICS" - desc = "A warning sign which reads 'HYDROPONICS'" + desc = "A warning sign which reads 'HYDROPONICS'." icon_state = "hydro1" /obj/structure/sign/xenobio diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index dfc49b4bd4d2..5d3e3982e24e 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -69,8 +69,8 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return if(!light_broken) - var/new_color = input(user, "Select a bulb color", "Select a bulb color", color) as color|null - if(!new_color) + var/new_color = tgui_input_color(user, "Select a bulb color", "Select a bulb color", color) + if(isnull(new_color)) return // Cancel if they walked away diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 5861ecf00f05..49bc5dda1771 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -44,7 +44,7 @@ /turf/simulated/floor/plasteel/goonplaque/commission name = "Commission Plaque" - desc = "Epsilon Eridani Sector - 'Meta' Class Outpost - Commissioned 11/03/2557 - NSS Cerebron" + desc = "Epsilon Eridani Sector - 'Meta' Class Outpost - Commissioned 11/03/2557 - NSS Cerebron." /turf/simulated/floor/plasteel/goonplaque/nosey name = "Nosey little bastard aren't you?" @@ -52,7 +52,7 @@ /turf/simulated/floor/plasteel/goonplaque/violence name = "Violence Free Area" - desc = "Violence Free Area" + desc = "Violence Free Area." //TODO: Make subtypes for all normal turf icons /turf/simulated/floor/plasteel/white diff --git a/code/game/verbs/randomtip.dm b/code/game/verbs/randomtip.dm index 90a0447183d1..00df350e9a09 100644 --- a/code/game/verbs/randomtip.dm +++ b/code/game/verbs/randomtip.dm @@ -4,7 +4,7 @@ set desc = "Shows you a random tip" var/m - + var/list/randomtips = file2list("strings/tips.txt") var/list/memetips = file2list("strings/sillytips.txt") if(length(randomtips) && prob(95)) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7b3a5026a6db..ef6ec602e89e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1103,8 +1103,8 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list( return message = strip_html(message, 500) - var/message_color = input(src, "Input your message color:", "Color Selector") as color|null - if(!message_color) + var/message_color = tgui_input_color(src, "Input your message color:", "Admin Message - Color Selector") + if(isnull(message_color)) return show_blurb(about_to_be_banned, 15, message, null, "center", "center", message_color, null, null, 1) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 7f96ef12ef46..b50e77354b0c 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2344,6 +2344,15 @@ P.stamp_overlays += stampoverlay P.stamps += "
"
P.update_icon()
+
+ var/datum/fax/admin/sending = new /datum/fax/admin()
+ sending.name = P.name
+ sending.to_department = fax.department
+ sending.origin = "Administrator"
+ sending.message = P
+ sending.sent_by = usr
+ sending.sent_at = world.time
+
fax.receivefax(P)
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
@@ -2547,29 +2556,30 @@
P.stamp_overlays += stampoverlay
P.stamps += "[stampvalue]" + var/datum/fax/admin/sending = new /datum/fax/admin() + sending.name = P.name + sending.from_department = faxtype if(destination != "All Departments") - if(!fax.receivefax(P)) + sending.to_department = fax.department + else + sending.to_department = "All Departments" + sending.origin = "Administrator" + sending.message = P + sending.reply_to = reply_to + sending.sent_by = usr + sending.sent_at = world.time + + if(destination != "All Departments") + if(!fax.receivefax(sending)) to_chat(src.owner, "Message transmission failed.") return else for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes) if(is_station_level(F.z)) spawn(0) - if(!F.receivefax(P)) + if(!F.receivefax(sending)) to_chat(src.owner, "Message transmission to [F.department] failed.") - var/datum/fax/admin/A = new /datum/fax/admin() - A.name = P.name - A.from_department = faxtype - if(destination != "All Departments") - A.to_department = fax.department - else - A.to_department = "All Departments" - A.origin = "Administrator" - A.message = P - A.reply_to = reply_to - A.sent_by = usr - A.sent_at = world.time to_chat(src.owner, "Message transmitted successfully.") if(notify == "Yes") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index a6246cad9ac1..ca1415d99c61 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -52,6 +52,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/procname = clean_input("Proc path, eg: /proc/fake_blood","Path:", null) if(!procname) return + // absolutely not + if(findtextEx(trim(lowertext(procname)), "rustg")) + message_admins("[key_name_admin(src)] attempted to proc call rust-g procs. Inform the host at once.") + log_admin("[key_name(src)] attempted to proc call rust-g procs. Inform the host at once.") + GLOB.discord_manager.send2discord_simple(DISCORD_WEBHOOK_ADMIN, "[key_name(src)] attempted to proc call rustg things. Inform the host at once.") + return + if(targetselected && !hascall(target,procname)) to_chat(usr, "Error: callproc(): target has no such call [procname].") return diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index f953d1b3c1ee..729cc1fb0710 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -65,14 +65,14 @@ if(prompt != "Continue") return - default = vv_get_class(var_value) + default = vv_get_class(variable, var_value) if(isnull(default)) to_chat(src, "Unable to determine variable type.") else to_chat(src, "Variable appears to be [uppertext(default)].") - to_chat(src, "Variable contains: [var_value]") + to_chat(src, "Variable contains: [translate_bitfield(default, variable, var_value)]") if(default == VV_NUM) var/dir_text = "" @@ -89,7 +89,7 @@ if(dir_text) to_chat(src, "If a direction, direction is: [dir_text]") - var/value = vv_get_value(default_class = default) + var/value = vv_get_value(class = (default == VV_BITFIELD ? VV_BITFIELD : null), default_class = default, var_name = variable) var/new_value = value["value"] var/class = value["class"] @@ -207,7 +207,7 @@ log_world("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])") log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] (Type: [class]) ([accepted] objects modified)") - message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [html_encode("[O.vars[variable]]")] (Type: [class]) ([accepted] objects modified)") + message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [html_encode(translate_bitfield(default, variable, O.vars[variable]))] (Type: [class]) ([accepted] objects modified)") /proc/get_all_of_type(T, subtypes = TRUE) var/list/typecache = list() diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 0597f2dbf86d..e4bbb76dddca 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -12,12 +12,15 @@ GLOBAL_PROTECT(VVckey_edit) GLOBAL_PROTECT(VVpixelmovement) GLOBAL_PROTECT(VVmaint_only) -/client/proc/vv_get_class(var_value) +/client/proc/vv_get_class(var_name, var_value) if(isnull(var_value)) . = VV_NULL else if(isnum(var_value)) - . = VV_NUM + if(var_name in GLOB.bitfields) + . = VV_BITFIELD + else + . = VV_NUM else if(istext(var_value)) if(findtext(var_value, "\n")) @@ -61,7 +64,7 @@ GLOBAL_PROTECT(VVmaint_only) else . = VV_NULL -/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes) +/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes, var_name) . = list("class" = class, "value" = null) if(!class) if(!classes) @@ -120,6 +123,11 @@ GLOBAL_PROTECT(VVmaint_only) .["class"] = null return + if(VV_BITFIELD) + .["value"] = input_bitfield(usr, var_name, current_value) + if(.["value"] == null) + .["class"] = null + return if(VV_ATOM_TYPE) .["value"] = pick_closest_path(FALSE) @@ -451,7 +459,7 @@ GLOBAL_PROTECT(VVmaint_only) else variable = L[index] - default = vv_get_class(variable) + default = vv_get_class(objectvar, variable) to_chat(src, "Variable appears to be [uppertext(default)].") @@ -582,14 +590,14 @@ GLOBAL_PROTECT(VVmaint_only) var_value = O.vars[variable] - var/default = vv_get_class(var_value) + var/default = vv_get_class(variable, var_value) if(isnull(default)) to_chat(src, "Unable to determine variable type.") else to_chat(src, "Variable appears to be [uppertext(default)].") - to_chat(src, "Variable contains: [var_value]") + to_chat(src, "Variable contains: [translate_bitfield(default, variable, var_value)]") if(default == VV_NUM) var/dir_text = "" @@ -611,7 +619,7 @@ GLOBAL_PROTECT(VVmaint_only) default = VV_MESSAGE class = default - var/list/value = vv_get_value(class, default, var_value, extra_classes = list(VV_LIST)) + var/list/value = vv_get_value(class, default, var_value, extra_classes = list(VV_LIST), var_name = variable) class = value["class"] if(!class) @@ -645,5 +653,4 @@ GLOBAL_PROTECT(VVmaint_only) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VAR_EDIT, args) log_world("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")] (Type: [class])") log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new] (Type: [class])") - var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [html_encode("[var_new]")] (Type: [class])" - message_admins(msg) + message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [html_encode(translate_bitfield(default, variable, var_new))] (Type: [class])") diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index dec5fd77c321..8c156e9e3443 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -359,6 +359,8 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist/proc/replace_banned_player() var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [name]?", job_rank, TRUE, 10 SECONDS) if(!length(candidates)) + message_admins("[owner] ([owner.key]) has been converted into [name] with an active antagonist jobban for said role since no ghost has volunteered to take [owner.p_their()] place.") + to_chat(owner.current, "You have been converted into [name] with an active jobban. Your body was offered up but there were no ghosts to take over. You will be allowed to continue as [name], but any further violations of the rules on your part are likely to result in a permanent ban.") return FALSE var/mob/dead/observer/C = pick(candidates) to_chat(owner.current, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 23b2063148e7..dc1719ef157f 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -9,7 +9,7 @@ /datum/action/changeling/weapon name = "Organic Weapon" - desc = "Go tell a coder if you see this" + desc = "Go tell a coder if you see this." helptext = "Yell at coderbus" chemical_cost = 1000 power_type = CHANGELING_UNOBTAINABLE_POWER @@ -62,7 +62,7 @@ //Parent to space suits and armor. /datum/action/changeling/suit name = "Organic Suit" - desc = "Go tell a coder if you see this" + desc = "Go tell a coder if you see this." helptext = "Yell at coderbus" chemical_cost = 1000 power_type = CHANGELING_UNOBTAINABLE_POWER diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 8f37f4001d38..86746aaad7c8 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -1,6 +1,6 @@ /datum/action/changeling/sting name = "Tiny Prick" - desc = "Stabby stabby" + desc = "Stabby stabby." power_type = CHANGELING_UNOBTAINABLE_POWER category = /datum/changeling_power_category/stings var/sting_icon = null diff --git a/code/modules/antagonists/vampire/vampire_powers/dantalion_powers.dm b/code/modules/antagonists/vampire/vampire_powers/dantalion_powers.dm index 16e0583471d8..d749bfccee37 100644 --- a/code/modules/antagonists/vampire/vampire_powers/dantalion_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/dantalion_powers.dm @@ -69,8 +69,7 @@ var/greet_text = "You have been Enthralled by [user.real_name]. Follow [user.p_their()] every command." H.mind.add_antag_datum(new /datum/antagonist/mindslave/thrall(user.mind, greet_text)) - if(jobban_isbanned(H, ROLE_VAMPIRE)) - SSticker.mode.replace_jobbanned_player(H, SPECIAL_ROLE_VAMPIRE_THRALL) + H.Stun(4 SECONDS) user.create_log(CONVERSION_LOG, "vampire enthralled", H) H.create_log(CONVERSION_LOG, "was vampire enthralled", user) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index d372c47af00d..f8fea662b0cb 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -5,7 +5,7 @@ icon_state = "map" name = "passive gate" - desc = "A one-way air valve that does not require power" + desc = "A one-way air valve that does not require power." can_unwrench = TRUE can_unwrench_while_on = FALSE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index cdea20e78b14..63ec6859eaa7 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -17,7 +17,7 @@ Thus, the two variables affect pump operation are set in New(): icon_state = "map_off" name = "volumetric gas pump" - desc = "A volumetric pump" + desc = "A volumetric pump." can_unwrench = TRUE can_unwrench_while_on = FALSE diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm index 27871d8613ef..e83dd477b160 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm @@ -6,7 +6,7 @@ icon_state = "map_tvalve0" name = "manual switching valve" - desc = "A pipe valve" + desc = "A pipe valve." can_unwrench = TRUE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm index 74bd027998e9..38c3d6fbec1a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm @@ -4,7 +4,7 @@ density = TRUE name = "generator input" - desc = "Placeholder" + desc = "Placeholder." var/update_cycle diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm index da6175c64d85..1aa7e9fff815 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm @@ -5,7 +5,7 @@ layer = GAS_PIPE_VISIBLE_LAYER + 0.004 layer_offset = 0.004 name = "passive vent" - desc = "A large air vent" + desc = "A large air vent." can_unwrench = TRUE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm index 3fda9371020f..46240aa92d29 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermal_plate.dm @@ -8,7 +8,7 @@ can_unwrench = TRUE name = "thermal tansfer plate" - desc = "Transfers heat to and from an area" + desc = "Transfers heat to and from an area." /obj/machinery/atmospherics/unary/thermal_plate/update_icon_state() var/prefix = "" diff --git a/code/modules/atmospherics/machinery/pipes/cap.dm b/code/modules/atmospherics/machinery/pipes/cap.dm index ec2ba5d34242..c296b37ddea2 100644 --- a/code/modules/atmospherics/machinery/pipes/cap.dm +++ b/code/modules/atmospherics/machinery/pipes/cap.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/pipe/cap name = "pipe endcap" - desc = "An endcap for pipes" + desc = "An endcap for pipes." icon = 'icons/atmos/pipes.dmi' icon_state = "cap" level = 2 @@ -87,7 +87,7 @@ /obj/machinery/atmospherics/pipe/cap/visible/scrubbers name = "scrubbers pipe endcap" - desc = "An endcap for scrubbers pipes" + desc = "An endcap for scrubbers pipes." icon_state = "cap-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -97,7 +97,7 @@ /obj/machinery/atmospherics/pipe/cap/visible/supply name = "supply pipe endcap" - desc = "An endcap for supply pipes" + desc = "An endcap for supply pipes." icon_state = "cap-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SUPPLY_OFFSET @@ -114,7 +114,7 @@ /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers name = "scrubbers pipe endcap" - desc = "An endcap for scrubbers pipes" + desc = "An endcap for scrubbers pipes." icon_state = "cap-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -124,7 +124,7 @@ /obj/machinery/atmospherics/pipe/cap/hidden/supply name = "supply pipe endcap" - desc = "An endcap for supply pipes" + desc = "An endcap for supply pipes." icon_state = "cap-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SUPPLY_OFFSET diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index a8e5c4611aaa..7141f44bc06c 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -2,7 +2,7 @@ icon = 'icons/atmos/manifold.dmi' icon_state = "" name = "pipe manifold" - desc = "A manifold composed of regular pipes" + desc = "A manifold composed of regular pipes." volume = 105 @@ -155,7 +155,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers name="Scrubbers pipe manifold" - desc = "A manifold composed of scrubbers pipes" + desc = "A manifold composed of scrubbers pipes." icon_state = "map-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -170,7 +170,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply name="Air supply pipe manifold" - desc = "A manifold composed of supply pipes" + desc = "A manifold composed of supply pipes." icon_state = "map-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SUPPLY_OFFSET @@ -210,7 +210,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers name="Scrubbers pipe manifold" - desc = "A manifold composed of scrubbers pipes" + desc = "A manifold composed of scrubbers pipes." icon_state = "map-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -225,7 +225,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply name="Air supply pipe manifold" - desc = "A manifold composed of supply pipes" + desc = "A manifold composed of supply pipes." icon_state = "map-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SUPPLY_OFFSET diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index e63db8c3bc10..9205ed2f7bf9 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -2,7 +2,7 @@ icon = 'icons/atmos/manifold.dmi' icon_state = "" name = "4-way pipe manifold" - desc = "A manifold composed of regular pipes" + desc = "A manifold composed of regular pipes." volume = 140 @@ -165,7 +165,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers name="4-way scrubbers pipe manifold" - desc = "A manifold composed of scrubbers pipes" + desc = "A manifold composed of scrubbers pipes." icon_state = "map_4way-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -180,7 +180,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/supply name="4-way air supply pipe manifold" - desc = "A manifold composed of supply pipes" + desc = "A manifold composed of supply pipes." icon_state = "map_4way-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SUPPLY_OFFSET @@ -213,8 +213,8 @@ layer = GAS_PIPE_HIDDEN_LAYER /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers - name="4-way scrubbers pipe manifold" - desc = "A manifold composed of scrubbers pipes" + name = "4-way scrubbers pipe manifold" + desc = "A manifold composed of scrubbers pipes." icon_state = "map_4way-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -228,8 +228,8 @@ a Universal Adapter pipe." /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply - name="4-way air supply pipe manifold" - desc = "A manifold composed of supply pipes" + name = "4-way air supply pipe manifold" + desc = "A manifold composed of supply pipes." icon_state = "map_4way-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SUPPLY_OFFSET diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm index 4a62c341c912..0d2e35022ef6 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm @@ -8,7 +8,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers name = "Scrubbers pipe" - desc = "A one meter section of scrubbers pipe" + desc = "A one meter section of scrubbers pipe." icon_state = "intact-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -23,7 +23,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply name = "Air supply pipe" - desc = "A one meter section of supply pipe" + desc = "A one meter section of supply pipe." icon_state = "intact-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_HIDDEN_LAYER + GAS_PIPE_SUPPLY_OFFSET @@ -37,8 +37,8 @@ a Universal Adapter pipe." /obj/machinery/atmospherics/pipe/simple/hidden/universal - name="Universal pipe adapter" - desc = "An adapter for regular, supply and scrubbers pipes" + name = "Universal pipe adapter" + desc = "An adapter for regular, supply and scrubbers pipes." connect_types = list(CONNECT_TYPE_NORMAL, CONNECT_TYPE_SUPPLY, CONNECT_TYPE_SCRUBBER) icon_state = "map_universal" diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm index 27d1a0df0ad8..f7ea34d24890 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm @@ -7,7 +7,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers name = "Scrubbers pipe" - desc = "A one meter section of scrubbers pipe" + desc = "A one meter section of scrubbers pipe." icon_state = "intact-scrubbers" connect_types = list(CONNECT_TYPE_SCRUBBER) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SCRUB_OFFSET @@ -22,7 +22,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply name = "Air supply pipe" - desc = "A one meter section of supply pipe" + desc = "A one meter section of supply pipe." icon_state = "intact-supply" connect_types = list(CONNECT_TYPE_SUPPLY) layer = GAS_PIPE_VISIBLE_LAYER + GAS_PIPE_SUPPLY_OFFSET @@ -54,8 +54,8 @@ color = PIPE_COLOR_BLUE /obj/machinery/atmospherics/pipe/simple/visible/universal - name="Universal pipe adapter" - desc = "An adapter for regular, supply and scrubbers pipes" + name = "Universal pipe adapter" + desc = "An adapter for regular, supply and scrubbers pipes." connect_types = list(CONNECT_TYPE_NORMAL, CONNECT_TYPE_SUPPLY, CONNECT_TYPE_SCRUBBER) icon_state = "map_universal" diff --git a/code/modules/awaymissions/mission_code/ruins/telecomns.dm b/code/modules/awaymissions/mission_code/ruins/telecomns.dm index a66d8e74a38f..725dcf52d0cd 100644 --- a/code/modules/awaymissions/mission_code/ruins/telecomns.dm +++ b/code/modules/awaymissions/mission_code/ruins/telecomns.dm @@ -17,6 +17,34 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) GLOB.telecomms_bots -= src return ..() +/mob/living/simple_animal/bot/secbot/buzzsky/telecomms/doomba + name = "A FUCKING DOOMBA" + desc = "IT'S GOT A BOMB RUN!" + var/obj/structure/reagent_dispensers/fueltank/internal_tank + var/obj/structure/marker_beacon/dock_marker/collision/decorative_eye + +/mob/living/simple_animal/bot/secbot/buzzsky/telecomms/doomba/Initialize(mapload) + . = ..() + internal_tank = new(src) + decorative_eye = new(src) + vis_contents += internal_tank + vis_contents += decorative_eye + internal_tank.pixel_y = 10 + decorative_eye.pixel_y = -8 + decorative_eye.pixel_x = 1 + decorative_eye.layer = 4 + internal_tank.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + decorative_eye.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +/mob/living/simple_animal/bot/secbot/buzzsky/telecomms/doomba/explode() + visible_message("[src] EXPLODES!") + var/your_doom = get_turf(src) + new /obj/item/grenade/frag(your_doom) + internal_tank.forceMove(your_doom) + explosion(your_doom, 1, 0, 0, 6, FALSE, 6) + qdel(decorative_eye) + qdel(src) + /obj/effect/abstract/bot_trap name = "evil bot trap to make explorers hate you" @@ -171,13 +199,15 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) flick_holder.layer = kaboom.layer + 0.1 flick("popup", flick_holder) sleep(1 SECONDS) - for(var/obj/machinery/shieldgen/telecomms/shield in urange(15, get_turf(src))) - shield.shields_up() + for(var/obj/structure/telecomms_shield_cover/shield in urange(15, get_turf(src))) + shield.activate() if(ruin_cheese_attempted) for(var/obj/machinery/door/airlock/A in urange(20, get_turf(src))) A.unlock(TRUE) //Fuck your bolted open doors, you cheesed it. A.close(override = TRUE) for(var/area/A in urange(25, get_turf(src), areas = TRUE)) + for(var/obj/machinery/camera/tracking_head/camera in A) + camera.toggle_cam(null, 0) if(istype(A, /area/space)) continue if(ruin_cheese_attempted) @@ -218,7 +248,7 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) /obj/item/bombcore/doomsday name = "supermatter charged bomb core" - desc = "If you are looking at this, please don't put it in a bomb" + desc = "If you are looking at this, please don't put it in a bomb." /obj/item/bombcore/doomsday/Initialize(mapload) . = ..() @@ -247,6 +277,25 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) qdel(loc) qdel(src) +/obj/structure/telecomms_shield_cover + name = "turret" + desc = "Looks like the cover to a turret. Not deploying, however?" + icon = 'icons/obj/turrets.dmi' + icon_state = "turretCover" + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + anchored = TRUE + +/obj/structure/telecomms_shield_cover/proc/activate() + invisibility = 90 + var/obj/machinery/shieldgen/telecomms/trap = new /obj/machinery/shieldgen/telecomms(get_turf(src)) + var/atom/flick_holder = new /atom/movable/porta_turret_cover(loc) + flick_holder.layer = trap.layer + 0.1 + flick("popup", flick_holder) + sleep(1 SECONDS) + trap.shields_up() + qdel(flick_holder) + qdel(src) + /turf/simulated/floor/catwalk/airless oxygen = 0 nitrogen = 0 @@ -258,7 +307,7 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) /mob/living/simple_animal/hostile/hivebot/strong/malfborg name = "Security cyborg" - desc = "Oh god they still have access to these" + desc = "Oh god they still have access to these!" icon = 'icons/mob/robots.dmi' icon_state = "Noble-SEC" health = 200 @@ -391,6 +440,16 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) /datum/nothing = 4, /obj/item/melee/baton/cattleprod/teleprod = 1) +/obj/effect/spawner/random/telecomms_weldertank_maybe + name = "weldertank maybe" + loot = list(/obj/structure/reagent_dispensers/fueltank) + spawn_loot_chance = 25 + +/obj/effect/spawner/random/telecomms_doomba_one_in_twenty + name = "doomba very rarely" + loot = list(/mob/living/simple_animal/bot/secbot/buzzsky/telecomms/doomba) + spawn_loot_chance = 5 + // This could work in any ruin. However for now, as the scope is quite large, it's going to be coded a bit more to D.V.O.R.A.K /obj/structure/environmental_storytelling_holopad name = "holopad" diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index 9e5445387f50..113a51d21f32 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1569,10 +1569,10 @@ #undef ICON_SHIFT_XY /datum/character_save/proc/get_gear_metadata(datum/gear/G) // NYI - . = loadout_gear[G.type] + . = loadout_gear["[G]"] if(!.) . = list() - loadout_gear[G.type] = . + loadout_gear["[G]"] = . /datum/character_save/proc/get_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak) var/list/metadata = get_gear_metadata(G) diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index 81f589bd36ac..2e7e88fa9b9e 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -85,34 +85,6 @@ active_character.gen_record = genmsg active_character.SetRecords(user) - if(href_list["preference"] == "gear") - if(href_list["toggle_gear"]) - var/datum/gear/TG = GLOB.gear_datums[text2path(href_list["toggle_gear"])] - if(TG && (TG.type in active_character.loadout_gear)) - active_character.loadout_gear -= TG.type - else - if(TG.donator_tier && user.client.donator_level < TG.donator_tier) - to_chat(user, "That gear is only available at a higher donation tier than you are on.") - return - build_loadout(TG) - - else if(href_list["gear"] && href_list["tweak"]) // NYI - var/datum/gear/gear = GLOB.gear_datums[text2path(href_list["gear"])] - var/datum/gear_tweak/tweak = locate(href_list["tweak"]) - if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks)) - return - var/metadata = tweak.get_metadata(user, active_character.get_tweak_metadata(gear, tweak)) - if(!metadata) - return - active_character.set_tweak_metadata(gear, tweak, metadata) - else if(href_list["select_category"]) - gear_tab = href_list["select_category"] - else if(href_list["clear_loadout"]) - active_character.loadout_gear.Cut() - - ShowChoices(user) - return - switch(href_list["task"]) if("random") var/datum/robolimb/robohead @@ -329,17 +301,16 @@ if("hair") if(!(S.bodyflags & BALD)) - var/input = "Choose your character's hair colour:" - var/new_hair = input(user, input, "Character Preference", active_character.h_colour) as color|null - if(new_hair) + var/new_hair = tgui_input_color(user, "Choose your character's hair color.", "Character Preference", active_character.h_colour) + if(!isnull(new_hair)) active_character.h_colour = new_hair if("secondary_hair") if(!(S.bodyflags & BALD)) var/datum/sprite_accessory/hair_style = GLOB.hair_styles_public_list[active_character.h_style] if(hair_style.secondary_theme && !hair_style.no_sec_colour) - var/new_hair = input(user, "Choose your character's secondary hair colour:", "Character Preference", active_character.h_sec_colour) as color|null - if(new_hair) + var/new_hair = tgui_input_color(user, "Choose your character's secondary hair color.", "Character Preference", active_character.h_sec_colour) + if(!isnull(new_hair)) active_character.h_sec_colour = new_hair if("h_style") @@ -387,9 +358,10 @@ active_character.h_grad_offset_y = clamp(text2num(expl[2]) || 0, -16, 16) if("h_grad_colour") - var/result = input(user, "Choose your character's hair gradient colour:", "Character Preference", active_character.h_grad_colour) as color|null - if(result) - active_character.h_grad_colour = result + var/result = tgui_input_color(user, "Choose your character's hair gradient color:", "Character Preference", active_character.h_grad_colour) + if(isnull(result)) + return + active_character.h_grad_colour = result if("h_grad_alpha") var/result = tgui_input_number(user, "Choose your character's hair gradient alpha (0-255):", "Character Preference", active_character.h_grad_alpha, 255) @@ -398,16 +370,17 @@ active_character.h_grad_alpha = clamp(result, 0, 255) if("runechat_color") - var/result = input(user, "Choose your character's runechat color:", "Character Preference", active_character.runechat_color) as color|null - if(result) - active_character.runechat_color = result + var/result = tgui_input_color(user, "Choose your character's runechat color:", "Character Preference", active_character.runechat_color) + if(isnull(result)) + return + active_character.runechat_color = result if("headaccessory") if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species with head accessories. - var/input = "Choose the colour of your your character's head accessory:" - var/new_head_accessory = input(user, input, "Character Preference", active_character.hacc_colour) as color|null - if(new_head_accessory) - active_character.hacc_colour = new_head_accessory + var/new_head_accessory = tgui_input_color(user, "Choose the color of your your character's head accessory.", "Character Preference", active_character.hacc_colour) + if(isnull(new_head_accessory)) + return + active_character.hacc_colour = new_head_accessory if("ha_style") if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species with head accessories. @@ -485,10 +458,10 @@ if("m_head_colour") if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings. - var/input = "Choose the colour of your your character's head markings:" - var/new_markings = input(user, input, "Character Preference", active_character.m_colours["head"]) as color|null - if(new_markings) - active_character.m_colours["head"] = new_markings + var/new_markings = tgui_input_color(user, "Choose the color of your your character's head markings.", "Character Preference", active_character.m_colours["head"]) + if(isnull(new_markings)) + return + active_character.m_colours["head"] = new_markings if("m_style_body") if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos. @@ -508,10 +481,10 @@ if("m_body_colour") if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos. - var/input = "Choose the colour of your your character's body markings:" - var/new_markings = input(user, input, "Character Preference", active_character.m_colours["body"]) as color|null - if(new_markings) - active_character.m_colours["body"] = new_markings + var/new_markings = tgui_input_color(user, "Choose the color of your your character's body markings.", "Character Preference", active_character.m_colours["body"]) + if(isnull(new_markings)) + return + active_character.m_colours["body"] = new_markings if("m_style_tail") if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings. @@ -537,10 +510,10 @@ if("m_tail_colour") if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings. - var/input = "Choose the colour of your your character's tail markings:" - var/new_markings = input(user, input, "Character Preference", active_character.m_colours["tail"]) as color|null - if(new_markings) - active_character.m_colours["tail"] = new_markings + var/new_markings = tgui_input_color(user, "Choose the color of your your character's tail markings.", "Character Preference", active_character.m_colours["tail"]) + if(isnull(new_markings)) + return + active_character.m_colours["tail"] = new_markings if("body_accessory") var/list/possible_body_accessories = list() @@ -565,17 +538,19 @@ if("facial") if(!(S.bodyflags & SHAVED)) - var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", active_character.f_colour) as color|null - if(new_facial) - active_character.f_colour = new_facial + var/new_facial = tgui_input_color(user, "Choose your character's facial-hair color:", "Character Preference", active_character.f_colour) + if(isnull(new_facial)) + return + active_character.f_colour = new_facial if("secondary_facial") if(!(S.bodyflags & SHAVED)) var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[active_character.f_style] if(facial_hair_style.secondary_theme && !facial_hair_style.no_sec_colour) - var/new_facial = input(user, "Choose your character's secondary facial-hair colour:", "Character Preference", active_character.f_sec_colour) as color|null - if(new_facial) - active_character.f_sec_colour = new_facial + var/new_facial = tgui_input_color(user, "Choose your character's secondary facial-hair color:", "Character Preference", active_character.f_sec_colour) + if(isnull(new_facial)) + return + active_character.f_sec_colour = new_facial if("f_style") var/list/valid_facial_hairstyles = list() @@ -658,40 +633,48 @@ active_character.socks = new_socks if("eyes") - var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", active_character.e_colour) as color|null - if(new_eyes) - active_character.e_colour = new_eyes + var/new_eyes = tgui_input_color(user, "Choose your character's eye color:", "Character Preference", active_character.e_colour) + if(isnull(new_eyes)) + return + active_character.e_colour = new_eyes if("s_tone") if(S.bodyflags & HAS_SKIN_TONE) var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference") as num|null - if(!new_s_tone) + if(isnull(new_s_tone)) return active_character.s_tone = 35 - max(min(round(new_s_tone), 220), 1) else if(S.bodyflags & HAS_ICON_SKIN_TONE) var/const/MAX_LINE_ENTRIES = 4 var/prompt = "Choose your character's skin tone: 1-[length(S.icon_skin_tones)]\n(Light to Dark)" var/skin_c = tgui_input_number(user, prompt, "Character Preference", active_character.s_tone, length(S.icon_skin_tones), 1) - if(!skin_c) + if(isnull(skin_c)) return active_character.s_tone = skin_c if("skin") if((S.bodyflags & HAS_SKIN_COLOR) || GLOB.body_accessory_by_species[active_character.species] || check_rights(R_ADMIN, 0, user)) - var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", active_character.s_colour) as color|null - if(new_skin) - active_character.s_colour = new_skin + var/new_skin = tgui_input_color(user, "Choose your character's skin color: ", "Character Preference", active_character.s_colour) + if(isnull(new_skin)) + return + active_character.s_colour = new_skin if("ooccolor") - var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference", ooccolor) as color|null - if(new_ooccolor) - ooccolor = new_ooccolor + var/new_ooccolor = tgui_input_color(user, "Choose your OOC color:", "Game Preference", ooccolor) + if(isnull(new_ooccolor)) + return + ooccolor = new_ooccolor if("bag") var/new_backbag = tgui_input_list(user, "Choose your character's style of bag", "Character Preference", GLOB.backbaglist) if(new_backbag) active_character.backbag = new_backbag + if("loadout") + var/datum/ui_module/loadout/loadout = new() + loadout.ui_interact(user) + return FALSE + if("nt_relation") var/new_relation = tgui_input_list(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference", list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")) if(new_relation) @@ -1035,8 +1018,9 @@ toggles2 ^= PREFTOGGLE_2_AFKWATCH if("UIcolor") - var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!", UI_style_color) as color|null - if(!UI_style_color_new) return + var/UI_style_color_new = tgui_input_color(user, "Choose your UI color, dark colors are not recommended!", "Game Preference", UI_style_color) + if(isnull(UI_style_color_new)) + return UI_style_color = UI_style_color_new if(ishuman(usr)) //mid-round preference changes, for aesthetics @@ -1171,9 +1155,10 @@ screentip_mode = desired_screentip_mode if("screentip_color") - var/screentip_color_new = input(user, "Choose your screentip color", screentip_color) as color|null - if(screentip_color_new) - screentip_color = screentip_color_new + var/screentip_color_new = tgui_input_color(user, "Choose your screentip color", "Game Preference", screentip_color) + if(isnull(screentip_color_new)) + return + screentip_color = screentip_color_new if("edit_2fa") // Do this async so we arent holding up a topic() call diff --git a/code/modules/client/preference/loadout/gear_tweaks.dm b/code/modules/client/preference/loadout/gear_tweaks.dm index 459279c61752..9759f3cf7c37 100644 --- a/code/modules/client/preference/loadout/gear_tweaks.dm +++ b/code/modules/client/preference/loadout/gear_tweaks.dm @@ -1,5 +1,10 @@ -/datum/gear_tweak/proc/get_contents(metadata) - return +/datum/gear_tweak + /// Displayed in TGUI name + var/display_type + /// Font Awesome icon + var/fa_icon + /// Explains what is this do in TGUI tooltip + var/info /datum/gear_tweak/proc/get_metadata(user, metadata) return @@ -10,102 +15,51 @@ /datum/gear_tweak/proc/tweak_gear_data(metadata, datum/gear_data) return -/datum/gear_tweak/proc/tweak_item(obj/item/I, metadata) +/datum/gear_tweak/proc/tweak_item(obj/item/gear, metadata) return -/* -* Color adjustment -*/ - +// MARK: Color /datum/gear_tweak/color + display_type = "Color" + fa_icon = "palette" + info = "Recolorable" var/list/valid_colors /datum/gear_tweak/color/New(list/colors) valid_colors = colors ..() -/datum/gear_tweak/color/get_contents(metadata) - return "Color: ⚫" - /datum/gear_tweak/color/get_default() return valid_colors ? valid_colors[1] : COLOR_GRAY /datum/gear_tweak/color/get_metadata(user, metadata) if(valid_colors) - return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors - return input(user, "Choose an item color.", "Global Preference", metadata) as color|null + return tgui_input_list(user, "Choose an item color.", "Recolor Gear", valid_colors, metadata) + return tgui_input_color(user, "Choose an item color.", "Global Preference", metadata) -/datum/gear_tweak/color/tweak_item(obj/item/I, metadata) - if(valid_colors && !(metadata in valid_colors)) +/datum/gear_tweak/color/tweak_item(obj/item/gear, metadata) + if((valid_colors && !(metadata in valid_colors)) || !metadata) return - I.color = metadata -/* -* Path adjustment -*/ + gear.color = metadata -/datum/gear_tweak/path - var/list/valid_paths +// MARK: Rename +/datum/gear_tweak/rename + display_type = "Name" + fa_icon = "edit" + info = "Renameable" -/datum/gear_tweak/path/New(list/paths) - valid_paths = paths - ..() +/datum/gear_tweak/rename/get_default() + return "" -/datum/gear_tweak/path/get_contents(metadata) - return "Type: [metadata]" +/datum/gear_tweak/rename/get_metadata(user, metadata) + var/new_name = tgui_input_text(user, "Rename an object. Enter empty line for stock name", "Rename Gear", metadata, MAX_NAME_LEN) + if(isnull(new_name)) + return metadata + return new_name -/datum/gear_tweak/path/get_default() - return valid_paths[1] - -/datum/gear_tweak/path/get_metadata(user, metadata) - return input(user, "Choose a type.", "Character Preference", metadata) as null|anything in valid_paths - -/datum/gear_tweak/path/tweak_gear_data(metadata, datum/gear_data/gear_data) - if(!(metadata in valid_paths)) +/datum/gear_tweak/rename/tweak_item(obj/item/gear, metadata) + if(!metadata) return - gear_data.path = valid_paths[metadata] - -/* -* Content adjustment -*/ -/datum/gear_tweak/contents - var/list/valid_contents - -/datum/gear_tweak/contents/New() - valid_contents = args.Copy() - ..() - -/datum/gear_tweak/contents/get_contents(metadata) - return "Contents: [english_list(metadata, and_text = ", ")]" - -/datum/gear_tweak/contents/get_default() - . = list() - for(var/i = 1 to length(valid_contents)) - . += "Random" - -/datum/gear_tweak/contents/get_metadata(user, list/metadata) - . = list() - for(var/i = length(metadata) to length(valid_contents)) - metadata += "Random" - for(var/i = 1 to length(valid_contents)) - var/entry = input(user, "Choose an entry.", "Character Preference", metadata[i]) as null|anything in (valid_contents[i] + list("Random", "None")) - if(entry) - . += entry - else - return metadata - -/datum/gear_tweak/contents/tweak_item(obj/item/I, list/metadata) - if(length(metadata) != length(valid_contents)) - return - for(var/i = 1 to length(valid_contents)) - var/path - var/list/contents = valid_contents[i] - if(metadata[i] == "Random") - path = pick(contents) - path = contents[path] - else if(metadata[i] == "None") - continue - else - path = contents[metadata[i]] - new path(I) + gear.name = metadata diff --git a/code/modules/client/preference/loadout/loadout.dm b/code/modules/client/preference/loadout/loadout.dm index eff55feedee4..2eaf2a612c14 100644 --- a/code/modules/client/preference/loadout/loadout.dm +++ b/code/modules/client/preference/loadout/loadout.dm @@ -1,14 +1,5 @@ -GLOBAL_LIST_EMPTY(loadout_categories) GLOBAL_LIST_EMPTY(gear_datums) -/datum/loadout_category - var/category = "" - var/list/gear = list() - -/datum/loadout_category/New(cat) - category = cat - ..() - /datum/gear /// Displayed name of the item listing. var/display_name @@ -48,10 +39,10 @@ GLOBAL_LIST_EMPTY(gear_datums) location = nlocation /datum/gear/proc/spawn_item(location, metadata) - var/datum/gear_data/gd = new(path, location) - for(var/datum/gear_tweak/gt in gear_tweaks) - gt.tweak_gear_data(metadata["[gt]"], gd) - var/item = new gd.path(gd.location) - for(var/datum/gear_tweak/gt in gear_tweaks) - gt.tweak_item(item, metadata["[gt]"]) + var/datum/gear_data/gear_data = new(path, location) + for(var/datum/gear_tweak/tweak in gear_tweaks) + tweak.tweak_gear_data(metadata["[tweak]"], gear_data) + var/item = new gear_data.path(gear_data.location) + for(var/datum/gear_tweak/tweak in gear_tweaks) + tweak.tweak_item(item, metadata["[tweak]"]) return item diff --git a/code/modules/client/preference/loadout/loadout_tgui.dm b/code/modules/client/preference/loadout/loadout_tgui.dm new file mode 100644 index 000000000000..c4be848b9b17 --- /dev/null +++ b/code/modules/client/preference/loadout/loadout_tgui.dm @@ -0,0 +1,61 @@ +GLOBAL_LIST_EMPTY(gear_tgui_info) + +/datum/ui_module/loadout + name = "Loadout" + +/datum/ui_module/loadout/ui_state(mob/user) + return GLOB.always_state + +/datum/ui_module/loadout/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Loadout", name) + ui.set_autoupdate(FALSE) + ui.open() + +/datum/ui_module/loadout/ui_data(mob/user) + var/list/data = list() + data["gear_slots"] = user?.client?.prefs.build_loadout() + data["selected_gears"] = user?.client?.prefs?.active_character?.loadout_gear + return data + +/datum/ui_module/loadout/ui_static_data(mob/user) + var/list/data = list() + data["gears"] = GLOB.gear_tgui_info + data["max_gear_slots"] = user?.client?.prefs?.max_gear_slots + data["user_tier"] = user?.client?.donator_level + return data + +/datum/ui_module/loadout/ui_act(action, list/params) + if(..()) + return + . = TRUE + + var/mob/user = usr + var/datum/character_save/active_character = user.client.prefs.active_character + switch(action) + if("toggle_gear") + var/datum/gear/gear = GLOB.gear_datums[text2path(params["gear"])] + if(gear && ("[gear]" in active_character.loadout_gear)) + active_character.loadout_gear -= "[gear]" + return TRUE + + if(gear.donator_tier && user.client.donator_level < gear.donator_tier) + to_chat(user, "That gear is only available at a higher donation tier than you are on.") + return FALSE + + user.client.prefs.build_loadout(gear) + return TRUE + + if("set_tweak") + if(!(params["gear"] in active_character.loadout_gear)) + return FALSE + + var/datum/gear/gear = GLOB.gear_datums[text2path(params["gear"])] + var/datum/gear_tweak/tweak = locate(text2path(params["tweak"])) in gear.gear_tweaks + active_character.set_tweak_metadata(gear, tweak, tweak.get_metadata(user, active_character.get_tweak_metadata(gear, tweak))) + return TRUE + + if("clear_loadout") + active_character.loadout_gear.Cut() + return TRUE diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 828303414901..534b54d4ed3b 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -171,7 +171,6 @@ GLOBAL_LIST_INIT(special_role_times, list( dat += "Character Settings" dat += "Game Preferences" dat += "Antagonists" - dat += "Loadout" dat += "Key Bindings" dat += "General Preferences" dat += "" @@ -399,7 +398,8 @@ GLOBAL_LIST_INIT(special_role_times, list( dat += "Undershirt: [active_character.undershirt]
" if(S.clothing_flags & HAS_SOCKS) dat += "Socks: [active_character.socks]
" - dat += "Backpack Type: [active_character.backbag]
" + dat += "Backpack Type: [active_character.backbag]
" + dat += "Open Loadout
" var/datum/species/myspecies = GLOB.all_species[active_character.species] if(!isnull(myspecies)) @@ -520,53 +520,6 @@ GLOBAL_LIST_INIT(special_role_times, list( dat += "Your [EXP_TYPE_CREW] playtime is [user.client.get_exp_type(EXP_TYPE_CREW)]
" dat += "" - if(TAB_GEAR) - var/total_cost = build_loadout() - - var/fcolor = "#3366CC" - if(total_cost < max_gear_slots) - fcolor = "#E67300" - dat += "
| [G.display_name] | " - else - dat += "|||
| [G.display_name] | " - dat += "[G.cost] | " - if(G.allowed_roles) - dat += "Restrictions: " - for(var/role in G.allowed_roles) - dat += role + " " - dat += "" - dat += " | [G.description] |
| " - for(var/datum/gear_tweak/tweak in G.gear_tweaks) - . += " [tweak.get_contents(active_character.get_tweak_metadata(G, tweak))]" - . += " | |||
All Key Bindings: "
dat += "Reset to Default "
@@ -784,25 +737,24 @@ GLOBAL_LIST_INIT(special_role_times, list(
var/list/loadout_cache = active_character.loadout_gear.Copy()
active_character.loadout_gear.Cut()
if(new_item)
- loadout_cache += new_item.type
+ loadout_cache += "[new_item]"
- for(var/I in loadout_cache)
- var/datum/gear/G = GLOB.gear_datums[text2path(I) || I]
- if(!G)
+ for(var/item in loadout_cache)
+ var/datum/gear/gear = text2path(item) || item
+ if(!gear || !(gear.type in GLOB.gear_datums))
continue
- var/added_cost = G.cost
- if(!G.subtype_selection_cost) // If listings of the same subtype shouldn't have their cost added.
- if(G.main_typepath in type_blacklist)
+ var/added_cost = gear.cost
+ if(!gear.subtype_selection_cost) // If listings of the same subtype shouldn't have their cost added.
+ if(gear.main_typepath in type_blacklist)
added_cost = 0
else
- type_blacklist += G.main_typepath
+ type_blacklist += gear.main_typepath
if((total_cost + added_cost) > max_gear_slots)
continue // If the final cost is too high, don't add the item.
- active_character.loadout_gear += G.type
+ active_character.loadout_gear[item] = loadout_cache[item] ? loadout_cache[item] : list()
total_cost += added_cost
return total_cost
-
/datum/preferences/proc/init_keybindings(overrides, raw)
if(raw)
try
diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
index 9f4adb3e96d9..081f8981d94f 100644
--- a/code/modules/client/preference/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -510,8 +510,8 @@
blackbox_message = "Set Own OOC"
/datum/preference_toggle/special_toggle/set_ooc_color/set_toggles(client/user)
- var/new_ooccolor = input(usr, "Please select your OOC color.", "OOC color", user.prefs.ooccolor) as color|null
- if(new_ooccolor)
+ var/new_ooccolor = tgui_input_color(usr, "Please select your OOC color.", "OOC Color", user.prefs.ooccolor)
+ if(!isnull(new_ooccolor))
user.prefs.ooccolor = new_ooccolor
to_chat(usr, "Your OOC color has been set to [new_ooccolor].")
else
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index a90dedb0f7d8..f721a0eb7785 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -40,17 +40,10 @@
var/list/outfit_types = O.get_chameleon_disguise_info()
for(var/V in user.chameleon_item_actions)
- var/datum/action/item_action/chameleon/change/A = V
- var/done = FALSE
+ var/datum/action/item_action/chameleon/change/action = V
for(var/T in outfit_types)
- for(var/name in A.chameleon_list)
- if(A.chameleon_list[name] == T)
- A.update_look(user, T)
- outfit_types -= T
- done = TRUE
- break
- if(done)
- break
+ if(ispath(T, action.chameleon_type))
+ action.update_look(user, T)
//hardsuit helmets/suit hoods
if(ispath(O.suit, /obj/item/clothing/suit/hooded) && ishuman(user))
var/mob/living/carbon/human/H = user
@@ -69,13 +62,18 @@
/datum/action/item_action/chameleon/change
name = "Chameleon Change"
- var/list/chameleon_blacklist = list() //This is a typecache
- var/list/chameleon_list = list()
+ var/static/list/chameleon_blacklist = list() //This is a typecache
+ var/static/list/chameleon_list = list()
var/chameleon_type = null
var/chameleon_name = "Item"
-
+ var/obj/item/holder
var/emp_timer
+/datum/action/item_action/chameleon/change/New(Target)
+ . = ..()
+ holder = Target
+
+
/datum/action/item_action/chameleon/change/Grant(mob/M)
if(M && (owner != M))
if(!M.chameleon_item_actions)
@@ -99,42 +97,77 @@
if(.)
button.name = "Change [chameleon_name] Appearance"
+/datum/action/item_action/chameleon/change/ui_host()
+ return holder
+
+/datum/action/item_action/chameleon/change/ui_state(mob/user)
+ return GLOB.physical_state
+
+/datum/action/item_action/chameleon/change/ui_data(mob/user)
+ var/list/data = list()
+ data["selected_appearance"] = "[holder.name]_[holder.icon_state]"
+ return data
+
+/datum/action/item_action/chameleon/change/ui_static_data(mob/user, datum/tgui/ui = null)
+ var/list/data = list()
+ var/list/chameleon_skins = list()
+ for(var/chameleon_type in chameleon_list[chameleon_name])
+ var/obj/item/chameleon_item = chameleon_list[chameleon_name][chameleon_type]
+ chameleon_skins.Add(list(list(
+ "icon" = initial(chameleon_item.icon),
+ "icon_state" = initial(chameleon_item.icon_state),
+ "name" = initial(chameleon_item.name),
+ )))
+
+ data["chameleon_skins"] = chameleon_skins
+ return data
+
+/datum/action/item_action/chameleon/change/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "Chameleon", "Change [chameleon_name] Appearance")
+ ui.open()
+ ui.set_autoupdate(FALSE)
+
+/datum/action/item_action/chameleon/change/ui_act(action, list/params)
+ if(..())
+ return
+
+ switch(action)
+ if("change_appearance")
+ update_look(usr, chameleon_list[chameleon_name][params["new_appearance"]])
/datum/action/item_action/chameleon/change/proc/initialize_disguises()
UpdateButtons()
chameleon_blacklist |= typecacheof(target.type)
+ if(!isnull(chameleon_list[chameleon_name]))
+ return
+ chameleon_list[chameleon_name] = list()
for(var/V in typesof(chameleon_type))
if(ispath(V) && ispath(V, /obj/item))
var/obj/item/I = V
if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT) || !initial(I.icon_state))
continue
- var/chameleon_item_name = "[initial(I.name)] ([initial(I.icon_state)])"
- chameleon_list[chameleon_item_name] = I
+ var/chameleon_item_name = "[replacetext(initial(I.name), "\improper", "")]_[initial(I.icon_state)]"
+ if(isnull(chameleon_list[chameleon_name][chameleon_item_name]))
+ chameleon_list[chameleon_name][chameleon_item_name] = I
/datum/action/item_action/chameleon/change/proc/select_look(mob/user)
- var/obj/item/picked_item
- var/picked_name
- picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon [chameleon_name]", chameleon_list)
- if(!picked_name)
- return
- picked_item = chameleon_list[picked_name]
- if(!picked_item)
- return
- update_look(user, picked_item)
+ ui_interact(user)
/datum/action/item_action/chameleon/change/proc/random_look(mob/user)
- var/picked_name = pick(chameleon_list)
+ var/picked_name = pick(chameleon_list[chameleon_name])
// If a user is provided, then this item is in use, and we
// need to update our icons and stuff
if(user)
- update_look(user, chameleon_list[picked_name])
+ update_look(user, chameleon_list[chameleon_name][picked_name])
// Otherwise, it's likely a random initialisation, so we
// don't have to worry
else
- update_item(chameleon_list[picked_name])
+ update_item(chameleon_list[chameleon_name][picked_name])
/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item)
if(isliving(user))
@@ -145,6 +178,7 @@
update_item(picked_item)
var/obj/item/thing = target
thing.update_slot_icon()
+ SStgui.update_uis(src)
UpdateButtons()
/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
@@ -679,17 +713,21 @@
chameleon_action.emp_randomise(INFINITY)
/datum/action/item_action/chameleon/change/modsuit/update_item(obj/item/picked_item)
- . = ..()
if(ismodcontrol(target))
var/obj/item/mod/control/C = target
- if(C.current_disguise) //backup check
+ C.current_disguise = FALSE
+ if(C.active || C.activating)
+ to_chat(C.wearer, "Your suit is already active!")
+ return
+ if(initial(picked_item.name) == C.name) // If you select the same item as what it's currently disguised as, change back to MODsuit form.
for(var/obj/item/mod/module/chameleon/toreturn in C.contents)
toreturn.return_look()
return
+ . = ..()
C.current_disguise = TRUE
C.item_state = initial(picked_item.item_state)
for(var/obj/item/mod/module/chameleon/tosignal in C.contents)
- tosignal.RegisterSignal(C, COMSIG_MOD_ACTIVATE, TYPE_PROC_REF(/obj/item/mod/module/chameleon, return_look))
+ tosignal.RegisterSignal(C, COMSIG_MOD_ACTIVATE, TYPE_PROC_REF(/obj/item/mod/module/chameleon, return_look), TRUE)
/datum/action/item_action/chameleon/change/modsuit/select_look(mob/user)
if(ismodcontrol(target))
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 3f763b55d91a..e06ef37583fc 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -514,13 +514,13 @@
/obj/item/clothing/glasses/thermal/eyepatch
name = "optical thermal eyepatch"
- desc = "An eyepatch with built-in thermal optics"
+ desc = "An eyepatch with built-in thermal optics."
icon_state = "eyepatch"
item_state = "eyepatch"
/obj/item/clothing/glasses/thermal/jensen
name = "optical thermal implant"
- desc = "A set of implantable lenses designed to augment your vision"
+ desc = "A set of implantable lenses designed to augment your vision."
icon_state = "thermalimplants"
item_state = "syringe_kit"
diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm
index 8e5b97724fee..a485117e51bf 100644
--- a/code/modules/clothing/gloves/misc_gloves.dm
+++ b/code/modules/clothing/gloves/misc_gloves.dm
@@ -19,7 +19,7 @@
/obj/item/clothing/gloves/cyborg
name = "cyborg gloves"
- desc = "beep boop borp"
+ desc = "beep boop borp."
icon_state = "black"
item_state = "r_hands"
diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm
index ed180788bc94..aa64d1ca9f37 100644
--- a/code/modules/clothing/gloves/rings.dm
+++ b/code/modules/clothing/gloves/rings.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/gloves/ring
name = "iron ring"
- desc = "A band that goes around your finger. It's considered gauche to wear more than one."
+ desc = "A band that goes around your finger. It's considered gauche to wear more than one."
gender = "neuter" // not plural anymore
transfer_prints = TRUE
icon_state = "ironring"
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 0c9fecac6db1..dd507502224d 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -7,7 +7,7 @@
/obj/item/clothing/head/collectable/petehat
name = "ultra rare Pete's hat!"
- desc = "It smells faintly of plasma"
+ desc = "It smells faintly of plasma."
icon_state = "petehat"
/obj/item/clothing/head/collectable/slime
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 8f838090d58b..3ba0784ecfb9 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -4,7 +4,7 @@
name = "chef's hat"
desc = "The commander in chef's head wear."
icon_state = "chef"
- item_state = "chef"
+ item_state = "chefhat"
strip_delay = 10
put_on_delay = 10
dog_fashion = /datum/dog_fashion/head/chef
diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm
index bc9ea7066eec..b2c69a6e443a 100644
--- a/code/modules/clothing/head/misc_hats.dm
+++ b/code/modules/clothing/head/misc_hats.dm
@@ -64,7 +64,7 @@
/obj/item/clothing/head/hasturhood
name = "hastur's hood"
- desc = "It's unspeakably stylish"
+ desc = "It's unspeakably stylish."
icon_state = "hasturhood"
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
@@ -411,7 +411,7 @@
/// Fluff?
/obj/item/clothing/head/beret/purple
name = "Pierson Family Beret"
- desc = " A purple beret, with a small golden crescent moon sewn onto it."
+ desc = "A purple beret, with a small golden crescent moon sewn onto it."
icon_state = "beret_purple"
item_state = "purpleberet"
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index a2ab2b3c63da..98ba676b12be 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/mask/balaclava
name = "balaclava"
- desc = "LOADSAMONEY"
+ desc = "LOADSAMONEY!"
icon_state = "balaclava"
item_state = "balaclava"
flags = BLOCKHAIR
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index cd96e9bf92a7..db44cb387f9c 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -220,7 +220,7 @@
/obj/item/clothing/mask/gas/cyborg
name = "cyborg visor"
- desc = "Beep boop"
+ desc = "Beep boop."
icon_state = "death"
resistance_flags = FLAMMABLE
diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm
index 96e4145c63b3..8f94631e3466 100644
--- a/code/modules/clothing/masks/misc_masks.dm
+++ b/code/modules/clothing/masks/misc_masks.dm
@@ -229,46 +229,6 @@
/obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user)
user.visible_message("\ [user] twirls [user.p_their()] moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!")
-//scarves (fit in in mask slot)
-
-/obj/item/clothing/mask/bluescarf
- name = "blue neck scarf"
- desc = "A blue neck scarf."
- icon_state = "blueneckscarf"
- item_state = "blueneckscarf"
- flags_cover = MASKCOVERSMOUTH
- w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0.90
-
-
-/obj/item/clothing/mask/redscarf
- name = "red scarf"
- desc = "A red and white checkered neck scarf."
- icon_state = "redwhite_scarf"
- item_state = "redwhite_scarf"
- flags_cover = MASKCOVERSMOUTH
- w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0.90
-
-/obj/item/clothing/mask/greenscarf
- name = "green scarf"
- desc = "A green neck scarf."
- icon_state = "green_scarf"
- item_state = "green_scarf"
- flags_cover = MASKCOVERSMOUTH
- w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0.90
-
-/obj/item/clothing/mask/ninjascarf
- name = "ninja scarf"
- desc = "A stealthy, dark scarf."
- icon_state = "ninja_scarf"
- item_state = "ninja_scarf"
- flags_cover = MASKCOVERSMOUTH
- w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0.90
-
-
/obj/item/clothing/mask/pig
name = "pig mask"
desc = "A rubber pig mask."
@@ -475,7 +435,7 @@
/obj/item/clothing/mask/bandana/durathread
name = "durathread bandana"
- desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
+ desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
icon_state = "banddurathread"
/obj/item/clothing/mask/false_cluwne_mask
diff --git a/code/modules/clothing/masks/voicemodulator.dm b/code/modules/clothing/masks/voicemodulator.dm
index c05a17aeab13..665ef58fe45b 100644
--- a/code/modules/clothing/masks/voicemodulator.dm
+++ b/code/modules/clothing/masks/voicemodulator.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/mask/gas/voice_modulator
name = "modified gas mask"
- desc = "A gas mask modified with a sound modulator that disguises the user's voice when active"
+ desc = "A gas mask modified with a sound modulator that disguises the user's voice when active."
icon_state = "voice_modulator"
item_state = "voice_modulator"
@@ -16,7 +16,7 @@
/obj/item/clothing/mask/gas/voice_modulator/chameleon
name = "chameleon voice modulator mask"
- desc = "A tactical mask equipped with chameleon technology and a sound modulator that disguises the user's voice when active"
+ desc = "A tactical mask equipped with chameleon technology and a sound modulator that disguises the user's voice when active."
icon_state = "swat"
item_state = "swat"
diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm
index 359b85baffa7..ec5ed1765399 100644
--- a/code/modules/clothing/patreon/hats.dm
+++ b/code/modules/clothing/patreon/hats.dm
@@ -53,7 +53,7 @@
//black sombrero
/obj/item/clothing/head/fluff/blacksombrero
name = "Black sombrero"
- desc = "A rare identifying hat of the infamous ancient renegade gang known as 'El Loco Pocos'"
+ desc = "A rare identifying hat of the infamous ancient renegade gang known as 'El Loco Pocos'."
icon_state = "blacksombrero"
item_state = "blacksombrero"
flags = BLOCKHAIR
diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
index 5ce6c2dff669..068d6671e59a 100644
--- a/code/modules/clothing/shoes/misc_shoes.dm
+++ b/code/modules/clothing/shoes/misc_shoes.dm
@@ -265,7 +265,7 @@
/obj/item/clothing/shoes/cyborg
name = "cyborg boots"
- desc = "Shoes for a cyborg costume"
+ desc = "Shoes for a cyborg costume."
icon_state = "boots"
dyeable = FALSE
@@ -390,7 +390,7 @@
/obj/item/clothing/shoes/cowboy/black
name = "black cowboy boots"
- desc = "A pair a' black rustlers' boots"
+ desc = "A pair a' black rustlers' boots."
icon_state = "cowboy_black"
item_color = "cowboy_black"
@@ -425,7 +425,7 @@
/obj/effect/spawner/lootdrop/lizardboots
name = "random lizard boot quality"
- desc = "Which ever gets picked, the lizard race loses"
+ desc = "Which ever gets picked, the lizard race loses."
icon = 'icons/obj/clothing/shoes.dmi'
icon_state = "lizardboots_green"
loot = list(
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index b8140922a33e..5cf6a5446c59 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -20,7 +20,7 @@
/obj/item/clothing/suit/space/chronos
name = "chronosuit"
- desc = "An advanced spacesuit equipped with teleportation and anti-compression technology"
+ desc = "An advanced spacesuit equipped with teleportation and anti-compression technology."
icon_state = "chronosuit"
item_state = "chronosuit"
actions_types = list(/datum/action/item_action/toggle)
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index 24590a05b18b..b884e4dfc42c 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -90,7 +90,7 @@
/obj/item/clothing/suit/justice
name = "justice suit"
- desc = "this pretty much looks ridiculous"
+ desc = "This pretty much looks ridiculous."
icon_state = "justice"
item_state = "justice"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -212,7 +212,7 @@
/obj/item/clothing/suit/monkeysuit
name = "monkey suit"
- desc = "A suit that looks like a primate"
+ desc = "A suit that looks like a primate."
icon_state = "monkeysuit"
item_state = "monkeysuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HANDS
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 29c33bd0a46a..b99ea6d18af9 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -66,7 +66,7 @@
/obj/item/clothing/head/wizard/magus
name = "magus helm"
- desc = "A mysterious helmet that hums with an unearthly power"
+ desc = "A mysterious helmet that hums with an unearthly power."
icon_state = "magus"
item_state = "magus"
dog_fashion = /datum/dog_fashion/head/wizard/magus
@@ -134,13 +134,13 @@
/obj/item/clothing/suit/wizrobe/magusblue
name = "magus robe"
- desc = "A set of armoured robes that seem to radiate a dark power"
+ desc = "A set of armoured robes that seem to radiate a dark power."
icon_state = "magusblue"
item_state = "magusblue"
/obj/item/clothing/suit/wizrobe/magusred
name = "magus robe"
- desc = "A set of armoured robes that seem to radiate a dark power"
+ desc = "A set of armoured robes that seem to radiate a dark power."
icon_state = "magusred"
item_state = "magusred"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 33bd9d0dca53..e21b8d523c8f 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -98,7 +98,7 @@
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
- desc = "Don't wear this near paranoid security officers"
+ desc = "Don't wear this near paranoid security officers."
icon_state = "orange"
item_state = "o_suit"
item_color = "orange"
@@ -306,7 +306,7 @@
/obj/item/clothing/under/color/rainbow
name = "rainbow"
- desc = "rainbow"
+ desc = "rainbow."
icon_state = "rainbow"
item_state = "rainbow"
item_color = "rainbow"
diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm
index 8804b0d4d719..ead86b6b7ff4 100644
--- a/code/modules/clothing/under/costumes.dm
+++ b/code/modules/clothing/under/costumes.dm
@@ -70,7 +70,7 @@
/obj/item/clothing/under/costume/mankini
name = "the mankini"
- desc = "No honest man would wear this abomination"
+ desc = "No honest man would wear this abomination."
icon_state = "mankini"
item_color = "mankini"
@@ -119,7 +119,7 @@
/obj/item/clothing/under/costume/pirate_rags
name = "pirate rags"
- desc = "an old ragged set of clothing"
+ desc = "an old ragged set of clothing."
icon_state = "piraterags"
item_state = "piraterags"
item_color = "piraterags"
@@ -199,7 +199,7 @@
/obj/item/clothing/under/costume/kilt
name = "kilt"
- desc = "Includes shoes and plaid"
+ desc = "Includes shoes and plaid."
icon_state = "kilt"
item_state = "kilt"
item_color = "kilt"
diff --git a/code/modules/clothing/under/jobs/security_jumpsuits.dm b/code/modules/clothing/under/jobs/security_jumpsuits.dm
index 925d5bc7aeea..d92bf4123b6c 100644
--- a/code/modules/clothing/under/jobs/security_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/security_jumpsuits.dm
@@ -42,7 +42,7 @@
/obj/item/clothing/under/rank/security/officer/skirt
name = "security officer's jumpskirt"
- desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
+ desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
icon_state = "security_skirt"
item_state = "r_suit"
item_color = "security_skirt"
diff --git a/code/modules/clothing/under/misc_jumpsuits.dm b/code/modules/clothing/under/misc_jumpsuits.dm
index 3d2e48173b7e..680d3915fa52 100644
--- a/code/modules/clothing/under/misc_jumpsuits.dm
+++ b/code/modules/clothing/under/misc_jumpsuits.dm
@@ -26,7 +26,7 @@
/obj/item/clothing/under/misc/scratch
name = "white suit"
- desc = "A white suit, suitable for an excellent host"
+ desc = "A white suit, suitable for an excellent host."
icon_state = "scratch"
item_state = "scratch"
item_color = "scratch"
diff --git a/code/modules/clothing/under/syndicate_jumpsuits.dm b/code/modules/clothing/under/syndicate_jumpsuits.dm
index 92c1c045d0bd..ceda190cdf36 100644
--- a/code/modules/clothing/under/syndicate_jumpsuits.dm
+++ b/code/modules/clothing/under/syndicate_jumpsuits.dm
@@ -24,7 +24,7 @@
/obj/item/clothing/under/syndicate/greyman
name = "greyman henley"
- desc = "Attire for someone who finds it hard to survive in the safest place known to man - urban environment "
+ desc = "Attire for someone who finds it hard to survive in the safest place known to man - urban environment."
icon_state = "greyman"
item_color = "greyman"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 40, ACID = 35)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 59308ef3757c..0938dabfc7d9 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -100,8 +100,8 @@
/obj/item/fluff/tattoo_gun/elliot_cybernetic_tat/attack_self(mob/user as mob)
if(!used)
- var/ink_color = input("Please select an ink color.", "Tattoo Ink Color", rgb(tattoo_r, tattoo_g, tattoo_b)) as color|null
- if(ink_color && !(user.incapacitated() || used))
+ var/ink_color = tgui_input_color(user, "Please select an ink color.", "Tattoo Ink Color", rgb(tattoo_r, tattoo_g, tattoo_b))
+ if(!isnull(ink_color) && !(user.incapacitated() || used))
tattoo_r = color2R(ink_color)
tattoo_g = color2G(ink_color)
tattoo_b = color2B(ink_color)
@@ -234,7 +234,7 @@
/// Duckchan: Rybys Romney
/obj/item/lighter/zippo/fluff/duckchan
name = "Monogrammed Zippo"
- desc = " A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame."
+ desc = "A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame."
icon_state = "zippo-duckchan"
item_state = "zippo-purple"
@@ -467,7 +467,7 @@
/// IK3I: Yakikatachi
/obj/item/fluff/k3_webbing_modkit
name = "webbing modkit"
- desc = "A modkit that can be used to turn certain vests and labcoats into lightweight webbing"
+ desc = "A modkit that can be used to turn certain vests and labcoats into lightweight webbing."
icon_state = "modkit"
w_class = 2
force = 0
@@ -660,7 +660,7 @@
/// MrFroztee: Stumpy
/obj/item/clothing/head/pirate/fluff/stumpy
name = "The Sobriety Skullcap"
- desc = "A hat suited for the king of the pirates"
+ desc = "A hat suited for the king of the pirates."
icon_state = "pirate"
item_state = "pirate"
@@ -832,7 +832,7 @@
/// Denthamos: Henry Grandpa Gadow
/obj/item/clothing/suit/fluff/supplymaster_jacket
name = "faded NT Supply Master's Coat"
- desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it."
+ desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it."
icon_state = "supplymaster_jacket_open"
item_state = "supplymaster_jacket_open"
ignore_suitadjust = 0
@@ -1137,7 +1137,7 @@
/obj/item/clothing/under/fluff/benjaminfallout
icon = 'icons/obj/custom_items.dmi'
name = "Pretzel's dress"
- desc = "A nice looking dress"
+ desc = "A nice looking dress."
icon_state = "fallout_dress"
item_state = "fallout_dress"
item_color = "fallout_dress"
@@ -1262,7 +1262,7 @@
/// sasanek12: Dar'Konr
/obj/item/clothing/mask/bandana/fluff/dar
name = "camo bandana"
- desc = "It's a worn-out bandana in camo paint"
+ desc = "It's a worn-out bandana in camo paint."
icon = 'icons/obj/custom_items.dmi'
icon_state = "bandcamo"
@@ -1360,7 +1360,7 @@
/obj/item/clothing/shoes/fluff/arachno_boots
name = "Arachno-Man boots"
- desc = "These boots were made for crawlin'"
+ desc = "These boots were made for crawlin'."
icon = 'icons/obj/custom_items.dmi'
icon_state = "superior_boots"
item_state = "superior_boots"
diff --git a/code/modules/economy/economy_machinery/economy_machinery.dm b/code/modules/economy/economy_machinery/economy_machinery.dm
index 0124c769713d..31a7a1fb79d9 100644
--- a/code/modules/economy/economy_machinery/economy_machinery.dm
+++ b/code/modules/economy/economy_machinery/economy_machinery.dm
@@ -4,7 +4,7 @@
*/
/obj/machinery/economy
name = "Financial System Interface"
- desc = "A base economy machine"
+ desc = "A base economy machine."
anchored = TRUE
density = TRUE
diff --git a/code/modules/economy/merch_items.dm b/code/modules/economy/merch_items.dm
index 0854fa4ffed7..216c7791a521 100644
--- a/code/modules/economy/merch_items.dm
+++ b/code/modules/economy/merch_items.dm
@@ -13,7 +13,7 @@
/datum/merch_item/snap_pops
name = "Snap-Pops"
- desc = "Ten-thousand-year-old chinese fireworks: IN SPACE"
+ desc = "Ten-thousand-year-old chinese fireworks: IN SPACE!"
typepath = /obj/item/storage/box/snappops
cost = 100
category = MERCH_CAT_TOY
diff --git a/code/modules/events/blob/blob_structures/strong_blob.dm b/code/modules/events/blob/blob_structures/strong_blob.dm
index 7747686be6be..7d4a4346dc80 100644
--- a/code/modules/events/blob/blob_structures/strong_blob.dm
+++ b/code/modules/events/blob/blob_structures/strong_blob.dm
@@ -2,7 +2,7 @@
name = "strong blob"
icon = 'icons/mob/blob.dmi'
icon_state = "blob_shield"
- desc = "Some blob creature thingy"
+ desc = "Some blob creature thingy."
max_integrity = 150
brute_resist = 0.25
explosion_block = 3
diff --git a/code/modules/events/blob/theblob.dm b/code/modules/events/blob/theblob.dm
index 6cd12653f998..2ecee71c3065 100644
--- a/code/modules/events/blob/theblob.dm
+++ b/code/modules/events/blob/theblob.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(blob_minions)
name = "blob"
icon = 'icons/mob/blob.dmi'
light_range = 3
- desc = "Some blob creature thingy"
+ desc = "Some blob creature thingy."
density = FALSE
opacity = FALSE
anchored = TRUE
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 7e913f1b15ae..89ca75c8cc33 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -101,7 +101,7 @@
/obj/item/fish
name = "fish"
- desc = "A generic fish"
+ desc = "A generic fish."
icon = 'icons/obj/fish_items.dmi'
icon_state = "fish"
throwforce = 1
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 7abc76af1982..cb932b6880c0 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -273,7 +273,7 @@
/obj/item/reagent_containers/drinks/bottle/fernet
name = "Fernet Bronca"
- desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
+ desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station."
icon_state = "fernetbottle"
list_reagents = list("fernet" = 100)
diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
index 637ed8ec646d..f75698d53900 100644
--- a/code/modules/food_and_drinks/drinks/drinks/mugs.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
@@ -143,7 +143,7 @@
/obj/item/reagent_containers/drinks/mug/rd
name = "research director's mug"
- desc = "Energy tech level: 99"
+ desc = "Energy tech level: 99."
icon_state = "mug_rd"
preset = TRUE
diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm
index ba2b1905bbec..30e52563f1ed 100644
--- a/code/modules/food_and_drinks/drinks/drinks_base.dm
+++ b/code/modules/food_and_drinks/drinks/drinks_base.dm
@@ -3,7 +3,7 @@
////////////////////////////////////////////////////////////////////////////////
/obj/item/reagent_containers/drinks
name = "drink"
- desc = "yummy"
+ desc = "yummy!"
icon = 'icons/obj/drinks.dmi'
icon_state = null
container_type = OPENCONTAINER
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index c048f8c3fc8c..d15690a38679 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -196,7 +196,7 @@ do {\
/obj/item/food/customizable/candy/cotton
name = "flavored cotton candy"
- desc = "Who can take a sunrise, sprinkle it with dew,"
+ desc = "Who can take a sunrise, sprinkle it with dew."
icon_state = "cottoncandycustom"
baseicon = "cottoncandycustom"
basename = "flavored cotton candy"
@@ -205,7 +205,7 @@ do {\
/obj/item/food/customizable/candy/gummybear
name = "flavored giant gummy bear"
- desc = "Cover it in chocolate and a miracle or two,"
+ desc = "Cover it in chocolate and a miracle or two."
icon_state = "gummybearcustom"
baseicon = "gummybearcustom"
basename = "flavored giant gummy bear"
@@ -214,7 +214,7 @@ do {\
/obj/item/food/customizable/candy/gummyworm
name = "flavored giant gummy worm"
- desc = "The Candy Man can 'cause he mixes it with love,"
+ desc = "The Candy Man can 'cause he mixes it with love."
icon_state = "gummywormcustom"
baseicon = "gummywormcustom"
basename = "flavored giant gummy worm"
@@ -232,7 +232,7 @@ do {\
/obj/item/food/customizable/candy/jawbreaker
name = "flavored jawbreaker"
- desc = "Who can take a rainbow, Wrap it in a sigh,"
+ desc = "Who can take a rainbow, Wrap it in a sigh."
icon_state = "jawbreakercustom"
baseicon = "jawbreakercustom"
basename = "flavored jawbreaker"
@@ -241,7 +241,7 @@ do {\
/obj/item/food/customizable/candy/candycane
name = "flavored candy cane"
- desc = "Soak it in the sun and make strawberry-lemon pie,"
+ desc = "Soak it in the sun and make strawberry-lemon pie."
icon_state = "candycanecustom"
baseicon = "candycanecustom"
basename = "flavored candy cane"
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 2f3be77168f2..97b91f9cc19d 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -228,7 +228,7 @@
/obj/item/food/birthdaycakeslice
name = "birthday cake slice"
- desc = "A slice of your birthday"
+ desc = "A slice of your birthday!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "birthdaycakeslice"
trash = /obj/item/trash/plate
@@ -321,7 +321,7 @@
/obj/item/food/vanilla_berry_cake_slice
name = "blackberry and strawberry vanilla cake slice"
- desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
+ desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "vanilla_berry_cake_slice"
trash = /obj/item/trash/plate
diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm
index 7da7c8fb1945..40c5b9bf7691 100644
--- a/code/modules/food_and_drinks/food/foods/pizza.dm
+++ b/code/modules/food_and_drinks/food/foods/pizza.dm
@@ -211,7 +211,7 @@
/obj/item/food/firecrackerpizzaslice
name = "firecracker pizza slice"
- desc = "A spicy slice of something quite nice"
+ desc = "A spicy slice of something quite nice."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "firecrackerpizzaslice"
filling_color = "#BAA14C"
diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm
index 5290fcd736ef..6e9b7d07e2df 100644
--- a/code/modules/food_and_drinks/food_base.dm
+++ b/code/modules/food_and_drinks/food_base.dm
@@ -6,7 +6,7 @@
/obj/item/food
name = "snack"
- desc = "yummy"
+ desc = "yummy!"
icon = 'icons/obj/food/food.dmi'
icon_state = null
resistance_flags = FLAMMABLE
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 011bf47fc46b..69871f40a522 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -558,7 +558,7 @@
*/
/obj/machinery/smartfridge/foodcart
name = "food and drink cart"
- desc = "A portable cart for hawking your food and drink wares around the station"
+ desc = "A portable cart for hawking your food and drink wares around the station."
icon = 'icons/obj/kitchen.dmi'
icon_state = "foodcart"
anchored = FALSE
@@ -697,7 +697,7 @@
*/
/obj/machinery/smartfridge/secure/extract
name = "\improper Slime Extract Storage"
- desc = "A refrigerated storage unit for slime extracts"
+ desc = "A refrigerated storage unit for slime extracts."
board_type = /obj/machinery/smartfridge/secure/extract
/obj/machinery/smartfridge/secure/extract/Initialize(mapload)
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 199a7add0bcf..45f9c17e00fd 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -374,7 +374,7 @@
update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
user.visible_message(
"[user] [concealed ? "conceals" : "reveals"] their hand.",
- "You[concealed ? "conceal" : "reveal"] your hand.",
+ "You [concealed ? "conceal" : "reveal"] your hand.",
"You hear a hand of cards being flipped over."
)
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 1137e7533685..dbe83098a40c 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -136,7 +136,7 @@
// Blue Cherries
/obj/item/seeds/cherry/blue
name = "pack of blue cherry pits"
- desc = "The blue kind of cherries"
+ desc = "The blue kind of cherries."
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index d0c05accc2b8..4ded9fcd154e 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -46,7 +46,7 @@
/obj/item/food/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "chilly pepper"
- desc = "It's a mutant strain of chili"
+ desc = "It's a mutant strain of chili."
icon_state = "icepepper"
filling_color = "#0000CD"
bitesize_mod = 2
diff --git a/code/modules/hydroponics/grown/misc_seeds.dm b/code/modules/hydroponics/grown/misc_seeds.dm
index 0bbb55450d1f..c1639a455811 100644
--- a/code/modules/hydroponics/grown/misc_seeds.dm
+++ b/code/modules/hydroponics/grown/misc_seeds.dm
@@ -1,7 +1,7 @@
// Starthistle
/obj/item/seeds/starthistle
name = "pack of starthistle seeds"
- desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots"
+ desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots."
icon_state = "seed-starthistle"
species = "starthistle"
plantname = "Starthistle"
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index 20f43305cebc..4cffbe15ba52 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -29,7 +29,7 @@
/obj/item/seeds/tea/astra
name = "pack of tea astra seeds"
icon_state = "seed-teaastra"
- desc = "These seeds grow into Tea Astra, a more potent variant of tea"
+ desc = "These seeds grow into Tea Astra, a more potent variant of tea."
species = "teaastra"
plantname = "Tea Astra Plant"
product = /obj/item/food/grown/tea/astra
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index a4a002eb5b65..04825b90b838 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
/obj/effect/extraction_holder
name = "extraction holder"
- desc = "you shouldnt see this"
+ desc = "You shouldnt see this."
var/atom/movable/stored_obj
/obj/effect/extraction_holder/Initialize(mapload)
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index b2f092a3720c..a4786aa23cfd 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -376,7 +376,7 @@
/datum/spell/exit_possession
name = "Exit Possession"
- desc = "Exits the body you are possessing"
+ desc = "Exits the body you are possessing."
base_cooldown = 60
clothes_req = FALSE
invocation_type = "none"
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 185be3ddb7c4..c01cffefa31c 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -138,7 +138,7 @@
// Noise "language", for audible emotes.
/datum/language/noise
name = "Noise"
- desc = "Noises"
+ desc = "Noises."
key = ""
flags = RESTRICTED|NONGLOBAL|INNATE|NO_TALK_MSG|NO_STUTTER
diff --git a/code/modules/mob/living/carbon/alien/alien_base.dm b/code/modules/mob/living/carbon/alien/alien_base.dm
index e37f2a8705ef..92152327c4c7 100644
--- a/code/modules/mob/living/carbon/alien/alien_base.dm
+++ b/code/modules/mob/living/carbon/alien/alien_base.dm
@@ -5,6 +5,7 @@
bubble_icon = "alien"
icon = 'icons/mob/alien.dmi'
gender = NEUTER
+ faction = list("alien")
var/nightvision = TRUE
see_in_dark = 4
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index 38b70dcfa4d0..9243510ddb41 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -152,11 +152,11 @@
if(!head_organ)
return
if(!robohead.is_monitor) //If they've got a prosthetic head and it isn't a monitor, they've no screen to adjust. Instead, let them change the colour of their optics!
- var/optic_colour = input(H, "Select optic colour", H.m_colours["head"]) as color|null
+ var/optic_colour = tgui_input_color(H, "Please select an optic color", "Select Optic Color", H.m_colours["head"])
if(H.incapacitated(TRUE, TRUE))
- to_chat(H, "You were interrupted while changing the colour of your optics.")
+ to_chat(H, "You were interrupted while changing the color of your optics.")
return
- if(optic_colour)
+ if(!isnull(optic_colour))
H.change_markings(optic_colour, "head")
else if(robohead.is_monitor) //Means that the character's head is a monitor (has a screen). Time to customize.
@@ -175,7 +175,7 @@
var/new_style = tgui_input_list(H, "Select a monitor display", "Monitor Display", hair)
if(!new_style)
return
- var/new_color = input("Please select hair color.", "Monitor Color", head_organ.hair_colour) as null|color
+ var/new_color = tgui_input_color(H, "Please select hair color.", "Monitor Color", head_organ.hair_colour)
if(H.incapacitated(TRUE, TRUE))
to_chat(H, "You were interrupted while changing your monitor display.")
@@ -183,7 +183,7 @@
if(new_style)
H.change_hair(new_style, 1) // The 1 is to enable custom sprites
- if(new_color)
+ if(!isnull(new_color))
H.change_hair_color(new_color)
/datum/species/machine/spec_electrocute_act(mob/living/carbon/human/H, shock_damage, source, siemens_coeff, flags)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 98af30e9d078..c39e6d73ef8c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -663,6 +663,8 @@
var/mob/living/carbon/human/H = src
if(H.dna.species.blood_color)
existing_trail.color = H.dna.species.blood_color
+ else if(isalien(src))
+ existing_trail.color = "#05EE05"
else
existing_trail.color = "#A10808"
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index 14c00ecf25d7..93700276264d 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -20,7 +20,7 @@
faction = list("syndicate")
bubble_icon = "syndibot"
name = "R.O.D.G.E.R"
- desc = "Red Operations, Depot General Emission Regulator"
+ desc = "Red Operations, Depot General Emission Regulator."
icon_state = "ai-magma"
/mob/living/silicon/decoy/syndicate/Initialize(mapload)
diff --git a/code/modules/mob/living/simple_animal/bot/bot_construction.dm b/code/modules/mob/living/simple_animal/bot/bot_construction.dm
index c302b3bd39fb..ade672f36864 100644
--- a/code/modules/mob/living/simple_animal/bot/bot_construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot_construction.dm
@@ -230,8 +230,8 @@
//Floorbot assemblies
/obj/item/toolbox_tiles
- desc = "It's a toolbox with tiles sticking out the top"
name = "tiles and toolbox"
+ desc = "It's a toolbox with tiles sticking out the top."
icon = 'icons/obj/aibots.dmi'
icon_state = "toolbox_tiles"
force = 3
@@ -244,8 +244,8 @@
var/toolbox_color = "" //Blank for blue, r for red, y for yellow, etc.
/obj/item/toolbox_tiles/sensor
- desc = "It's a toolbox with tiles sticking out the top and a sensor attached"
name = "tiles, toolbox and sensor arrangement"
+ desc = "It's a toolbox with tiles sticking out the top and a sensor attached."
icon_state = "toolbox_tiles_sensor"
/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index bb0c73ac7d6c..105fe7d83944 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -3,7 +3,7 @@
/mob/living/simple_animal/bot/ed209
name = "\improper ED-209 Security Robot"
- desc = "A security robot. He looks less than thrilled."
+ desc = "A security robot. He looks less than thrilled."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed2090"
density = TRUE
diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm
index 58a3b0731528..f91168748fea 100644
--- a/code/modules/mob/living/simple_animal/bot/griefsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm
@@ -23,7 +23,7 @@
/// A toy version of general griefsky!
/mob/living/simple_animal/bot/secbot/griefsky/toy
name = "Genewul Giftskee"
- desc = "An adorable looking secbot with four toy swords taped to its arms"
+ desc = "An adorable looking secbot with four toy swords taped to its arms."
spin_icon = "griefskyj-c"
health = 50
maxHealth = 50
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index e8fcc65ec949..d3245101d07c 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -538,7 +538,7 @@
if("machine")
new /obj/item/storage/firstaid/machine/empty(Tsec)
else
- new /obj/item/storage/firstaid(Tsec)
+ new /obj/item/storage/firstaid/regular/empty(Tsec)
new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 82b3a1c68802..0a9f94f34f3f 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -3,7 +3,7 @@
/mob/living/simple_animal/bot/secbot
name = "\improper Securitron"
- desc = "A little security robot. He looks less than thrilled."
+ desc = "A little security robot. He looks less than thrilled."
icon = 'icons/obj/aibots.dmi'
icon_state = "secbot0"
density = FALSE
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 906518cb9414..d17e5842d695 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -109,7 +109,7 @@
/mob/living/simple_animal/hostile/construct/armoured
name = "Juggernaut"
real_name = "Juggernaut"
- desc = "A possessed suit of armour driven by the will of the restless dead"
+ desc = "A possessed suit of armour driven by the will of the restless dead."
icon_state = "behemoth"
icon_living = "behemoth"
hud_type = /datum/hud/construct/armoured
@@ -153,7 +153,7 @@
/mob/living/simple_animal/hostile/construct/wraith
name = "Wraith"
real_name = "Wraith"
- desc = "A wicked bladed shell contraption piloted by a bound spirit"
+ desc = "A wicked bladed shell contraption piloted by a bound spirit."
icon_state = "floating"
icon_living = "floating"
hud_type = /datum/hud/construct/wraith
diff --git a/code/modules/mob/living/simple_animal/friendly/bunny.dm b/code/modules/mob/living/simple_animal/friendly/bunny.dm
index fdb751512fbe..881e014f1477 100644
--- a/code/modules/mob/living/simple_animal/friendly/bunny.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bunny.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/bunny
name = "bunny"
real_name = "bunny"
- desc = "Awww a cute bunny"
+ desc = "Awww a cute bunny."
icon_state = "m_bunny"
icon_living = "m_bunny"
icon_dead = "bunny_dead"
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 7d620baf3e70..b716622e685a 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -31,7 +31,7 @@
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/pet/cat/Runtime
name = "Runtime"
- desc = "GCAT"
+ desc = "GCAT."
icon_state = "cat"
icon_living = "cat"
icon_dead = "cat_dead"
@@ -187,7 +187,7 @@
/mob/living/simple_animal/pet/cat/kitten
name = "kitten"
- desc = "D'aaawwww"
+ desc = "D'aaawwww."
icon_state = "kitten"
icon_living = "kitten"
icon_dead = "kitten_dead"
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index b07a72482e6a..73232630370d 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -205,18 +205,22 @@
return FALSE
var/datum/mind/blobmind = mind
var/client/C = client
+ var/obj/structure/blob/core/core
if(istype(blobmind) && istype(C))
- var/obj/structure/blob/core/core = new(T, C, 3)
+ core = new(T, C, 3)
core.lateblobtimer()
qdel(blobmind) // Delete the old mind. THe blob will make a new one
else
- new /obj/structure/blob/core(T) // Ghosts will be prompted to control it.
+ core = new(T) // Ghosts will be prompted to control it.
if(ismob(loc)) // in case some taj/etc ate the mouse.
var/mob/M = loc
M.gib()
if(!gibbed)
gib()
+ if(core)
+ core.admin_spawned = admin_spawned
+
SSticker.record_biohazard_start(BIOHAZARD_BLOB)
/mob/living/simple_animal/mouse/blobinfected/get_scooped(mob/living/carbon/grabber)
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index dd9b7433f8f6..dcbcc16ba39c 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -246,7 +246,7 @@
//Botany Queen Bee
/mob/living/simple_animal/hostile/poison/bees/queen
name = "queen bee"
- desc = "She's the queen of bees, BZZ BZZ"
+ desc = "She's the queen of bees, BZZ BZZ!"
icon_base = "queen"
isqueen = TRUE
mouse_opacity = MOUSE_OPACITY_OPAQUE
@@ -278,7 +278,7 @@
/obj/item/queen_bee
name = "queen bee"
- desc = "She's the queen of bees, BZZ BZZ"
+ desc = "She's the queen of bees, BZZ BZZ!"
icon_state = "queen_item"
item_state = ""
icon = 'icons/mob/bees.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 9edf3e3d0001..b9bddd139c78 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -600,10 +600,10 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/space_dragon
name = "space dragon"
+ desc = "A space carp turned dragon by vile magic. Has the same ferocity of a space carp, but also a much more enabling body."
maxHealth = 1000
health = 1000
faction = list("carp")
- desc = "A space carp turned dragon by vile magic. Has the same ferocity of a space carp, but also a much more enabling body."
icon = 'icons/mob/spacedragon.dmi'
icon_state = "spacedragon"
icon_living = "spacedragon"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
index 798337995444..c2bfa29476cb 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
@@ -18,7 +18,7 @@
/mob/living/simple_animal/hostile/asteroid/elite/broodmother
name = "goliath broodmother"
- desc = "An example of sexual dimorphism, this female goliath looks much different than the males of her species. She is, however, just as dangerous, if not more."
+ desc = "An example of sexual dimorphism, this female goliath looks much different than the males of her species. She is, however, just as dangerous, if not more."
gender = FEMALE
icon_state = "broodmother"
icon_living = "broodmother"
@@ -165,7 +165,7 @@
//The goliath's children. Pretty weak, simple mobs which are able to put a single tentacle under their target when at range.
/mob/living/simple_animal/hostile/asteroid/elite/broodmother_child
name = "baby goliath"
- desc = "A young goliath recently born from it's mother. While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born."
+ desc = "A young goliath recently born from it's mother. While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born."
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "goliath_baby"
icon_living = "goliath_baby"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
index 395e32f4157b..fee84e4083bf 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
@@ -199,7 +199,7 @@
/mob/living/simple_animal/hostile/asteroid/elite/herald/mirror
name = "herald's mirror"
- desc = "This fiendish work of magic copies the herald's attacks. Seems logical to smash it."
+ desc = "This fiendish work of magic copies the herald's attacks. Seems logical to smash it."
health = 60
maxHealth = 60
icon_state = "herald_mirror"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
index 68c4c3f6c938..cf8b65a09d9c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
@@ -281,7 +281,7 @@
//The legionnaire's bonfire, which can be swapped positions with. Also sets flammable living beings on fire when they walk over it.
/obj/structure/legionnaire_bonfire
name = "bone pile"
- desc = "A pile of bones which seems to occasionally move a little. It's probably a good idea to smash them."
+ desc = "A pile of bones which seems to occasionally move a little. It's probably a good idea to smash them."
icon = 'icons/obj/lavaland/legionnaire_bonfire.dmi'
icon_state = "bonfire"
max_integrity = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
index f893634965df..d0c6b420a9df 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
@@ -19,7 +19,7 @@
/mob/living/simple_animal/hostile/asteroid/elite/pandora
name = "pandora"
- desc = "A large magic box with similar power and design to the Hierophant. Once it opens, it's not easy to close it."
+ desc = "A large magic box with similar power and design to the Hierophant. Once it opens, it's not easy to close it."
icon_state = "pandora"
icon_living = "pandora"
icon_aggro = "pandora"
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
index ae8634db2b17..08a695f79d14 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
@@ -157,7 +157,7 @@
/obj/structure/spider/terrorweb
name = "terror web"
- desc = "it's stringy and sticky"
+ desc = "It's stringy and sticky!"
icon = 'icons/effects/effects.dmi'
anchored = TRUE // prevents people dragging it
density = FALSE // prevents it blocking all movement
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 8129b49d1c83..61cd634b258c 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/shade
name = "Shade"
real_name = "Shade"
- desc = "A bound spirit"
+ desc = "A bound spirit."
icon = 'icons/mob/cult.dmi'
icon_state = "shade"
icon_living = "shade"
diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm
index e727ab7af83e..566296c5af7f 100644
--- a/code/modules/mob/mob_holder.dm
+++ b/code/modules/mob/mob_holder.dm
@@ -117,7 +117,7 @@
/obj/item/holder/bunny
name = "bunny"
- desc = "Awww a cute bunny"
+ desc = "Awww a cute bunny."
icon = 'icons/mob/animal.dmi'
icon_state = "m_bunny"
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index ae880b5a2eaf..3ef82f70ca50 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -251,8 +251,8 @@
/obj/item/mod/module/flashlight/configure_edit(key, value)
switch(key)
if("light_color")
- value = input(usr, "Pick new light color", "Flashlight Color") as color|null
- if(!value)
+ value = tgui_input_color(usr, "Pick new light color", "Flashlight Color", light_color)
+ if(isnull(value))
return
if(is_color_dark(value, 50))
to_chat(mod.wearer, ("That is too dark"))
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 9700564be7f8..964478af7229 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -1,6 +1,6 @@
/obj/item/katana/energy
name = "energy katana"
- desc = "A katana infused with a strong energy"
+ desc = "A katana infused with a strong energy."
icon = 'icons/obj/weapons/energy_melee.dmi'
icon_state = "energy_katana"
item_state = "energy_katana"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 29330bc8feb0..8666d1d3da4b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -632,8 +632,35 @@
info = "Right, so you're wanting to learn how to feed the teeming masses of the station yeah?
\n
\nWell I was asked to write these tips to help you not burn all of your meals and prevent food poisonings.
\n
\nOkay first things first, making a humble ball of dough.
\n
\nCheck the lockers for a bag or two of flour and then find a glass cup or a beaker, something that can hold liquids. Next pour 15 units of flour into the container and then pour 10 units of water in as well. Hey presto! You've made a ball of dough, which can lead to many possibilities.
\n
\nAlso, before I forget, KEEP YOUR FOOD OFF THE DAMN FLOOR! Space ants love getting onto any food not on a table or kept away in a closed locker. You wouldn't believe how many injuries have resulted from space ants...
\n
\nOkay back on topic, let's make some cheese, just follow along with me here.
\n
\nLook in the lockers again for some milk cartons and grab another glass to mix with. Next look around for a bottle named 'Universal Enzyme' unless they changed the look of it, it should be a green bottle with a red label. Now pour 5 units of enzyme into a glass and 40 units of milk into the glass as well. In a matter of moments you'll have a whole wheel of cheese at your disposal.
\n
\nOkay now that you've got the ingredients, let's make a classic crewman food, cheese bread.
\n
\nMake another ball of dough, and cut up your cheese wheel with a knife or something else sharp such as a pair of wire cutters. Okay now look around for an oven in the kitchen and put 2 balls of dough and 2 cheese wedges into the oven and turn it on. After a few seconds a fresh and hot loaf of cheese bread will pop out. Lastly cut it into slices with a knife and serve.
\n
\nCongratulations on making it this far. If you haven't created a burnt mess of slop after following these directions you might just be on your way to becoming a master chef someday.
\n
\nBe sure to look up other recipes and bug the Head of Personnel if Botany isn't providing you with crops, wheat is your friend and lifeblood.
\n
\nGood luck in the kitchen, and try not to burn down the place.
\n
\n-Morgan Ramslay" /obj/item/paper/djstation - name = "DJ Listening Outpost" - info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
);
};
diff --git a/tgui/packages/tgui/components/Interactive.tsx b/tgui/packages/tgui/components/Interactive.tsx
new file mode 100644
index 000000000000..c2d1b899b24a
--- /dev/null
+++ b/tgui/packages/tgui/components/Interactive.tsx
@@ -0,0 +1,138 @@
+/**
+ * MIT License
+ * https://github.com/omgovich/react-colorful/
+ *
+ * Copyright (c) 2020 Vlad Shilov \n
\nWell I was asked to write these tips to help you not burn all of your meals and prevent food poisonings.
\n
\nOkay first things first, making a humble ball of dough.
\n
\nCheck the lockers for a bag or two of flour and then find a glass cup or a beaker, something that can hold liquids. Next pour 15 units of flour into the container and then pour 10 units of water in as well. Hey presto! You've made a ball of dough, which can lead to many possibilities.
\n
\nAlso, before I forget, KEEP YOUR FOOD OFF THE DAMN FLOOR! Space ants love getting onto any food not on a table or kept away in a closed locker. You wouldn't believe how many injuries have resulted from space ants...
\n
\nOkay back on topic, let's make some cheese, just follow along with me here.
\n
\nLook in the lockers again for some milk cartons and grab another glass to mix with. Next look around for a bottle named 'Universal Enzyme' unless they changed the look of it, it should be a green bottle with a red label. Now pour 5 units of enzyme into a glass and 40 units of milk into the glass as well. In a matter of moments you'll have a whole wheel of cheese at your disposal.
\n
\nOkay now that you've got the ingredients, let's make a classic crewman food, cheese bread.
\n
\nMake another ball of dough, and cut up your cheese wheel with a knife or something else sharp such as a pair of wire cutters. Okay now look around for an oven in the kitchen and put 2 balls of dough and 2 cheese wedges into the oven and turn it on. After a few seconds a fresh and hot loaf of cheese bread will pop out. Lastly cut it into slices with a knife and serve.
\n
\nCongratulations on making it this far. If you haven't created a burnt mess of slop after following these directions you might just be on your way to becoming a master chef someday.
\n
\nBe sure to look up other recipes and bug the Head of Personnel if Botany isn't providing you with crops, wheat is your friend and lifeblood.
\n
\nGood luck in the kitchen, and try not to burn down the place.
\n
\n-Morgan Ramslay" /obj/item/paper/djstation - name = "DJ Listening Outpost" - info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " + name = "Mission Briefing" + info = "
- Monitor radio traffic in this system, especially from the Nanotrasen stations and ship traffic heading to and from them. Important findings are to be relayed to The Union using the listening post's hyperwave antenna. \ +
- You will be functioning as the hyperwave relay for KC-13, our other installation in the system. Ensure any messages they broadcast are forwarded to The Union.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - \ + Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " + +/obj/item/paper/djstation/diary_note + name = "Communications Update" + info = "KC-13 has stopped talking to me for about the past month. I assume Vostok just has his knickers in a twist.
- The highly sensitive electronics are affected by a translocation event, which will throw off any acquired locks. \ + The station must be recalibrated after every use to avoid the possibility of being translocated to a random point in space. \ +
- Currently the system is only able to function with the help of locator beacons, we have been unable to safely generate arbitrary targeting coordinates. \ +
- We cannot retrieve targets remotely, even with the aid of a locator beacon, energy consumption is too high to maintain a remote portal.
Welcome to Listening Post Yenisei!
\ + You will have two objectives for the duration of your assignment:\ +
\ +
\ + The encryption schemes used by Nanotrasen have been included in this installation's radio equipment, allowing you to listen in on their chatter. Use the frequencies supplied below to tune into channels of interest.\ +
\ +
\ +
\ + Hell, not my problem. Got all the vodka and cigarettes I need to last me a year." + +/obj/item/paper/ussp_tele + name = "Report - Bluespace Translocation Apparatus" + info = "Despite a lot of headaches and delays, the BTA is finally in a functional enough state to demonstrate to the Committee, although be warned that it has multiple limitations:
\ +
\ +
{buttons}
)}
+ {buttonsAlt && (
+
+ {buttonsAlt}
+
+ )}
+ {this.props.children}
+
+ );
+ }
+}
diff --git a/tgui/packages/tgui/components/Pointer.tsx b/tgui/packages/tgui/components/Pointer.tsx
new file mode 100644
index 000000000000..9ee8e7549df5
--- /dev/null
+++ b/tgui/packages/tgui/components/Pointer.tsx
@@ -0,0 +1,38 @@
+/**
+ * MIT License
+ * https://github.com/omgovich/react-colorful/
+ *
+ * Copyright (c) 2020 Vlad Shilov
+
+
+ );
+};
diff --git a/tgui/packages/tgui/components/index.js b/tgui/packages/tgui/components/index.js
index 1db4cb5c8986..ca3b218616b0 100644
--- a/tgui/packages/tgui/components/index.js
+++ b/tgui/packages/tgui/components/index.js
@@ -21,6 +21,7 @@ export { DraggableControl } from './DraggableControl';
export { Dropdown } from './Dropdown';
export { Flex } from './Flex';
export { Grid } from './Grid';
+export { Interactive } from './Interactive';
export { Image } from './Image';
export { DmIcon } from './DmIcon';
export { Icon } from './Icon';
@@ -33,6 +34,7 @@ export { Modal } from './Modal';
export { NanoMap } from './NanoMap';
export { NoticeBox } from './NoticeBox';
export { NumberInput } from './NumberInput';
+export { Pointer } from './Pointer';
export { Popper } from './Popper';
export { ProgressBar } from './ProgressBar';
export { RestrictedInput } from './RestrictedInput';
diff --git a/tgui/packages/tgui/interfaces/BrigTimer.js b/tgui/packages/tgui/interfaces/BrigTimer.js
index f6b8a66f832f..ccc99944049e 100644
--- a/tgui/packages/tgui/interfaces/BrigTimer.js
+++ b/tgui/packages/tgui/interfaces/BrigTimer.js
@@ -64,16 +64,18 @@ export const BrigTimer = (props, context) => {
onClick={() => act('prisoner_name')}
/>
{!!data.spns.length && (
-
+
+ +
.
+
+
+
+
+
+ );
+};
+
+const Hue = ({
+ className,
+ hue,
+ onChange,
+}: {
+ className?: string;
+ hue: number;
+ onChange: (newHue: { h: number }) => void;
+}) => {
+ const handleMove = (interaction: Interaction) => {
+ onChange({ h: 360 * interaction.left });
+ };
+
+ const handleKey = (offset: Interaction) => {
+ // Hue measured in degrees of the color circle ranging from 0 to 360
+ onChange({
+ h: clamp(hue + offset.left * 360, 0, 360),
+ });
+ };
+
+ const nodeClassName = classes(['react-colorful__hue', className]);
+
+ return (
+
+
+
+
+ );
+};
+
+const Saturation = ({
+ className,
+ color,
+ onChange,
+}: {
+ className?: string;
+ color: HsvaColor;
+ onChange: (newSaturation: { s: number }) => void;
+}) => {
+ const handleMove = (interaction: Interaction) => {
+ onChange({ s: 100 * interaction.left });
+ };
+
+ const handleKey = (offset: Interaction) => {
+ // Hue measured in degrees of the color circle ranging from 0 to 100
+ onChange({
+ s: clamp(color.s + offset.left * 100, 0, 100),
+ });
+ };
+
+ const nodeClassName = classes(['react-colorful__saturation', className]);
+
+ return (
+
+
+
+
+ );
+};
+
+const Value = ({
+ className,
+ color,
+ onChange,
+}: {
+ className?: string;
+ color: HsvaColor;
+ onChange: (newValue: { v: number }) => void;
+}) => {
+ const handleMove = (interaction: Interaction) => {
+ onChange({ v: 100 * interaction.left });
+ };
+
+ const handleKey = (offset: Interaction) => {
+ onChange({
+ v: clamp(color.v + offset.left * 100, 0, 100),
+ });
+ };
+
+ const nodeClassName = classes(['react-colorful__value', className]);
+
+ return (
+
+
+
+
+ );
+};
+
+const RGBSlider = ({
+ className,
+ color,
+ onChange,
+ target,
+}: {
+ className?: string;
+ color: HsvaColor;
+ onChange: (newValue: HsvaColor) => void;
+ target: string;
+}) => {
+ const rgb = hsvaToRgba(color);
+
+ const setNewTarget = (value: number) => {
+ rgb[target] = value;
+ onChange(rgbaToHsva(rgb));
+ };
+
+ const handleMove = (interaction: Interaction) => {
+ setNewTarget(255 * interaction.left);
+ };
+
+ const handleKey = (offset: Interaction) => {
+ setNewTarget(clamp(rgb[target] + offset.left * 255, 0, 255));
+ };
+
+ const nodeClassName = classes([`react-colorful__${target}`, className]);
+
+ let selected =
+ target === 'r'
+ ? `rgb(${Math.round(rgb.r)},0,0)`
+ : target === 'g'
+ ? `rgb(0,${Math.round(rgb.g)},0)`
+ : `rgb(0,0,${Math.round(rgb.b)})`;
+
+ return (
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/ExosuitFabricator.js b/tgui/packages/tgui/interfaces/ExosuitFabricator.js
index 4b707025c408..3b887f898703 100644
--- a/tgui/packages/tgui/interfaces/ExosuitFabricator.js
+++ b/tgui/packages/tgui/interfaces/ExosuitFabricator.js
@@ -129,6 +129,7 @@ const Designs = (properties, context) => {
className="Exofab__designs"
title={
/gi,"\n").replace(/<\/?[a-z0-9-_]+[^>]*>/gi,"").replace(l,function(d,h){return g[h]}).replace(/&#?([0-9]+);/gi,function(d,h){var m=parseInt(h,10);return String.fromCharCode(m)}).replace(/&#x?([0-9a-f]+);/gi,function(d,h){var m=parseInt(h,16);return String.fromCharCode(m)})}return u}(),f=n.buildQueryString=function(){function u(v){return Object.keys(v).map(function(l){return encodeURIComponent(l)+"="+encodeURIComponent(v[l])}).join("&")}return u}()},69214:function(y,n){"use strict";n.__esModule=!0,n.throttle=n.sleep=n.debounce=void 0;/** + */var o=e.multiline=function(){function i(d){if(Array.isArray(d))return i(d.join(""));for(var c=d.split("\n"),g,v=t(c),h;!(h=v()).done;)for(var m=h.value,b=0;b
/gi,"\n").replace(/<\/?[a-z0-9-_]+[^>]*>/gi,"").replace(c,function(v,h){return g[h]}).replace(/&#?([0-9]+);/gi,function(v,h){var m=parseInt(h,10);return String.fromCharCode(m)}).replace(/&#x?([0-9a-f]+);/gi,function(v,h){var m=parseInt(h,16);return String.fromCharCode(m)})}return i}(),f=e.buildQueryString=function(){function i(d){return Object.keys(d).map(function(c){return encodeURIComponent(c)+"="+encodeURIComponent(d[c])}).join("&")}return i}()},69214:function(y,e){"use strict";e.__esModule=!0,e.throttle=e.sleep=e.debounce=void 0;/** * @file * @copyright 2020 Aleksej Komarov * @license MIT - */var t=n.debounce=function(){function o(a,s,i){i===void 0&&(i=!1);var c;return function(){for(var p=arguments.length,f=new Array(p),u=0;u
\n'+$+"
\n\n