From d287835d1427a4a9b7a9f448676d046e5d51318d Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 18 Jan 2020 21:29:27 -0800 Subject: [PATCH 001/118] Made quirk blacklisting antag-sided --- code/datums/traits/_quirk.dm | 1 + code/datums/traits/negative.dm | 13 +++---------- code/modules/antagonists/_common/antag_datum.dm | 10 ++++++++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index 12e34b0c90..d73fa3c825 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -8,6 +8,7 @@ var/gain_text var/lose_text var/medical_record_text //This text will appear on medical records for the trait. Not yet implemented + var/antag_removal_text // Text will be given to the quirk holder if they get an antag that has it blacklisted. var/mood_quirk = FALSE //if true, this quirk affects mood and is unavailable if moodlets are disabled var/mob_trait //if applicable, apply and remove this mob trait var/mob/living/quirk_holder diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index c5217d8e4b..d556d02ebb 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -6,6 +6,7 @@ value = -2 gain_text = "You feel your vigor slowly fading away." lose_text = "You feel vigorous again." + antag_removal_text = "Your antagonistic nature has removed your blood deficiency." medical_record_text = "Patient requires regular treatment for blood loss due to low production of blood." /datum/quirk/blooddeficiency/on_process() @@ -188,11 +189,7 @@ gain_text = "You feel repulsed by the thought of violence!" lose_text = "You think you can defend yourself again." medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm." - -/datum/quirk/nonviolent/on_process() - if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums)) - to_chat(quirk_holder, "Your antagonistic nature has caused you to renounce your pacifism.") - qdel(src) + antag_removal_text = "Your antagonistic nature has caused you to renounce your pacifism." /datum/quirk/paraplegic name = "Paraplegic" @@ -355,6 +352,7 @@ gain_text = "You find yourself unable to speak!" lose_text = "You feel a growing strength in your vocal chords." medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity." + antag_removal_text = "Your antagonistic nature has caused your voice to be heard." var/datum/brain_trauma/severe/mute/mute /datum/quirk/mute/add() @@ -366,11 +364,6 @@ var/mob/living/carbon/human/H = quirk_holder H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE) -/datum/quirk/mute/on_process() - if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums)) - to_chat(quirk_holder, "Your antagonistic nature has caused your voice to be heard.") - qdel(src) - /datum/quirk/unstable name = "Unstable" desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!" diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 1894d8c7ae..064ae9043e 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -20,6 +20,7 @@ GLOBAL_LIST_EMPTY(antagonists) var/show_in_antagpanel = TRUE //This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type + var/list/quirk_blacklist = list("Pacifist","Mute") // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. /datum/antagonist/New() GLOB.antagonists += src @@ -70,6 +71,7 @@ GLOBAL_LIST_EMPTY(antagonists) greet() apply_innate_effects() give_antag_moodies() + remove_blacklisted_quirks() if(is_banned(owner.current) && replace_banned) replace_banned_player() @@ -117,6 +119,14 @@ GLOBAL_LIST_EMPTY(antagonists) return SEND_SIGNAL(owner.current, COMSIG_CLEAR_MOOD_EVENT, "antag_moodlet") +/datum/antagonist/proc/remove_blacklisted_quirks() + for(var/q in owner.roundstart_quirks) + var/datum/quirk/Q = q + if(Q.name in quirk_blacklist) + if(Q.antag_removal_text) + to_chat(owner, "[Q.antag_removal_text]") + owner.remove_quirk(Q.type) + //Returns the team antagonist belongs to if any. /datum/antagonist/proc/get_team() return From e1cf63e0ac1663ffb3079581f2d3bc1491fe02f5 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 18 Jan 2020 21:32:42 -0800 Subject: [PATCH 002/118] Greentext tweaked --- code/game/gamemodes/objective.dm | 7 ++++--- code/modules/admin/antag_panel.dm | 4 ++-- code/modules/antagonists/_common/antag_datum.dm | 2 +- code/modules/antagonists/_common/antag_team.dm | 11 +++++++---- code/modules/antagonists/brother/brother.dm | 13 ++++++++----- code/modules/antagonists/changeling/changeling.dm | 11 +++++++---- code/modules/antagonists/traitor/datum_traitor.dm | 11 +++++++---- code/modules/antagonists/valentines/valentine.dm | 2 +- code/modules/antagonists/wizard/wizard.dm | 2 +- 9 files changed, 38 insertions(+), 25 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index f99fe5c3e4..4c82046e07 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -9,9 +9,10 @@ GLOBAL_LIST_EMPTY(objectives) var/explanation_text = "Nothing" //What that person is supposed to do. var/team_explanation_text //For when there are multiple owners. var/datum/mind/target = null //If they are focused on a particular person. - var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter. - var/completed = 0 //currently only used for custom objectives. - var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. + var/target_amount = FALSE //If they are focused on a particular number. Steal objectives have their own counter. + var/completed = FALSE //currently only used for custom objectives. + var/completable = TRUE //Whether this objective shows greentext when completed + var/martyr_compatible = FALSE //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. /datum/objective/New(var/text) GLOB.objectives += src // CITADEL EDIT FOR CRYOPODS diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index 1672310567..ffb086a18d 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -47,7 +47,7 @@ GLOBAL_VAR(antag_prototypes) else var/obj_count = 1 for(var/datum/objective/objective in objectives) - result += "[obj_count]: [objective.explanation_text] Edit Delete [objective.completed ? "Mark as incomplete" : "Mark as complete"]
" + result += "[obj_count]: [objective.explanation_text] Edit Delete [objective.completed ? "Mark as incomplete" : "Mark as complete"]
" obj_count++ result += "Add objective
" result += "Announce objectives
" @@ -214,4 +214,4 @@ GLOBAL_VAR(antag_prototypes) var/datum/browser/panel = new(usr, "traitorpanel", "", 600, 600) panel.set_content(out) panel.open() - return \ No newline at end of file + return diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 064ae9043e..4587a3c8ab 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(antagonists) if(objectives.len) report += printobjectives(objectives) for(var/datum/objective/objective in objectives) - if(!objective.check_completion()) + if(objective.completable && !objective.check_completion()) objectives_complete = FALSE break diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index 486b5b0414..b376287f7a 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -36,11 +36,14 @@ var/win = TRUE var/objective_count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - report += "Objective #[objective_count]: [objective.explanation_text] Success!" + if(objective.completable) + if(objective.check_completion()) + report += "Objective #[objective_count]: [objective.explanation_text] Success!" + else + report += "Objective #[objective_count]: [objective.explanation_text] Fail." + win = FALSE else - report += "Objective #[objective_count]: [objective.explanation_text] Fail." - win = FALSE + report += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ if(win) report += "The [name] was successful!" diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 7c589bb3ab..1388ba745c 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -108,13 +108,16 @@ var/win = TRUE var/objective_count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - parts += "Objective #[objective_count]: [objective.explanation_text] Success!" + if(objective.completable) + if(objective.check_completion()) + report += "Objective #[objective_count]: [objective.explanation_text] Success!" + else + report += "Objective #[objective_count]: [objective.explanation_text] Fail." + win = FALSE else - parts += "Objective #[objective_count]: [objective.explanation_text] Fail." - win = FALSE + report += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ - if(win) +if(win) parts += "The blood brothers were successful!" else parts += "The blood brothers have failed!" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 0d68660d9d..e76c0ed054 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -552,11 +552,14 @@ if(objectives.len) var/count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - parts += "Objective #[count]: [objective.explanation_text] Success!" + if(objective.completable) + if(objective.check_completion()) + report += "Objective #[count]: [objective.explanation_text] Success!" + else + report += "Objective #[count]: [objective.explanation_text] Fail." + win = FALSE else - parts += "Objective #[count]: [objective.explanation_text] Fail." - changelingwin = 0 + report += "Objective #[count]: [objective.explanation_text]" count++ if(changelingwin) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 595ce5bb90..25fe24b605 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -369,11 +369,14 @@ if(objectives.len)//If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - objectives_text += "
Objective #[count]: [objective.explanation_text] Success!" + if(objective.completable) + if(objective.check_completion()) + report += "Objective #[count]: [objective.explanation_text] Success!" + else + report += "Objective #[count]: [objective.explanation_text] Fail." + traitorwin = FALSE else - objectives_text += "
Objective #[count]: [objective.explanation_text] Fail." - traitorwin = FALSE + report += "Objective #[count]: [objective.explanation_text]" count++ if(uplink_true) diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 19c08f3076..d3bcdf0c04 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -35,7 +35,7 @@ var/objectives_complete = TRUE if(objectives.len) for(var/datum/objective/objective in objectives) - if(!objective.check_completion()) + if(objective.completable && !objective.check_completion()) objectives_complete = FALSE break diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index a88eb1e42a..d89d6a2744 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -62,7 +62,7 @@ /datum/antagonist/wizard/proc/create_objectives() var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.") - new_objective.completed = TRUE //So they can greentext without admin intervention. + new_objective.completable = FALSE new_objective.owner = owner objectives += new_objective From 5eba760aa8b37d600ef7445127d3ca43af1efe73 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 18 Jan 2020 22:07:54 -0800 Subject: [PATCH 003/118] Reworked survivalist --- code/game/gamemodes/objective.dm | 61 +++++++++---------- .../antagonists/survivalist/survivalist.dm | 7 ++- .../spells/spell_types/rightandwrong.dm | 13 ++++ 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 4c82046e07..bb18b89678 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -787,40 +787,10 @@ GLOBAL_LIST_EMPTY(possible_items_special) /datum/objective/destroy/internal var/stolen = FALSE //Have we already eliminated this target? -/datum/objective/steal_five_of_type - name = "steal five of" - explanation_text = "Steal at least five items!" - var/list/wanted_items = list(/obj/item) - -/datum/objective/steal_five_of_type/New() - ..() - wanted_items = typecacheof(wanted_items) - -/datum/objective/steal_five_of_type/summon_guns - name = "steal guns" - explanation_text = "Steal at least five guns!" - wanted_items = list(/obj/item/gun) - -/datum/objective/steal_five_of_type/summon_magic - name = "steal magic" - explanation_text = "Steal at least five magical artefacts!" - wanted_items = list(/obj/item/spellbook, /obj/item/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/scrying, /obj/item/antag_spawner/contract, /obj/item/necromantic_stone) - -/datum/objective/steal_five_of_type/check_completion() - var/list/datum/mind/owners = get_owners() - var/stolen_count = 0 - for(var/datum/mind/M in owners) - if(!isliving(M.current)) - continue - var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. - for(var/obj/I in all_items) //Check for wanted items - if(is_type_in_typecache(I, wanted_items)) - stolen_count++ - return stolen_count >= 5 - //Created by admin tools /datum/objective/custom name = "custom" + completable = FALSE /datum/objective/custom/admin_edit(mob/admin) var/expl = stripped_input(admin, "Custom objective:", "Objective", explanation_text) @@ -998,4 +968,33 @@ GLOBAL_LIST_EMPTY(possible_items_special) command_staff_only = TRUE +/datum/objective/horde + name = "horde" + var/obj/item/horded_item = null +/datum/objective/horde/get_target() + return horded_item + +/datum/objective/horde/proc/set_target(obj/item/I) + if(item) + horded_item = I + explanation_text = "Keep [I] on your person at all costs." + return horded_item + else + explanation_text = "Free objective" + return + +/datum/objective/horde/check_completion() + var/list/datum/mind/owners = get_owners() + if(!horded_item) + return TRUE + for(var/datum/mind/M in owners) + if(!isliving(M.current)) + continue + + var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. + + for(var/obj/I in all_items) //Check for items + if(I == horded_item) + return TRUE + return FALSE diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm index 4e0184b7b6..5334bb0f41 100644 --- a/code/modules/antagonists/survivalist/survivalist.dm +++ b/code/modules/antagonists/survivalist/survivalist.dm @@ -2,6 +2,7 @@ name = "Survivalist" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE + blacklisted_quirks = list("Pacifist") // mutes are allowed var/greet_message = "" /datum/antagonist/survivalist/proc/forge_objectives() @@ -19,7 +20,7 @@ owner.announce_objectives() /datum/antagonist/survivalist/guns - greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way." + greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, and don't let anyone take them!" /datum/antagonist/survivalist/guns/forge_objectives() var/datum/objective/steal_five_of_type/summon_guns/guns = new @@ -29,10 +30,10 @@ /datum/antagonist/survivalist/magic name = "Amateur Magician" - greet_message = "Grow your newfound talent! Grab as many magical artefacts as possible, by any means necessary. Kill anyone who gets in your way." + greet_message = "This magic stuff is... so powerful. You want more. More! They want your power. They can't have it! Don't let them have it!" /datum/antagonist/survivalist/magic/forge_objectives() var/datum/objective/steal_five_of_type/summon_magic/magic = new magic.owner = owner objectives += magic - ..() \ No newline at end of file + ..() diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index e5e856c630..b73929fc44 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -102,6 +102,12 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/gun_type = pick(GLOB.summoned_guns) var/obj/item/gun/G = new gun_type(get_turf(H)) G.unlock() + var/datum/antagonist/survalist/guns/our_antag_datum = has_antag_datum(/datum/antagonist/survivalist/guns) + if(our_antag_datum) + var/datum/objective/horde_item/O = new() + O.owner = H + O.set_target(G) + our_antag_datum.objectives += O playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, 1) var/in_hand = H.put_in_hands(G) // not always successful @@ -128,6 +134,13 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/obj/item/M = new magic_type(get_turf(H)) playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1) + var/datum/antagonist/survalist/magic/our_antag_datum = has_antag_datum(/datum/antagonist/survivalist/magic) + if(our_antag_datum) + var/datum/objective/horde_item/O = new() + O.owner = H + O.set_target(M) + our_antag_datum.objectives += O + var/in_hand = H.put_in_hands(M) to_chat(H, "\A [M] appears [in_hand ? "in your hand" : "at your feet"]!") From 06c66617e6c6cebfd58ad1c9f5638b2a44cf25c4 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 19 Jan 2020 18:58:10 -0800 Subject: [PATCH 004/118] m o r e traitor objectives --- code/__HELPERS/roundend.dm | 6 +- code/controllers/subsystem/ticker.dm | 2 + code/datums/traits/negative.dm | 3 + code/game/gamemodes/objective.dm | 88 ++++++++++++++- code/game/gamemodes/objective_sabotage.dm | 106 ++++++++++++++++++ code/modules/admin/antag_panel.dm | 2 +- .../antagonists/traitor/datum_traitor.dm | 28 +++-- 7 files changed, 223 insertions(+), 12 deletions(-) create mode 100644 code/game/gamemodes/objective_sabotage.dm diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 49825bcb50..5102eb4802 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -3,6 +3,9 @@ #define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only. /datum/controller/subsystem/ticker/proc/gather_roundend_feedback() + var/datum/station_state/end_state = new /datum/station_state() + end_state.count() + station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) gather_antag_data() record_nuke_disk_location() var/json_file = file("[GLOB.log_directory]/round_end_data.json") @@ -71,9 +74,6 @@ mob_data += list("name" = m.name, "typepath" = m.type) var/pos = length(file_data["[escaped]"]["[category]"]) + 1 file_data["[escaped]"]["[category]"]["[pos]"] = mob_data - var/datum/station_state/end_state = new /datum/station_state() - end_state.count() - var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) file_data["additional data"]["station integrity"] = station_integrity WRITE_FILE(json_file, json_encode(file_data)) SSblackbox.record_feedback("nested tally", "round_end_stats", num_survivors, list("survivors", "total")) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c9562bcfd1..ceb003210e 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -68,6 +68,8 @@ SUBSYSTEM_DEF(ticker) var/modevoted = FALSE //Have we sent a vote for the gamemode? + var/station_integrity = 100 // stored at roundend for use in some antag goals + /datum/controller/subsystem/ticker/Initialize(timeofday) load_mode() diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index d556d02ebb..f1d394ee2e 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -39,6 +39,8 @@ var/obj/item/heirloom var/where +GLOBAL_LIST_EMPTY(family_heirlooms) + /datum/quirk/family_heirloom/on_spawn() var/mob/living/carbon/human/H = quirk_holder var/obj/item/heirloom_type @@ -77,6 +79,7 @@ /obj/item/lighter, /obj/item/dice/d20) heirloom = new heirloom_type(get_turf(quirk_holder)) + GLOB.family_heirlooms += heirloom var/list/slots = list( "in your left pocket" = SLOT_L_STORE, "in your right pocket" = SLOT_R_STORE, diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index bb18b89678..4b7eebb5b9 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -366,6 +366,28 @@ GLOBAL_LIST_EMPTY(objectives) return FALSE return TRUE +/datum/objective/breakout + name = "breakout" + martyr_compatible = 1 + var/target_role_type = 0 + var/human_check = TRUE + +/datum/objective/breakout/check_completion() + return !target || considered_escaped(target, enforce_human = human_check) + +/datum/objective/breakout/find_target_by_role(role, role_type=0, invert=0) + if(!invert) + target_role_type = role_type + ..() + return target + +/datum/objective/breakout/update_explanation_text() + ..() + if(target && target.current) + explanation_text = "Make sure [target.name], the [!target_role_type ? target.assigned_role : target.special_role] escapes on the shuttle or an escape pod alive and without being in custody." + else + explanation_text = "Free Objective" + /datum/objective/escape/escape_with_identity name = "escape with identity" var/target_real_name // Has to be stored because the target's real_name can change over the course of the round @@ -583,7 +605,6 @@ GLOBAL_LIST_EMPTY(possible_items_special) explanation_text = "Do not give up or lose [targetinfo.name]." steal_target = targetinfo.targetitem - /datum/objective/download name = "download" @@ -998,3 +1019,68 @@ GLOBAL_LIST_EMPTY(possible_items_special) if(I == horded_item) return TRUE return FALSE + +/datum/objective/horde/heirloom + name = "steal heirloom" + +/datum/objective/horde/heirloom/proc/find_target() + set_target(pick(GLOB.family_heirlooms)) + +GLOBAL_LIST_EMPTY(possible_sabotages) +// For saboteurs. Go in and cause some trouble somewhere. Not necessarily breaking things, just sufficiently troublemaking. +/datum/objective/sabotage + name = "sabotage" + var/datum/sabotage_objective/targetinfo = null //composition > inheritance. + +/datum/objective/sabotage/get_target() + return targetinfo.sabotage_type + +/datum/objective/sabotage/New() + ..() + if(!GLOB.possible_sabotages.len)//Only need to fill the list when it's needed. + for(var/I in subtypesof(/datum/sabotage_objective)) + new I + +/datum/objective/sabotage/find_target() + var/list/datum/mind/owners = get_owners() + var/approved_targets = list() + check_sabotages: + for(var/datum/sabotage_objective/possible_sabotage in GLOB.possible_sabotages) + if(!is_unique_objective(possible_sabotage.sabotage_type) || possible_sabotage.check_conditions()) + continue + for(var/datum/mind/M in owners) + if(M.current.mind.assigned_role in possible_sabotage.excludefromjob) + continue check_sabotages + approved_targets += possible_sabotage + return set_target(safepick(approved_targets)) + +/datum/objective/sabotage/proc/set_target(datum/sabotage_objective/sabo) + if(sabo) + targetinfo = sabo + explanation_text = "[targetinfo.name]" + give_special_equipment(targetinfo.special_equipment) + return sabo + else + explanation_text = "Free objective" + return + +/datum/objective/sabotage/check_completion() + return targetinfo.check_conditions() + +/datum/objective/flavor + name = "Flavor" + completable = FALSE + +/datum/objective/flavor/proc/forge_objective() + +/datum/objective/flavor/traitor/forge_objective() + explanation_text = pickweight( + "Teach the heads of staff a lesson they will never forget." = 1, + "Show Nanotrasen the utility of a pure oxygen atmosphere." = 2, + "The Donk Corporation has hired you with the task to maim the crew in whatever way you can. Strain the resources of medical staff, and create a hostile working enviroment for human resources." = 3, + "The Waffle Corporation has given you the task to create the biggest prank the station's security force has seen! Harass security, and don't stop while you can still honk!" = 4, + "Kill one of the station's beloved pets. Make a show of it." = 3, + "Get illegal technology spread through the station." = 3, + "Slow down the process of research as much as possible." = (owner.assigned_role in list("Research Director", "Scientist", "Roboticist") ? 6 : 0), + "Channel your inner rat. Cut wires throughout the station" = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), + ) diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm new file mode 100644 index 0000000000..0ede317626 --- /dev/null +++ b/code/game/gamemodes/objective_sabotage.dm @@ -0,0 +1,106 @@ +/datum/sabotage_objective + var/name = "Free Objective" + var/sabotage_type = "nothing" + var/special_equipment = list() + var/list/excludefromjob = list() + +/datum/sabotage_objective/New() + ..() + if(sabotage_type!="nothing") + GLOB.possible_sabotages += src + +/datum/sabotage_objective/proc/check_conditions() + return TRUE + +/datum/sabotage_objective/processing + var/won = FALSE + +/datum/sabotage_objective/processing/New() + ..() + START_PROCESSING(SSprocessing, src) + +/datum/sabotage_objective/processing/proc/check_condition_processing() + return TRUE + +/datum/sabotage_objective/processing/process() + won = check_condition_processing() + if(won) + STOP_PROCESSING(SSprocessing,src) + +/datum/sabotage_objective/processing/power_sink + name = "Drain at least 1 gigajoule of power using a power sink." + sabotage_type = "powersink" + special_equipment = list(/obj/item/powersink) + var/sink_found = FALSE + var/count = 0 + +/datum/sabotage_objective/processing/power_sink/check_condition_processing() + count += 1 + if(count==10 || sink_found) // doesn't need to fire that often unless a sink exists + var/sink_found_this_time = FALSE + for(var/datum/powernet/PN in GLOB.powernets) + for(var/obj/item/powersink/sink in PN.nodes) + sink_found_this_time = TRUE + if(sink.power_drained>1e9) + return TRUE + sink_found = sink_found_this_time + count = 0 + return FALSE + +/obj/item/paper/guides/antag/supermatter_sabotage + info = "Ways to sabotage a supermatter:
\ +
    \ +
  • Set the air alarm's operating mode to anything that isn't 'draught' (yes, anything, though 'off' works best). Or just smash the air alarm, that works too.
    • \ +
  • Wrench a pipe (the junction to the cold loop is most effective, but some setups will robust through this no issue; best to try for multiple)
    • \ +
  • Pump in as much carbon dioxide, oxygen, plasma or tritium as you can find (this will likely also cause a singularity or tesla delamination, so watch out!)
    • \ +
  • Unset the filters on the cooling loop, or, perhaps more insidious, set them to oxygen/plasma.
    • \ +
  • Deactivate the digital valve that sends the exhaust gases to space (note: only works on box station; others you must unwrench).
    • \ +
  • There are many other ways; be creative!
    • \ +
" + +/datum/sabotage_objective/processing/supermatter + name = "Sabotage the supermatter so that it goes under 50% integrity." + sabotage_type = "supermatter" + special_equipment = list(/obj/item/paper/guides/antag/supermatter_sabotage) + var/list/supermatters = list() + excludefromjob = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") + +/datum/sabotage_objective/processing/supermatter/check_condition_processing() + if(!supermatters.len) + supermatters = list() + for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines) + // Delaminating, not within coverage, not on a tile. + if (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z))) + continue + supermatters.Add(S) + for(var/obj/machinery/power/supermatter_crystal/S in supermatters) + if(S.get_integrity() < 50) + return TRUE + return FALSE + +/datum/sabotage_objective/station_integrity + name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal." + sabotage_type = "integrity" + +/datum/sabotage_objective/station_integrity/check_conditions() + return SSticker.station_integrity < 80 + +/datum/sabotage_objective/cloner + name = "Destroy all Nanotrasen cloning machines." + sabotage_type = "cloner" + +/datum/sabotage_objective/cloner/check_conditions() + return !(locate(/obj/machinery/clonepod) in GLOB.machines) + +/datum/sabotage_objective/ai_law + name = "Upload a hacked law to the AI." + sabotage_type = "ailaw" + special_equipment = list(/obj/item/aiModule/syndicate) + excludefromjob = list("Chief Engineer","Research Director","Head of Personnel","Captain","Chief Medical Officer","Head Of Security") + +/datum/sabotage_objective/ai_law/check_conditions() + for (var/i in GLOB.ai_list) + var/mob/living/silicon/ai/aiPlayer = i + if(aiPlayer.mind && length(aiPlayer.laws.hacked)) + return TRUE + return FALSE diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index ffb086a18d..19e53b09b4 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -47,7 +47,7 @@ GLOBAL_VAR(antag_prototypes) else var/obj_count = 1 for(var/datum/objective/objective in objectives) - result += "[obj_count]: [objective.explanation_text] Edit Delete [objective.completed ? "Mark as incomplete" : "Mark as complete"]
" + result += "[obj_count]: [objective.explanation_text] Edit Delete [objective.completed ? "Mark as incomplete" : "Mark as complete"]
" obj_count++ result += "Add objective
" result += "Announce objectives
" diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 25fe24b605..62fdf56b71 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -77,19 +77,23 @@ var/is_hijacker = FALSE var/datum/game_mode/dynamic/mode var/is_dynamic = FALSE + var/hijack_prob = 0 if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode is_dynamic = TRUE - if(mode.storyteller.flags & NO_ASSASSIN) - is_hijacker = FALSE + if(mode.threat >= CONFIG_GET(number/dynamic_hijack_cost)) + hijack_prob = CLAMP(mode.threat_level-50,0,20) if(GLOB.joined_player_list.len>=GLOB.dynamic_high_pop_limit) - is_hijacker = (prob(10) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement)) + is_hijacker = (prob(hijack_prob) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement)) else var/indice_pop = min(10,round(GLOB.joined_player_list.len/mode.pop_per_requirement)+1) - is_hijacker = (prob(10) && (mode.threat_level >= CONFIG_GET(number_list/dynamic_hijack_requirements)[indice_pop])) + is_hijacker = (prob(hijack_prob) && (mode.threat_level >= CONFIG_GET(number_list/dynamic_hijack_requirements)[indice_pop])) + if(mode.storyteller.flags & NO_ASSASSIN) + is_hijacker = FALSE else if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks + hijack_prob = 10 is_hijacker = prob(10) - var/martyr_chance = prob(20) + var/martyr_chance = prob(hijack_prob*2) var/objective_count = is_hijacker //Hijacking counts towards number of objectives if(!SSticker.mode.exchange_blue && SSticker.mode.traitors.len >= 8) //Set up an exchange if there are enough traitors if(!SSticker.mode.exchange_red) @@ -170,7 +174,7 @@ if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode is_dynamic = TRUE - assassin_prob = mode.threat_level*(2/3) + assassin_prob = max(0,mode.threat_level-20) if(prob(assassin_prob)) if(is_dynamic) var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost) @@ -198,11 +202,21 @@ download_objective.owner = owner download_objective.gen_amount_goal() add_objective(download_objective) - else + else if(prob(40)) var/datum/objective/steal/steal_objective = new steal_objective.owner = owner steal_objective.find_target() add_objective(steal_objective) + else if(prob(40)) + var/datum/objective/sabotage/sabotage_objective = new + sabotage_objective.owner = owner + sabotage_objective.find_target() + add_objective(sabotage_objective) + else + var/datum/objective/flavor/traitor/flavor_objective = new + flavor_objective.owner = owner + flavor_objective.forge_objective() + add_objective(flavor_objective) /datum/antagonist/traitor/proc/forge_single_AI_objective() .=1 From 8e674817a9995beebaccf192b6464e7c8d07ecf8 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 20 Jan 2020 00:30:18 -0800 Subject: [PATCH 005/118] errors --- code/game/gamemodes/objective.dm | 4 ++-- code/modules/antagonists/_common/antag_datum.dm | 16 +++++++++------- code/modules/antagonists/brother/brother.dm | 8 ++++---- .../modules/antagonists/changeling/changeling.dm | 8 ++++---- .../antagonists/survivalist/survivalist.dm | 12 ------------ .../modules/antagonists/traitor/datum_traitor.dm | 6 +++--- code/modules/spells/spell_types/rightandwrong.dm | 10 +++++----- tgstation.dme | 1 + 8 files changed, 28 insertions(+), 37 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 4b7eebb5b9..ff5649f5fd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -997,7 +997,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) return horded_item /datum/objective/horde/proc/set_target(obj/item/I) - if(item) + if(I) horded_item = I explanation_text = "Keep [I] on your person at all costs." return horded_item @@ -1023,7 +1023,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) /datum/objective/horde/heirloom name = "steal heirloom" -/datum/objective/horde/heirloom/proc/find_target() +/datum/objective/horde/heirloom/find_target() set_target(pick(GLOB.family_heirlooms)) GLOBAL_LIST_EMPTY(possible_sabotages) diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 4587a3c8ab..eafe4f4ec7 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(antagonists) var/show_in_antagpanel = TRUE //This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type - var/list/quirk_blacklist = list("Pacifist","Mute") // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. + var/list/blacklisted_quirks = list("Pacifist","Mute") // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. /datum/antagonist/New() GLOB.antagonists += src @@ -120,12 +120,14 @@ GLOBAL_LIST_EMPTY(antagonists) SEND_SIGNAL(owner.current, COMSIG_CLEAR_MOOD_EVENT, "antag_moodlet") /datum/antagonist/proc/remove_blacklisted_quirks() - for(var/q in owner.roundstart_quirks) - var/datum/quirk/Q = q - if(Q.name in quirk_blacklist) - if(Q.antag_removal_text) - to_chat(owner, "[Q.antag_removal_text]") - owner.remove_quirk(Q.type) + var/mob/living/L = owner + if(istype(L)) + for(var/q in L.roundstart_quirks) + var/datum/quirk/Q = q + if(Q.name in blacklisted_quirks) + if(Q.antag_removal_text) + to_chat(L, "[Q.antag_removal_text]") + L.remove_quirk(Q.type) //Returns the team antagonist belongs to if any. /datum/antagonist/proc/get_team() diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 1388ba745c..22a343fb5f 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -110,14 +110,14 @@ for(var/datum/objective/objective in objectives) if(objective.completable) if(objective.check_completion()) - report += "Objective #[objective_count]: [objective.explanation_text] Success!" + parts += "Objective #[objective_count]: [objective.explanation_text] Success!" else - report += "Objective #[objective_count]: [objective.explanation_text] Fail." + parts += "Objective #[objective_count]: [objective.explanation_text] Fail." win = FALSE else - report += "Objective #[objective_count]: [objective.explanation_text]" + parts += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ -if(win) + if(win) parts += "The blood brothers were successful!" else parts += "The blood brothers have failed!" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index e76c0ed054..7d702ac25d 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -554,12 +554,12 @@ for(var/datum/objective/objective in objectives) if(objective.completable) if(objective.check_completion()) - report += "Objective #[count]: [objective.explanation_text] Success!" + parts += "Objective #[count]: [objective.explanation_text] Success!" else - report += "Objective #[count]: [objective.explanation_text] Fail." - win = FALSE + parts += "Objective #[count]: [objective.explanation_text] Fail." + changelingwin = FALSE else - report += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(changelingwin) diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm index 5334bb0f41..1b870ec389 100644 --- a/code/modules/antagonists/survivalist/survivalist.dm +++ b/code/modules/antagonists/survivalist/survivalist.dm @@ -22,18 +22,6 @@ /datum/antagonist/survivalist/guns greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, and don't let anyone take them!" -/datum/antagonist/survivalist/guns/forge_objectives() - var/datum/objective/steal_five_of_type/summon_guns/guns = new - guns.owner = owner - objectives += guns - ..() - /datum/antagonist/survivalist/magic name = "Amateur Magician" greet_message = "This magic stuff is... so powerful. You want more. More! They want your power. They can't have it! Don't let them have it!" - -/datum/antagonist/survivalist/magic/forge_objectives() - var/datum/objective/steal_five_of_type/summon_magic/magic = new - magic.owner = owner - objectives += magic - ..() diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 62fdf56b71..3385991116 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -385,12 +385,12 @@ for(var/datum/objective/objective in objectives) if(objective.completable) if(objective.check_completion()) - report += "Objective #[count]: [objective.explanation_text] Success!" + objectives_text += "Objective #[count]: [objective.explanation_text] Success!" else - report += "Objective #[count]: [objective.explanation_text] Fail." + objectives_text += "Objective #[count]: [objective.explanation_text] Fail." traitorwin = FALSE else - report += "Objective #[count]: [objective.explanation_text]" + objectives_text += "Objective #[count]: [objective.explanation_text]" count++ if(uplink_true) diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index b73929fc44..996e2e3168 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -102,9 +102,9 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/gun_type = pick(GLOB.summoned_guns) var/obj/item/gun/G = new gun_type(get_turf(H)) G.unlock() - var/datum/antagonist/survalist/guns/our_antag_datum = has_antag_datum(/datum/antagonist/survivalist/guns) + var/datum/antagonist/survivalist/guns/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/guns) if(our_antag_datum) - var/datum/objective/horde_item/O = new() + var/datum/objective/horde/O = new() O.owner = H O.set_target(G) our_antag_datum.objectives += O @@ -134,9 +134,9 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/obj/item/M = new magic_type(get_turf(H)) playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1) - var/datum/antagonist/survalist/magic/our_antag_datum = has_antag_datum(/datum/antagonist/survivalist/magic) - if(our_antag_datum) - var/datum/objective/horde_item/O = new() + var/datum/antagonist/survivalist/magic/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/magic) + if(istype(our_antag_datum)) + var/datum/objective/horde/O = new() O.owner = H O.set_target(M) our_antag_datum.objectives += O diff --git a/tgstation.dme b/tgstation.dme index 1c7d5112e7..1e881df6a7 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -567,6 +567,7 @@ #include "code\game\gamemodes\game_mode.dm" #include "code\game\gamemodes\objective.dm" #include "code\game\gamemodes\objective_items.dm" +#include "code\game\gamemodes\objective_sabotage.dm" #include "code\game\gamemodes\bloodsucker\bloodsucker.dm" #include "code\game\gamemodes\bloodsucker\hunter.dm" #include "code\game\gamemodes\brother\traitor_bro.dm" From 67c2fdca52151b9d9407612efaed9aea2ff1a427 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 20 Jan 2020 01:20:42 -0800 Subject: [PATCH 006/118] more flavor objectives --- code/game/gamemodes/objective.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ff5649f5fd..cbee7a79ef 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1077,10 +1077,11 @@ GLOBAL_LIST_EMPTY(possible_sabotages) explanation_text = pickweight( "Teach the heads of staff a lesson they will never forget." = 1, "Show Nanotrasen the utility of a pure oxygen atmosphere." = 2, - "The Donk Corporation has hired you with the task to maim the crew in whatever way you can. Strain the resources of medical staff, and create a hostile working enviroment for human resources." = 3, - "The Waffle Corporation has given you the task to create the biggest prank the station's security force has seen! Harass security, and don't stop while you can still honk!" = 4, - "Kill one of the station's beloved pets. Make a show of it." = 3, + "Waffle Co. wants you! That’s right, YOU! To cause as much humerous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!" = 2, + "Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself." = 3, "Get illegal technology spread through the station." = 3, "Slow down the process of research as much as possible." = (owner.assigned_role in list("Research Director", "Scientist", "Roboticist") ? 6 : 0), - "Channel your inner rat. Cut wires throughout the station" = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), + "Channel your inner rat. Cut wires throughout the station." = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), + "The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction." = 2, + "Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it." = 2 ) From dfaa3bf15cc96df4f8343a5002d34ab810c1ed9c Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 20 Jan 2020 03:46:44 -0800 Subject: [PATCH 007/118] Added another flavor obj, "horde" to "hoard" --- code/game/gamemodes/objective.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index cbee7a79ef..bd8baf17db 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1077,11 +1077,12 @@ GLOBAL_LIST_EMPTY(possible_sabotages) explanation_text = pickweight( "Teach the heads of staff a lesson they will never forget." = 1, "Show Nanotrasen the utility of a pure oxygen atmosphere." = 2, - "Waffle Co. wants you! That’s right, YOU! To cause as much humerous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!" = 2, + "Waffle Co. wants you! That’s right, YOU! To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!" = 1, "Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself." = 3, "Get illegal technology spread through the station." = 3, "Slow down the process of research as much as possible." = (owner.assigned_role in list("Research Director", "Scientist", "Roboticist") ? 6 : 0), "Channel your inner rat. Cut wires throughout the station." = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), "The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction." = 2, - "Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it." = 2 + "Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it." = 1, + "Steal as many shoes as possible. Lay broken glass everywhere." = 2 ) From 815b4f033dff14be2a60c67e05641f65cdc1bca6 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 20 Jan 2020 04:13:54 -0800 Subject: [PATCH 008/118] made flavor things a game option + more hoard --- .../configuration/entries/game_options.dm | 6 +++ code/datums/mind.dm | 3 +- code/game/gamemodes/objective.dm | 48 +++++++++---------- .../antagonists/traitor/datum_traitor.dm | 1 - .../spells/spell_types/rightandwrong.dm | 4 +- config/game_options.txt | 11 +++++ 6 files changed, 43 insertions(+), 30 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index aeca31ebd2..cf5e0f7db1 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -408,3 +408,9 @@ /datum/config_entry/number/dropped_modes config_entry_value = 3 + +/datum/config_entry/keyed_list/flavor_objective_traitor + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_NUM + splitter = "=" + lowercase = FALSE diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 464ea37d02..c25f5d5199 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -471,7 +471,8 @@ /datum/objective/nuclear, /datum/objective/capture, /datum/objective/absorb, - /datum/objective/custom + /datum/objective/custom, + /datum/objective/flavor/traitor ) for(var/T in allowed_types) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index bd8baf17db..5b3e6a1164 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -989,25 +989,25 @@ GLOBAL_LIST_EMPTY(possible_items_special) command_staff_only = TRUE -/datum/objective/horde - name = "horde" - var/obj/item/horded_item = null +/datum/objective/hoard + name = "hoard" + var/obj/item/hoarded_item = null -/datum/objective/horde/get_target() - return horded_item +/datum/objective/hoard/get_target() + return hoarded_item -/datum/objective/horde/proc/set_target(obj/item/I) +/datum/objective/hoard/proc/set_target(obj/item/I) if(I) - horded_item = I + hoarded_item = I explanation_text = "Keep [I] on your person at all costs." - return horded_item + return hoarded_item else explanation_text = "Free objective" return -/datum/objective/horde/check_completion() +/datum/objective/hoard/check_completion() var/list/datum/mind/owners = get_owners() - if(!horded_item) + if(!hoarded_item) return TRUE for(var/datum/mind/M in owners) if(!isliving(M.current)) @@ -1016,14 +1016,14 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. for(var/obj/I in all_items) //Check for items - if(I == horded_item) + if(I == hoarded_item) return TRUE return FALSE -/datum/objective/horde/heirloom +/datum/objective/hoard/heirloom name = "steal heirloom" -/datum/objective/horde/heirloom/find_target() +/datum/objective/hoard/heirloom/find_target() set_target(pick(GLOB.family_heirlooms)) GLOBAL_LIST_EMPTY(possible_sabotages) @@ -1068,21 +1068,17 @@ GLOBAL_LIST_EMPTY(possible_sabotages) return targetinfo.check_conditions() /datum/objective/flavor - name = "Flavor" + name = "flavor" completable = FALSE +/datum/objective/flavor/New() + ..() + forge_objective() + /datum/objective/flavor/proc/forge_objective() +/datum/objective/flavor/traitor + name = "traitor flavor" + /datum/objective/flavor/traitor/forge_objective() - explanation_text = pickweight( - "Teach the heads of staff a lesson they will never forget." = 1, - "Show Nanotrasen the utility of a pure oxygen atmosphere." = 2, - "Waffle Co. wants you! That’s right, YOU! To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!" = 1, - "Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself." = 3, - "Get illegal technology spread through the station." = 3, - "Slow down the process of research as much as possible." = (owner.assigned_role in list("Research Director", "Scientist", "Roboticist") ? 6 : 0), - "Channel your inner rat. Cut wires throughout the station." = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), - "The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction." = 2, - "Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it." = 1, - "Steal as many shoes as possible. Lay broken glass everywhere." = 2 - ) + explanation_text = pickweight(CONFIG_GET(keyed_list/flavor_objective_traitor)) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 3385991116..e0044d8c23 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -215,7 +215,6 @@ else var/datum/objective/flavor/traitor/flavor_objective = new flavor_objective.owner = owner - flavor_objective.forge_objective() add_objective(flavor_objective) /datum/antagonist/traitor/proc/forge_single_AI_objective() diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index 996e2e3168..ea131fb996 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -104,7 +104,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) G.unlock() var/datum/antagonist/survivalist/guns/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/guns) if(our_antag_datum) - var/datum/objective/horde/O = new() + var/datum/objective/hoard/O = new() O.owner = H O.set_target(G) our_antag_datum.objectives += O @@ -136,7 +136,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/datum/antagonist/survivalist/magic/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/magic) if(istype(our_antag_datum)) - var/datum/objective/horde/O = new() + var/datum/objective/hoard/O = new() O.owner = H O.set_target(M) our_antag_datum.objectives += O diff --git a/config/game_options.txt b/config/game_options.txt index b8b89de17c..5d1f871058 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -597,3 +597,14 @@ MODETIER_VOTING ## Number of modes dropped by the modetier vote during mode selection, after vote. DROPPED_MODES 3 + +FLAVOR_OBJECTIVE_TRAITOR Teach the heads of staff a lesson they will never forget.=1 +FLAVOR_OBJECTIVE_TRAITOR Show Nanotrasen the utility of a pure oxygen atmosphere.=2 +FLAVOR_OBJECTIVE_TRAITOR Waffle Co. wants you! That’s right, YOU! To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!=1 +FLAVOR_OBJECTIVE_TRAITOR Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself.=3 +FLAVOR_OBJECTIVE_TRAITOR Get illegal technology spread through the station.=3 +FLAVOR_OBJECTIVE_TRAITOR Slow down the process of research as much as possible." = (owner.assigned_role in list("Research Director", "Scientist", "Roboticist") ? 6 : 0), +FLAVOR_OBJECTIVE_TRAITOR Channel your inner rat. Cut wires throughout the station." = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), +FLAVOR_OBJECTIVE_TRAITOR The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction.=2 +FLAVOR_OBJECTIVE_TRAITOR Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it.=1 +FLAVOR_OBJECTIVE_TRAITOR Steal as many shoes as possible. Lay broken glass everywhere." = 2 From 847b3c0a09234044531119ea2b98ca2c8cc8c0ef Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 24 Jan 2020 10:46:07 -0800 Subject: [PATCH 009/118] Fixed flavor objectives and added more. --- .../configuration/entries/game_options.dm | 6 ---- code/datums/mind.dm | 3 +- code/game/gamemodes/objective.dm | 31 ++++++++++++++++--- code/modules/antagonists/ninja/ninja.dm | 21 +++++-------- .../antagonists/traitor/datum_traitor.dm | 1 + code/modules/antagonists/wizard/wizard.dm | 5 +-- config/game_options.txt | 11 ------- strings/flavor_objectives/ninja_helping.txt | 6 ++++ strings/flavor_objectives/ninja_syndie.txt | 5 +++ strings/flavor_objectives/traitor.txt | 9 ++++++ .../flavor_objectives/traitor/assistant.txt | 0 .../flavor_objectives/traitor/engineering.txt | 0 strings/flavor_objectives/traitor/medical.txt | 0 strings/flavor_objectives/traitor/science.txt | 1 + strings/flavor_objectives/wizard.txt | 4 +++ 15 files changed, 63 insertions(+), 40 deletions(-) create mode 100644 strings/flavor_objectives/ninja_helping.txt create mode 100644 strings/flavor_objectives/ninja_syndie.txt create mode 100644 strings/flavor_objectives/traitor.txt create mode 100644 strings/flavor_objectives/traitor/assistant.txt create mode 100644 strings/flavor_objectives/traitor/engineering.txt create mode 100644 strings/flavor_objectives/traitor/medical.txt create mode 100644 strings/flavor_objectives/traitor/science.txt create mode 100644 strings/flavor_objectives/wizard.txt diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index cf5e0f7db1..aeca31ebd2 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -408,9 +408,3 @@ /datum/config_entry/number/dropped_modes config_entry_value = 3 - -/datum/config_entry/keyed_list/flavor_objective_traitor - key_mode = KEY_MODE_TEXT - value_mode = VALUE_MODE_NUM - splitter = "=" - lowercase = FALSE diff --git a/code/datums/mind.dm b/code/datums/mind.dm index c25f5d5199..464ea37d02 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -471,8 +471,7 @@ /datum/objective/nuclear, /datum/objective/capture, /datum/objective/absorb, - /datum/objective/custom, - /datum/objective/flavor/traitor + /datum/objective/custom ) for(var/T in allowed_types) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5b3e6a1164..11933c2717 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1070,15 +1070,36 @@ GLOBAL_LIST_EMPTY(possible_sabotages) /datum/objective/flavor name = "flavor" completable = FALSE + var/flavor_file -/datum/objective/flavor/New() - ..() - forge_objective() +/datum/objective/flavor/proc/get_flavor_list() + return world.file2list(flavor_file) /datum/objective/flavor/proc/forge_objective() + var/flavor_list = get_flavor_list() + explanation_text = pick(flavor_list) /datum/objective/flavor/traitor name = "traitor flavor" + flavor_file = "strings/flavor_objectives/traitor.txt" -/datum/objective/flavor/traitor/forge_objective() - explanation_text = pickweight(CONFIG_GET(keyed_list/flavor_objective_traitor)) +/datum/objective/flavor/traitor/get_flavor_list() + . = ..() + switch(owner.assigned_role) + if("Station Engineer", "Atmospheric Technician") + . += world.file2list("strings/flavor_objectives/traitor/engineering.txt") + if("Medical Doctor","Chemist","Virologist","Geneticist") + . += world.file2list("strings/flavor_objectives/traitor/medical.txt") + if("Scientist","Roboticist","Geneticist") + . += world.file2list("strings/flavor_objectives/traitor/science.txt") + if("Assistant") + . += world.file2list("strings/flavor_objectives/traitor/assistant.txt") + +/datum/objective/flavor/ninja_helping + flavor_file = "strings/flavor_objectives/ninja_helping.txt" + +/datum/objective/flavor/ninja_syndie + flavor_file = "strings/flavor_objectives/ninja_syndie.txt" + +/datum/objective/flavor/wizard + flavor_file = "strings/flavor_objectives/wizard.txt" diff --git a/code/modules/antagonists/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm index 52e13bdc69..fe83e2fb2b 100644 --- a/code/modules/antagonists/ninja/ninja.dm +++ b/code/modules/antagonists/ninja/ninja.dm @@ -73,23 +73,16 @@ O.target = M O.explanation_text = "Protect \the [M.current.real_name], the [M.assigned_role], from harm." objectives += O - if(4) //debrain/capture - if(!possible_targets.len) continue - var/selected = rand(1,possible_targets.len) - var/datum/mind/M = possible_targets[selected] - var/is_bad_guy = possible_targets[M] - possible_targets.Cut(selected,selected+1) - - if(is_bad_guy ^ helping_station) //debrain (good-ninja + bad-guy or bad-ninja + good-guy) - var/datum/objective/debrain/O = new /datum/objective/debrain() + if(4) //flavor + if(helping_station) + var/datum/objective/flavor/ninja_helping/O = new /datum/objective/flavor/ninja_helping O.owner = owner - O.target = M - O.explanation_text = "Steal the brain of [M.current.real_name]." + O.forge_objective() objectives += O - else //capture - var/datum/objective/capture/O = new /datum/objective/capture() + else + var/datum/objective/flavor/ninja_syndie/O = new /datum/objective/flavor/ninja_helping O.owner = owner - O.gen_amount_goal() + O.forge_objective() objectives += O else break diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index e0044d8c23..3385991116 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -215,6 +215,7 @@ else var/datum/objective/flavor/traitor/flavor_objective = new flavor_objective.owner = owner + flavor_objective.forge_objective() add_objective(flavor_objective) /datum/antagonist/traitor/proc/forge_single_AI_objective() diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index d89d6a2744..cc3cde79e4 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -61,9 +61,9 @@ owner.current.forceMove(pick(GLOB.wizardstart)) /datum/antagonist/wizard/proc/create_objectives() - var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.") - new_objective.completable = FALSE + var/datum/objective/flavor/wizard/new_objective = new new_objective.owner = owner + new_objective.forge_objective() objectives += new_objective if (!(locate(/datum/objective/escape) in objectives)) @@ -94,6 +94,7 @@ to_chat(owner, "You are the Space Wizard!") to_chat(owner, "The Space Wizards Federation has given you the following tasks:") owner.announce_objectives() + to_chat(owner, "These are merely guidelines! The federation are your masters, but you forge your own path!") to_chat(owner, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") to_chat(owner, "The spellbook is bound to you, and others cannot use it.") to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.") diff --git a/config/game_options.txt b/config/game_options.txt index 5d1f871058..b8b89de17c 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -597,14 +597,3 @@ MODETIER_VOTING ## Number of modes dropped by the modetier vote during mode selection, after vote. DROPPED_MODES 3 - -FLAVOR_OBJECTIVE_TRAITOR Teach the heads of staff a lesson they will never forget.=1 -FLAVOR_OBJECTIVE_TRAITOR Show Nanotrasen the utility of a pure oxygen atmosphere.=2 -FLAVOR_OBJECTIVE_TRAITOR Waffle Co. wants you! That’s right, YOU! To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!=1 -FLAVOR_OBJECTIVE_TRAITOR Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself.=3 -FLAVOR_OBJECTIVE_TRAITOR Get illegal technology spread through the station.=3 -FLAVOR_OBJECTIVE_TRAITOR Slow down the process of research as much as possible." = (owner.assigned_role in list("Research Director", "Scientist", "Roboticist") ? 6 : 0), -FLAVOR_OBJECTIVE_TRAITOR Channel your inner rat. Cut wires throughout the station." = (owner.assigned_role in list("Station Engineer", "Atmos Technician", "Assistant") ? 6 : 0), -FLAVOR_OBJECTIVE_TRAITOR The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction.=2 -FLAVOR_OBJECTIVE_TRAITOR Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it.=1 -FLAVOR_OBJECTIVE_TRAITOR Steal as many shoes as possible. Lay broken glass everywhere." = 2 diff --git a/strings/flavor_objectives/ninja_helping.txt b/strings/flavor_objectives/ninja_helping.txt new file mode 100644 index 0000000000..1280939b5c --- /dev/null +++ b/strings/flavor_objectives/ninja_helping.txt @@ -0,0 +1,6 @@ +Nanotrasen want to make sure that their employees are on the up-and-up. Try to find any blackmail you can. +Increase productivity however you can. +You are a security ninja. Answer to the Head of Security, and follow space law. +You are a cargo ninja. Answer to the Quartermaster, and do what they say. +Nanotrasen want you to ensure maximum morale. Protect the members of the crew who are on break. +Ensure that all the paperwork is being done. \ No newline at end of file diff --git a/strings/flavor_objectives/ninja_syndie.txt b/strings/flavor_objectives/ninja_syndie.txt new file mode 100644 index 0000000000..4527c693f4 --- /dev/null +++ b/strings/flavor_objectives/ninja_syndie.txt @@ -0,0 +1,5 @@ +The Gorlex Marauders want you to teach the heads of staff a lesson they will never forget. +Waffle Co. wants you To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun! +The Tiger Cooperative want you to kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself. +The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction. +Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it. \ No newline at end of file diff --git a/strings/flavor_objectives/traitor.txt b/strings/flavor_objectives/traitor.txt new file mode 100644 index 0000000000..fcbbc588e9 --- /dev/null +++ b/strings/flavor_objectives/traitor.txt @@ -0,0 +1,9 @@ +The Gorlex Marauders want you to teach the heads of staff a lesson they will never forget. +Show Nanotrasen the utility of a 40% oxygen atmosphere. +Waffle Co. wants you To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun! +Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself. +The Tiger Cooperative want you to get their illegal technology spread through the station. +The Animal Rights Consortium want you to channel your inner rat. Cut wires throughout the station. +The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction. +Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it. +The Gorlex Marauders want you to steal as many shoes as possible. Lay broken glass everywhere. \ No newline at end of file diff --git a/strings/flavor_objectives/traitor/assistant.txt b/strings/flavor_objectives/traitor/assistant.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/strings/flavor_objectives/traitor/engineering.txt b/strings/flavor_objectives/traitor/engineering.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/strings/flavor_objectives/traitor/medical.txt b/strings/flavor_objectives/traitor/medical.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/strings/flavor_objectives/traitor/science.txt b/strings/flavor_objectives/traitor/science.txt new file mode 100644 index 0000000000..6367e78da2 --- /dev/null +++ b/strings/flavor_objectives/traitor/science.txt @@ -0,0 +1 @@ +The Tiger Cooperative want you to slow down the process of research as much as possible. \ No newline at end of file diff --git a/strings/flavor_objectives/wizard.txt b/strings/flavor_objectives/wizard.txt new file mode 100644 index 0000000000..e65a6052bc --- /dev/null +++ b/strings/flavor_objectives/wizard.txt @@ -0,0 +1,4 @@ +Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale. +The Wizard Federation have sent you to take over the station by force. Kill the captain and take their place. The magocracy starts now. +You are the slipperiest wizard there ever was. Be loud, cause a ruckus, start a manhunt, and keep it going for as long as you can. +The crew must be shown the wonders of magic. Do some tricks for them. If they stop moving, that means they're in awe. \ No newline at end of file From c58b4daa35e28a26728e9f6aeb7dbbec5d0ed430 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 24 Jan 2020 11:58:58 -0800 Subject: [PATCH 010/118] collectors too this doesn't compile but like. it's a draft --- code/game/gamemodes/objective.dm | 30 ++++++++++++++++++- code/game/objects/items/cards_ids.dm | 5 +++- code/game/objects/items/storage/book.dm | 3 ++ .../antagonists/collector/collector.dm | 19 ++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 code/modules/antagonists/collector/collector.dm diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 11933c2717..fa302eeca8 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -999,7 +999,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) /datum/objective/hoard/proc/set_target(obj/item/I) if(I) hoarded_item = I - explanation_text = "Keep [I] on your person at all costs." + explanation_text = "Keep [I] on your person at all times." return hoarded_item else explanation_text = "Free objective" @@ -1026,6 +1026,34 @@ GLOBAL_LIST_EMPTY(possible_items_special) /datum/objective/hoard/heirloom/find_target() set_target(pick(GLOB.family_heirlooms)) +GLOBAL_LIST_EMPTY(traitor_contraband) + +GLOBAL_LIST_EMPTY(cult_contraband) + +/datum/objective/hoard/collector + name = "Hoard contraband" + +/datum/objective/collector/New() + ..() + if(!GLOB.traitor_contraband.len)//Only need to fill the list when it's needed. + GLOB.traitor_contraband = list(/obj/item/card/emag/empty,/obj/item/clothing/glasses/phantomthief,/obj/item/storage/book/bible/syndicate/empty,/obj/item/clothing/gloves/chameleon/broken) + if(!GLOB.cult_contraband.len) + GLOB.cult_contraband = list(/obj/item/clockwork/slab,/obj/item/clockwork/component/belligerent_eye,/obj/item/clockwork/component/belligerent_eye/lens_gem,/obj/item/restraints/legcuffs/bola/cult,/obj/item/shuttle_curse,/obj/item/cult_shift) + +/datum/objective/hoard/collector/find_target() + var/obj/item/I + if(prob(50)) + I = new pick_and_take(GLOB.traitor_contraband) + else + I = new pick_and_take(GLOB.cult_contraband) + I.forceMove(get_turf(owner)) + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK)) + hoarded_item = I + + + GLOBAL_LIST_EMPTY(possible_sabotages) // For saboteurs. Go in and cause some trouble somewhere. Not necessarily breaking things, just sufficiently troublemaking. /datum/objective/sabotage diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 48dac6a08b..5ec989ab73 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -128,6 +128,9 @@ return . = ..() +/obj/item/card/emag/empty + uses = 0 + /obj/item/emagrecharge name = "electromagnet charging device" desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices, sadly this can't be recharged like a normal cell." @@ -541,4 +544,4 @@ update_label("John Doe", "Clowny") id_color = "#0000FF" /obj/item/card/id/knight/captain - id_color = "#FFD700" \ No newline at end of file + id_color = "#FFD700" diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index e47021c1f6..2762be8edf 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -244,3 +244,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", /obj/item/storage/book/bible/syndicate/add_blood_DNA(list/blood_dna) return FALSE + +/obj/item/storage/book/bible/syndicate/empty + uses = 0 diff --git a/code/modules/antagonists/collector/collector.dm b/code/modules/antagonists/collector/collector.dm new file mode 100644 index 0000000000..0e7a3a52e7 --- /dev/null +++ b/code/modules/antagonists/collector/collector.dm @@ -0,0 +1,19 @@ +/datum/antagonist/collector + name = "Contraband Collector" + show_in_antagpanel = FALSE + show_name_in_check_antagonists = FALSE + blacklisted_quirks = list() // no blacklist, these guys are harmless + +/datum/antagonist/collector/proc/forge_objectives() + var/datum/objective/hoard/collector/O = new + O.owner = owner + O.find_target() + objectives += O + +/datum/antagonist/collector/on_gain() + forge_objectives() + . = ..() + +/datum/antagonist/collector/greet() + to_chat(owner, "You are a contraband collector!") + owner.announce_objectives() From 32ee2f61977630e829bce31e335a87541dd47d31 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 24 Jan 2020 21:48:59 +0100 Subject: [PATCH 011/118] minor pet peeve with the anomalous honking crystal & co. --- code/__DEFINES/traits.dm | 2 +- code/modules/antagonists/nukeop/clownop.dm | 4 ++-- code/modules/jobs/job_types/mime.dm | 1 + .../mob/living/simple_animal/hostile/megafauna/colossus.dm | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index d707f7e58a..e41dc27509 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -232,9 +232,9 @@ #define SLEEPING_CARP_TRAIT "sleeping_carp" #define RISING_BASS_TRAIT "rising_bass" #define ABDUCTOR_ANTAGONIST "abductor-antagonist" -#define NUKEOP_ANTAGONIST "nukeop-antagonist" #define MADE_UNCLONEABLE "made-uncloneable" #define TIMESTOP_TRAIT "timestop" #define NUKEOP_TRAIT "nuke-op" +#define CLOWNOP_TRAIT "clown-op" #define MEGAFAUNA_TRAIT "megafauna" #define DEATHSQUAD_TRAIT "deathsquad" diff --git a/code/modules/antagonists/nukeop/clownop.dm b/code/modules/antagonists/nukeop/clownop.dm index 58b492b578..a3ccdee2b5 100644 --- a/code/modules/antagonists/nukeop/clownop.dm +++ b/code/modules/antagonists/nukeop/clownop.dm @@ -7,10 +7,10 @@ /datum/antagonist/nukeop/clownop/on_gain() . = ..() - ADD_TRAIT(owner, TRAIT_CLOWN_MENTALITY, NUKEOP_ANTAGONIST) + ADD_TRAIT(owner, TRAIT_CLOWN_MENTALITY, CLOWNOP_TRAIT) /datum/antagonist/nukeop/clownop/on_removal() - REMOVE_TRAIT(owner, TRAIT_CLOWN_MENTALITY, NUKEOP_ANTAGONIST) + REMOVE_TRAIT(owner, TRAIT_CLOWN_MENTALITY, CLOWNOP_TRAIT) return ..() /datum/antagonist/nukeop/leader/clownop diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 4e6e982fb9..a5eb2032fa 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -17,6 +17,7 @@ display_order = JOB_DISPLAY_ORDER_MIME /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M) + . = ..() H.apply_pref_name("mime", M.client) /datum/outfit/job/mime diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 71465f23f9..eabb88f1ab 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -432,6 +432,7 @@ Difficulty: Very Hard H.dropItemToGround(W) var/datum/job/clown/C = new /datum/job/clown() C.equip(H) + C.after_spawn(H, H, TRUE) qdel(C) affected_targets.Add(H) From 37777c4cc7a3a73f54a557fe0b97eddb9f93c32a Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 25 Jan 2020 13:37:40 -0800 Subject: [PATCH 012/118] Removed the wirecutting one --- code/game/gamemodes/objective.dm | 2 +- strings/flavor_objectives/traitor.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index fa302eeca8..e01ff61229 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1043,7 +1043,7 @@ GLOBAL_LIST_EMPTY(cult_contraband) /datum/objective/hoard/collector/find_target() var/obj/item/I if(prob(50)) - I = new pick_and_take(GLOB.traitor_contraband) + I = new pick_and_take(GLOB.traitor_contraband) // always unique unless it's run out, in which case we refill it anyway else I = new pick_and_take(GLOB.cult_contraband) I.forceMove(get_turf(owner)) diff --git a/strings/flavor_objectives/traitor.txt b/strings/flavor_objectives/traitor.txt index fcbbc588e9..6d54c8ed9d 100644 --- a/strings/flavor_objectives/traitor.txt +++ b/strings/flavor_objectives/traitor.txt @@ -3,7 +3,6 @@ Show Nanotrasen the utility of a 40% oxygen atmosphere. Waffle Co. wants you To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun! Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself. The Tiger Cooperative want you to get their illegal technology spread through the station. -The Animal Rights Consortium want you to channel your inner rat. Cut wires throughout the station. The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction. Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it. The Gorlex Marauders want you to steal as many shoes as possible. Lay broken glass everywhere. \ No newline at end of file From 233aeaa456918827bd5336946024cc57f3257a2e Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 26 Jan 2020 19:03:09 -0800 Subject: [PATCH 013/118] removed some suggested bad possible contraband --- code/game/gamemodes/objective.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index e01ff61229..7105e45ddd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1036,9 +1036,9 @@ GLOBAL_LIST_EMPTY(cult_contraband) /datum/objective/collector/New() ..() if(!GLOB.traitor_contraband.len)//Only need to fill the list when it's needed. - GLOB.traitor_contraband = list(/obj/item/card/emag/empty,/obj/item/clothing/glasses/phantomthief,/obj/item/storage/book/bible/syndicate/empty,/obj/item/clothing/gloves/chameleon/broken) + GLOB.traitor_contraband = list(/obj/item/card/emag/empty,/obj/item/clothing/glasses/phantomthief,/obj/item/clothing/gloves/chameleon/broken) if(!GLOB.cult_contraband.len) - GLOB.cult_contraband = list(/obj/item/clockwork/slab,/obj/item/clockwork/component/belligerent_eye,/obj/item/clockwork/component/belligerent_eye/lens_gem,/obj/item/restraints/legcuffs/bola/cult,/obj/item/shuttle_curse,/obj/item/cult_shift) + GLOB.cult_contraband = list(/obj/item/clockwork/slab,/obj/item/clockwork/component/belligerent_eye,/obj/item/clockwork/component/belligerent_eye/lens_gem,/obj/item/shuttle_curse,/obj/item/cult_shift) /datum/objective/hoard/collector/find_target() var/obj/item/I From 8df9a051ec672edffa2a900d43a8147526c5c19e Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 27 Jan 2020 19:09:04 -0800 Subject: [PATCH 014/118] it compiles now, ready for testmerge probs --- code/game/gamemodes/objective.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 7105e45ddd..b22e12291b 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1042,10 +1042,12 @@ GLOBAL_LIST_EMPTY(cult_contraband) /datum/objective/hoard/collector/find_target() var/obj/item/I + var/I_type if(prob(50)) - I = new pick_and_take(GLOB.traitor_contraband) // always unique unless it's run out, in which case we refill it anyway + I_type = pick_n_take(GLOB.traitor_contraband) // always unique unless it's run out, in which case we refill it anyway else - I = new pick_and_take(GLOB.cult_contraband) + I_type = pick_n_take(GLOB.cult_contraband) + I = new I_type I.forceMove(get_turf(owner)) if(ishuman(owner)) var/mob/living/carbon/human/H = owner From d358913bde7e754204b5ddd37ae42bb1f5245302 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 28 Jan 2020 17:26:32 -0800 Subject: [PATCH 015/118] linter is right, whoops --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b22e12291b..a9c9e227df 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -373,7 +373,7 @@ GLOBAL_LIST_EMPTY(objectives) var/human_check = TRUE /datum/objective/breakout/check_completion() - return !target || considered_escaped(target, enforce_human = human_check) + return !target || considered_escaped(target) /datum/objective/breakout/find_target_by_role(role, role_type=0, invert=0) if(!invert) From 20e08d992f86c375bb257e4afa90c374facbabe1 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 29 Jan 2020 06:38:09 +0100 Subject: [PATCH 016/118] Removing unused vore files and commented out code. --- .../mob/living/carbon/human/examine_vr.dm | 45 ---- code/modules/vore/eating/belly_obj.dm | 3 - code/modules/vore/eating/digest_act.dm | 17 -- code/modules/vore/eating/living.dm | 6 - code/modules/vore/eating/voreitems.dm | 30 --- code/modules/vore/resizing/grav_pull_vr.dm | 63 ------ code/modules/vore/resizing/holder_micro_vr.dm | 34 --- code/modules/vore/resizing/resize_vr.dm | 207 ------------------ code/modules/vore/resizing/sizechemicals.dm | 110 ---------- code/modules/vore/resizing/sizegun_vr.dm | 173 --------------- tgstation.dme | 1 - 11 files changed, 689 deletions(-) delete mode 100644 code/modules/mob/living/carbon/human/examine_vr.dm delete mode 100644 code/modules/vore/resizing/grav_pull_vr.dm delete mode 100644 code/modules/vore/resizing/holder_micro_vr.dm delete mode 100644 code/modules/vore/resizing/resize_vr.dm delete mode 100644 code/modules/vore/resizing/sizechemicals.dm delete mode 100644 code/modules/vore/resizing/sizegun_vr.dm diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm deleted file mode 100644 index 6ef1b687c2..0000000000 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ /dev/null @@ -1,45 +0,0 @@ -/mob/living/carbon/human/proc/examine_nutrition() - var/message = "" - var/nutrition_examine = round(nutrition) - var/t_He = "It" //capitalised for use at the start of each line. - var/t_His = "Its" - var/t_his = "its" - var/t_is = "is" - var/t_has = "has" - switch(gender) - if(MALE) - t_He = "He" - t_his = "his" - t_His = "His" - if(FEMALE) - t_He = "She" - t_his = "her" - t_His = "Her" - if(PLURAL) - t_He = "They" - t_his = "their" - t_His = "Their" - t_is = "are" - t_has = "have" - if(NEUTER) - t_He = "It" - t_his = "its" - t_His = "Its" - switch(nutrition_examine) - if(0 to 49) - message = "[t_He] [t_is] starving! You can hear [t_his] stomach snarling from across the room!\n" - if(50 to 99) - message = "[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach.\n" - if(100 to 499) - return message //Well that's pretty normal, really. - if(500 to 864) // Fat. - message = "[t_He] [t_has] a stuffed belly, bloated fat and round from eating too much.\n" - if(1200 to 1934) // One person fully digested. - message = "[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.\n" - if(1935 to 3004) // Two people. - message = "[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft.\n" - if(3005 to 4074) // Three people. - message = "[t_His] stomach is firmly packed with digesting slop. [t_He] must have eaten at least a few times worth their body weight! It looks hard for them to stand, and [t_his] gut jiggles when they move.\n" - if(4075 to 10000) // Four or more people. - message = "[t_He] [t_is] so absolutely stuffed that you aren't sure how it's possible to move. [t_He] can't seem to swell any bigger. The surface of [t_his] belly looks sorely strained!\n" - return message \ No newline at end of file diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm index f88f6bd6e8..460ea74225 100644 --- a/code/modules/vore/eating/belly_obj.dm +++ b/code/modules/vore/eating/belly_obj.dm @@ -533,9 +533,6 @@ //Yes, it's ""safe"" to drop items here /obj/belly/AllowDrop() return TRUE -/* -/obj/belly/onDropInto(var/atom/movable/AM) - return null */ //Handle a mob struggling // Called from /mob/living/carbon/relaymove() diff --git a/code/modules/vore/eating/digest_act.dm b/code/modules/vore/eating/digest_act.dm index ce67a3d296..c0c9423d10 100644 --- a/code/modules/vore/eating/digest_act.dm +++ b/code/modules/vore/eating/digest_act.dm @@ -71,14 +71,6 @@ ///////////// // Some special treatment ///////////// -/* -//PDAs need to lose their ID to not take it with them, so we can get a digested ID -/obj/item/pda/digest_act(var/atom/movable/item_storage = null) - if(id) - id = null - - . = ..() -*/ /obj/item/reagent_containers/food/digest_act(var/atom/movable/item_storage = null) if(isbelly(item_storage)) @@ -92,15 +84,6 @@ . = ..() -/* -/obj/item/holder/digest_act(var/atom/movable/item_storage = null) - for(var/mob/living/M in contents) - if(item_storage) - M.forceMove(item_storage) - held_mob = null - - . = ..() */ - /obj/item/organ/digest_act(var/atom/movable/item_storage = null) if((. = ..())) . += 70 //Organs give a little more diff --git a/code/modules/vore/eating/living.dm b/code/modules/vore/eating/living.dm index 9fdb7aa764..33af8d06e5 100644 --- a/code/modules/vore/eating/living.dm +++ b/code/modules/vore/eating/living.dm @@ -400,10 +400,4 @@ taste_message += "they haven't bothered to set their flavor text" else taste_message += "a plain old normal [src]" - -/* if(ishuman(src)) - var/mob/living/carbon/human/H = src - if(H.touching.reagent_list.len) //Just the first one otherwise I'll go insane. - var/datum/reagent/R = H.touching.reagent_list[1] - taste_message += " You also get the flavor of [R.taste_description] from something on them"*/ return taste_message diff --git a/code/modules/vore/eating/voreitems.dm b/code/modules/vore/eating/voreitems.dm index 4e6bdaa1e0..3ec4ba1956 100644 --- a/code/modules/vore/eating/voreitems.dm +++ b/code/modules/vore/eating/voreitems.dm @@ -30,33 +30,3 @@ H.visible_message("[H] contracts strangely, spewing out contents on the floor!", \ "You spew out everything inside you on the floor!") return BULLET_ACT_HIT - - -////////////////////////// Anti-Noms Drugs ////////////////////////// -/* -/datum/reagent/medicine/ickypak - name = "Ickypak" - description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things." - reagent_state = LIQUID - color = "#0E900E" - metabolization_rate = 0.25 * REAGENTS_METABOLISM - -/datum/reagent/medicine/ickypak/on_mob_life(var/mob/living/M, method=INGEST) - if(prob(10)) - M.visible_message("[M] retches!", \ - "You don't feel good...") - for(var/I in M.vore_organs) - var/datum/belly/B = M.vore_organs[I] - for(var/atom/movable/A in B.internal_contents) - if(prob(55)) - playsound(M, 'sound/effects/splat.ogg', 50, 1) - B.release_specific_contents(A) - M.visible_message("[M] contracts strangely, spewing out something!", \ - "You spew out something from inside you!") - return ..() - -/datum/chemical_reaction/ickypak - name = "Ickypak" - id = /datum/reagent/medicine/ickypak - results = list(/datum/reagent/medicine/ickypak = 2) - required_reagents = list(/datum/reagent/chlorine = 2 , /datum/reagent/oil = 1) */ \ No newline at end of file diff --git a/code/modules/vore/resizing/grav_pull_vr.dm b/code/modules/vore/resizing/grav_pull_vr.dm deleted file mode 100644 index 921d1ab2b9..0000000000 --- a/code/modules/vore/resizing/grav_pull_vr.dm +++ /dev/null @@ -1,63 +0,0 @@ -// -// Gravity Pull effect which draws in movable objects to its center. -// In this case, "number" refers to the range. directions is ignored. -// -/datum/effect/effect/system/grav_pull - var/pull_radius = 3 - var/pull_anchored = 0 - var/break_windows = 0 - -/datum/effect/effect/system/grav_pull/set_up(range, num, loca) - pull_radius = range - number = num - if(istype(loca, /turf/)) - location = loca - else - location = get_turf(loca) - -/datum/effect/effect/system/grav_pull/start() - spawn(0) - if(holder) - src.location = get_turf(holder) - for(var/i=0, i < number, i++) - do_pull() - sleep(25) - -/datum/effect/effect/system/grav_pull/proc/do_pull() - //following is adapted from supermatter and singulo code - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 1 - - // Let's just make this one loop. - for(var/atom/X in orange(pull_radius, location)) - // Movable atoms only - if(istype(X, /atom/movable)) - if(istype(X, /obj/effect/overlay)) continue - if(X && !istype(X, /mob/living/carbon/human)) - if(break_windows && istype(X, /obj/structure/window)) //shatter windows - var/obj/structure/window/W = X - W.ex_act(2.0) - - if(istype(X, /obj)) - var/obj/O = X - if(O.anchored) - if (!pull_anchored) continue // Don't pull anchored stuff unless configured - step_towards(X, location) // step just once if anchored - continue - - step_towards(X, location) // Step twice - step_towards(X, location) - - else if(istype(X,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = X - if(istype(H.shoes,/obj/item/clothing/shoes/magboots)) - var/obj/item/clothing/shoes/magboots/M = H.shoes - if(M.magpulse) - step_towards(H, location) //step just once with magboots - continue - step_towards(H, location) //step twice - step_towards(H, location) - - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 0 - return diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm deleted file mode 100644 index 1f1aacf98d..0000000000 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ /dev/null @@ -1,34 +0,0 @@ -// Micro Holders - Extends /obj/item/holder - -/obj/item/holder/micro - name = "micro" - desc = "Another crewmember, small enough to fit in your hand." - icon_state = "micro" - slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID - w_class = 2 - item_icons = null // Override value from parent. We don't have magic sprites. - pixel_y = 0 // Override value from parent. - -/obj/item/holder/micro/examine(var/mob/user) - . = list() - for(var/mob/living/M in contents) - . += M.examine(user) - -/obj/item/holder/MouseDrop(mob/M as mob) - ..() - if(M != usr) return - if(usr == src) return - if(!Adjacent(usr)) return - if(istype(M,/mob/living/silicon/ai)) return - for(var/mob/living/carbon/human/O in contents) - O.show_inv(usr) - -/obj/item/holder/micro/attack_self(var/mob/living/user) - for(var/mob/living/carbon/human/M in contents) - M.help_shake_act(user) - -/obj/item/holder/micro/update_state() - // If any items have been dropped by contained mob, drop them to floor. - for(var/obj/O in contents) - O.forceMove(get_turf(src)) - ..() diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm deleted file mode 100644 index 052be48c2d..0000000000 --- a/code/modules/vore/resizing/resize_vr.dm +++ /dev/null @@ -1,207 +0,0 @@ -/* -//these aren't defines so they can stay in this file -GLOBAL_VAR_CONST(SIZESCALE_HUGE, 2) -GLOBAL_VAR_CONST(SIZESCALE_BIG, 1.5) -GLOBAL_VAR_CONST(SIZESCALE_NORMAL, 1) -GLOBAL_VAR_CONST(SIZESCALE_SMALL, 0.85) -GLOBAL_VAR_CONST(SIZESCALE_TINY, 0.60) - -GLOBAL_VAR_CONST(SIZESCALE_A_HUGEBIG, (GLOB.SIZESCALE_HUGE + GLOB.SIZESCALE_BIG) / 2) -GLOBAL_VAR_CONST(SIZESCALE_A_BIGNORMAL, (GLOB.SIZESCALE_BIG + GLOB.SIZESCALE_NORMAL) / 2) -GLOBAL_VAR_CONST(SIZESCALE_A_NORMALSMALL,(GLOB.SIZESCALE_NORMAL + GLOB.SIZESCALE_SMALL) / 2) -GLOBAL_VAR_CONST(SIZESCALE_A_SMALLTINY,(GLOB.SIZESCALE_SMALL + GLOB.SIZESCALE_TINY) / 2) -*/ -// Adding needed defines to /mob/living -// Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff. -/mob/living - var/size_multiplier = 1 //multiplier for the mob's icon size - -// Define holder_type on types we want to be scoop-able -//mob/living/carbon/human -// holder_type = /obj/item/holder/micro - -/** - * Scale up the size of a mob's icon by the size_multiplier. - * NOTE: mob/living/carbon/human/update_transform() has a more complicated system and - * is already applying this transform. BUT, it does not call ..() - * as long as that is true, we should be fine. If that changes we need to - * re-evaluate. - */ -/mob/living/update_transform() - ASSERT(!iscarbon(src)) - var/matrix/M = matrix() - M.Scale(size_multiplier) - M.Translate(0, 16*(size_multiplier-1)) - src.transform = M - -/** - * Get the effective size of a mob. - * Currently this is based only on size_multiplier for micro/macro stuff, - * but in the future we may also incorporate the "mob_size", so that - * a macro mouse is still only effectively "normal" or a micro dragon is still large etc. - */ -/mob/living/proc/get_effective_size() - return src.size_multiplier - -/** - * Resizes the mob immediately to the desired mod, animating it growing/shrinking. - * It can be used by anything that calls it. - */ -/mob/living/proc/sizescale(var/new_size) - var/matrix/sizescale = matrix() // Defines the matrix to change the player's size - sizescale.Scale(new_size) //Change the size of the matrix - - if(new_size >= SIZESCALE_NORMAL) - sizescale.Translate(0, -1 * (1 - new_size) * 16) //Move the player up in the tile so their feet align with the bottom - - animate(src, transform = sizescale, time = 5) //Animate the player resizing - size_multiplier = new_size //Change size_multiplier so that other items can interact with them - -/* - * Verb proc for a command that lets players change their size OOCly. - * Ace was here! Redid this a little so we'd use math for shrinking characters. This is the old code. - -/mob/living/proc/set_size() - set name = "Set Character Size" - set category = "Vore" - var/nagmessage = "DO NOT ABUSE THESE COMMANDS. They are not here for you to play with. \ - We were originally going to remove them but kept them for popular demand. \ - Do not abuse their existence outside of ERP scenes where they apply, \ - or reverting OOCly unwanted changes like someone lolshooting the crew with a shrink ray. -Ace" - - var/size_name = input(nagmessage, "Pick a Size") in player_sizes_list - if (size_name && player_sizes_list[size_name]) - src.sizescale(player_sizes_list[size_name]) - message_admins("[key_name(src)] used the sizescale command in-game to be [size_name]. \ - ([src ? "JMP" : "null"])") - -/** Add the set_size() proc to usable verbs. */ -/hook/living_new/proc/sizescale_setup(mob/living/M) - M.verbs += /mob/living/proc/set_size - return 1 - - - * Attempt to scoop up this mob up into M's hands, if the size difference is large enough. - * @return false if normal code should continue, 1 to prevent normal code. - -/mob/living/proc/attempt_to_scoop(var/mob/living/carbon/human/M) - if(!istype(M)) - return 0; - if(M.buckled) - usr << "You have to unbuckle \the [M] before you pick them up." - return 0 - if(M.get_effective_size() - src.get_effective_size() >= 0.75) - var/obj/item/holder/m_holder = get_scooped(M) - if (m_holder) - return 1 - else - return 0; // Unable to scoop, let other code run -*/ -/* - * Handle bumping into someone with helping intent. - * Called from /mob/living/Bump() in the 'brohugs all around' section. - * @return false if normal code should continue, 1 to prevent normal code. - * // TODO - can the now_pushing = 0 be moved up? What does it do anyway? - */ -/mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob) - if(src.get_effective_size() <= SIZESCALE_A_SMALLTINY && tmob.get_effective_size() <= SIZESCALE_A_SMALLTINY) - // Both small! Go ahead and - now_pushing = 0 - src.forceMove(tmob.loc) - return 1 - if(abs(src.get_effective_size() - tmob.get_effective_size()) >= 0.20) - now_pushing = 0 - src.forceMove(tmob.loc) - - if(src.get_effective_size() > tmob.get_effective_size()) -/* var/mob/living/carbon/human/tmob = src - if(istype(tmob) && istype(tmob.tail_style, /datum/sprite_accessory/tail/taur/naga)) - src << "You carefully slither around [tmob]." - M << "[src]'s huge tail slithers past beside you!" - else -*/ - src.forceMove(tmob.loc) - src << "You carefully step over [tmob]." - tmob << "[src] steps over you carefully!" - if(tmob.get_effective_size() > src.get_effective_size()) -/* var/mob/living/carbon/human/M = M - if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) - src << "You jump over [M]'s thick tail." - M << "[src] bounds over your tail." - else -*/ - src.forceMove(tmob.loc) - src << "You run between [tmob]'s legs." - tmob << "[src] runs between your legs." - return 1 - -/** - * Handle bumping into someone without mutual help intent. - * Called from /mob/living/Bump() - * NW was here, adding even more options for stomping! - * - * @return false if normal code should continue, 1 to prevent normal code. - */ -/mob/living/proc/handle_micro_bump_other(var/mob/living/tmob) - ASSERT(isliving(tmob)) // Baby don't hurt me - - if(src.a_intent == "disarm" && src.canmove && !src.buckled) - // If bigger than them by at least 0.75, move onto them and print message. - if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20) - now_pushing = 0 - src.forceMove(tmob.loc) - tmob.Stun(4) -/* - var/mob/living/carbon/human/H = src - if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) - src << "You carefully squish [tmob] under your tail!" - tmob << "[src] pins you under their tail!" - else -*/ - src << "You pin [tmob] beneath your foot!" - tmob << "[src] pins you beneath their foot!" - return 1 - - if(src.a_intent == "harm" && src.canmove && !src.buckled) - if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20) - now_pushing = 0 - src.forceMove(tmob.loc) - tmob.adjustStaminaLoss(35) - tmob.adjustBruteLoss(5) -/* var/mob/living/carbon/human/M = src - if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) - src << "You steamroller over [tmob] with your heavy tail!" - tmob << "[src] ploughs you down mercilessly with their heavy tail!" - else -*/ - src << "You bring your foot down heavily upon [tmob]!" - tmob << "[src] steps carelessly on your body!" - return 1 - - // until I figure out grabbing micros with the godawful pull code... - if(src.a_intent == "grab" && src.canmove && !src.buckled) - if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20) - now_pushing = 0 - tmob.adjustStaminaLoss(15) - src.forceMove(tmob.loc) - src << "You press [tmob] beneath your foot!" - tmob << "[src] presses you beneath their foot!" -/* - var/mob/living/carbon/human/M = src - if(istype(M) && !M.shoes) - // User is a human (capable of scooping) and not wearing shoes! Scoop into foot slot! - equip_to_slot_if_possible(tmob.get_scooped(M), slot_shoes, 0, 1) - if(istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) - src << "You wrap up [tmob] with your powerful tail!" - tmob << "[src] binds you with their powerful tail!" - else - src << "You clench your toes around [tmob]'s body!" - tmob << "[src] grabs your body with their toes!" - else if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) - src << "You carefully squish [tmob] under your tail!" - tmob << "[src] pins you under their tail!" - else - src << "You pin [tmob] beneath your foot!" - tmob << "[src] pins you beneath their foot!" - return 1 -*/ diff --git a/code/modules/vore/resizing/sizechemicals.dm b/code/modules/vore/resizing/sizechemicals.dm deleted file mode 100644 index 612e8c9fde..0000000000 --- a/code/modules/vore/resizing/sizechemicals.dm +++ /dev/null @@ -1,110 +0,0 @@ - -//////////////////////////// -/// shrinking serum /// -//////////////////////////// - -/datum/reagent/medicine/macrocillin - name = "Macrocillin" - description = "Glowing yellow liquid." - reagent_state = LIQUID - color = "#FFFF00" // rgb: 255, 255, 0 - overdose_threshold = 20 - -/datum/reagent/medicine/macrocillin/on_mob_life(mob/living/M, method=INGEST) - for(var/size in list(SIZESCALE_SMALL, SIZESCALE_NORMAL, SIZESCALE_BIG, SIZESCALE_HUGE)) - if(M.size_multiplier < size) - M.sizescale(size) - M << "You grow!" - break - if(M.reagents.has_reagent(/datum/reagent/medicine/macrocillin)) - M.reagents.remove_reagent(/datum/reagent/medicine/macrocillin, 20) - ..() - -/datum/reagent/medicine/microcillin - name = "Microcillin" - description = "Murky purple liquid." - reagent_state = LIQUID - color = "#800080" - overdose_threshold = 20 - -/datum/reagent/microcillin/on_mob_life(mob/living/M, method=INGEST) - for(var/size in list(SIZESCALE_BIG, SIZESCALE_NORMAL, SIZESCALE_SMALL, SIZESCALE_TINY)) - if(M.size_multiplier > size) - M.sizescale(size) - M << "You shrink!" - break; - if(M.reagents.has_reagent(/datum/reagent/medicine/microcillin)) - M.reagents.remove_reagent(/datum/reagent/medicine/microcillin, 20) - - ..() - -/datum/reagent/medicine/normalcillin - name = "Normalcillin" - description = "Translucent cyan liquid." - reagent_state = LIQUID - color = "#00FFFF" - overdose_threshold = 20 - -/datum/reagent/medicine/normalcillin/on_mob_life(mob/living/M, method=INGEST) - if(M.size_multiplier > SIZESCALE_BIG) - M.sizescale(SIZESCALE_BIG) - M << "You shrink!" - else if(M.size_multiplier > SIZESCALE_NORMAL) - M.sizescale(SIZESCALE_NORMAL) - M << "You shrink!" - else if(M.size_multiplier < SIZESCALE_NORMAL) - M.sizescale(SIZESCALE_NORMAL) - M << "You grow!" - else if(M.size_multiplier < SIZESCALE_SMALL) - M.sizescale(SIZESCALE_SMALL) - M << "You grow!" - - if(M.reagents.has_reagent(/datum/reagent/medicine/normalcillin)) - M.reagents.remove_reagent(/datum/reagent/medicine/normalcillin, 20) - ..() - - -/datum/reagent/medicine/sizeoxadone - name = "Sizeoxadone" - description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed." - reagent_state = LIQUID - color = "#1E90FF" - overdose_threshold = 30 - metabolization_rate = 0.8 * REAGENTS_METABOLISM - -/datum/reagent/sizeoxadone/on_mob_life(var/mob/living/carbon/M, var/removed) - if(M.hallucination < volume && prob(20)) - M.hallucination += 5 - if(!M.confused) M.confused = 1 - M.confused = max(M.confused, 20) - return - -/datum/reagent/medicine/sizeoxadone/overdose_process(mob/living/M) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1) - M.adjustToxLoss(1) - ..() - . = 1 - -////////////////////////// Anti-Noms Drugs ////////////////////////// - -/datum/reagent/medicine/ickypak - name = "Ickypak" - description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things." - reagent_state = LIQUID - color = "#0E900E" - metabolization_rate = 0.25 * REAGENTS_METABOLISM - -/datum/reagent/medicine/ickypak/on_mob_life(var/mob/living/M, method=INGEST) - ..() - if(M.hallucination < volume && prob(20)) - M.hallucination += 5 - M.adjustToxLoss(-5) - - for(var/I in M.vore_organs) - var/datum/belly/B = M.vore_organs[I] - for(var/atom/movable/A in B.internal_contents) - if(prob(55)) - playsound(M, 'sound/effects/splat.ogg', 50, 1) - B.release_vore_contents(A) - ..() - . = 1 \ No newline at end of file diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm deleted file mode 100644 index 156b220df3..0000000000 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ /dev/null @@ -1,173 +0,0 @@ -// -// Size Gun -// -/* -/obj/item/gun/energy/sizegun - name = "shrink ray" - desc = "A highly advanced ray gun with two settings: Shrink and Grow. Warning: Do not insert into mouth." - icon = 'icons/obj/gun_vr.dmi' - icon_state = "sizegun-shrink100" // Someone can probably do better. -Ace - item_state = null //so the human update icon uses the icon_state instead - fire_sound = 'sound/weapons/wave.ogg' - charge_cost = 100 - projectile_type = /obj/item/projectile/beam/shrinklaser - modifystate = "sizegun-shrink" - selfcharge = EGUN_SELFCHARGE - firemodes = list( - list(mode_name = "grow", - projectile_type = /obj/item/projectile/beam/growlaser, - modifystate = "sizegun-grow", - fire_sound = 'sound/weapons/pulse3.ogg' - ), - list(mode_name = "shrink", - projectile_type = /obj/item/projectile/beam/shrinklaser, - modifystate = "sizegun-shrink", - fire_sound = 'sound/weapons/wave.ogg' - )) - -// -// Beams for size gun -// -// tracers TBD - -/obj/item/projectile/beam/shrinklaser - name = "shrink beam" - icon_state = "xray" - nodamage = 1 - damage = 0 - check_armour = "laser" - - muzzle_type = /obj/effect/projectile/xray/muzzle - tracer_type = /obj/effect/projectile/xray/tracer - impact_type = /obj/effect/projectile/xray/impact - -/obj/item/projectile/beam/shrinklaser/on_hit(var/atom/target, var/blocked = 0) - . = ..() - if(isliving(target)) - var/mob/living/M = target - switch(M.size_multiplier) - if(SIZESCALE_HUGE to INFINITY) - M.sizescale(SIZESCALE_BIG) - if(SIZESCALE_BIG to SIZESCALE_HUGE) - M.sizescale(SIZESCALE_NORMAL) - if(SIZESCALE_NORMAL to SIZESCALE_BIG) - M.sizescale(SIZESCALE_SMALL) - if((0 - INFINITY) to SIZESCALE_NORMAL) - M.sizescale(SIZESCALE_TINY) - M.update_transform() - return BULLET_ACT_HIT - -/obj/item/projectile/beam/growlaser - name = "growth beam" - icon_state = "bluelaser" - nodamage = 1 - damage = 0 - check_armour = "laser" - - muzzle_type = /obj/effect/projectile/laser_blue/muzzle - tracer_type = /obj/effect/projectile/laser_blue/tracer - impact_type = /obj/effect/projectile/laser_blue/impact - -/obj/item/projectile/beam/growlaser/on_hit(var/atom/target, var/blocked = 0) - . = ..() - if(isliving(target)) - var/mob/living/M = target - switch(M.size_multiplier) - if(SIZESCALE_BIG to SIZESCALE_HUGE) - M.sizescale(SIZESCALE_HUGE) - if(SIZESCALE_NORMAL to SIZESCALE_BIG) - M.sizescale(SIZESCALE_BIG) - if(SIZESCALE_SMALL to SIZESCALE_NORMAL) - M.sizescale(SIZESCALE_NORMAL) - if((0 - INFINITY) to SIZESCALE_TINY) - M.sizescale(SIZESCALE_SMALL) - M.update_transform() - return BULLET_ACT_HIT -*/ - -datum/design/sizeray - name = "Size Ray" - desc = "Abuse bluespace tech to alter living matter scale." - id = "sizeray" - build_type = PROTOLATHE - materials = list(MAT_METAL = 1000, MAT_GLASS = 1000, MAT_DIAMOND = 2500, MAT_URANIUM = 2500, MAT_TITANIUM = 1000) - build_path = /obj/item/gun/energy/laser/sizeray - category = list("Weapons") - -/obj/item/projectile/sizeray - name = "sizeray beam" - icon_state = "omnilaser" - hitsound = null - damage = 0 - damage_type = STAMINA - flag = "laser" - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE - -/obj/item/projectile/sizeray/shrinkray - icon_state="bluelaser" - -/obj/item/projectile/sizeray/growthray - icon_state="laser" - -/obj/item/projectile/sizeray/shrinkray/on_hit(var/atom/target, var/blocked = 0) - . = ..() - if(isliving(target)) - var/mob/living/M = target - switch(M.size_multiplier) - if(SIZESCALE_HUGE to INFINITY) - M.sizescale(SIZESCALE_BIG) - if(SIZESCALE_BIG to SIZESCALE_HUGE) - M.sizescale(SIZESCALE_NORMAL) - if(SIZESCALE_NORMAL to SIZESCALE_BIG) - M.sizescale(SIZESCALE_SMALL) - if((0 - INFINITY) to SIZESCALE_NORMAL) - M.sizescale(SIZESCALE_TINY) - M.update_transform() - return BULLET_ACT_ - -/obj/item/projectile/sizeray/growthray/on_hit(var/atom/target, var/blocked = 0) - . = ..() - if(isliving(target)) - var/mob/living/M = target - switch(M.size_multiplier) - if(SIZESCALE_BIG to SIZESCALE_HUGE) - M.sizescale(SIZESCALE_HUGE) - if(SIZESCALE_NORMAL to SIZESCALE_BIG) - M.sizescale(SIZESCALE_BIG) - if(SIZESCALE_SMALL to SIZESCALE_NORMAL) - M.sizescale(SIZESCALE_NORMAL) - if((0 - INFINITY) to SIZESCALE_TINY) - M.sizescale(SIZESCALE_SMALL) - M.update_transform() - return BULLET_ACT_HIT - -/obj/item/ammo_casing/energy/laser/growthray - projectile_type = /obj/item/projectile/sizeray/growthray - select_name = "Growth" - -/obj/item/ammo_casing/energy/laser/shrinkray - projectile_type = /obj/item/projectile/sizeray/shrinkray - select_name = "Shrink" - - -//Gun here -/obj/item/gun/energy/laser/sizeray - name = "size ray" - icon_state = "bluetag" - desc = "Size manipulator using bluespace breakthroughs." - item_state = null //so the human update icon uses the icon_state instead. - ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray, /obj/item/ammo_casing/energy/laser/growthray) - selfcharge = EGUN_SELFCHARGE - charge_delay = 5 - ammo_x_offset = 2 - clumsy_check = 1 - - attackby(obj/item/W, mob/user) - if(W==src) - if(icon_state=="bluetag") - icon_state="redtag" - ammo_type = list(/obj/item/ammo_casing/energy/laser/growthray) - else - icon_state="bluetag" - ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray) - return ..() \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 8fda1f85cb..af0ef6fc9b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2202,7 +2202,6 @@ #include "code\modules\mob\living\carbon\human\dummy.dm" #include "code\modules\mob\living\carbon\human\emote.dm" #include "code\modules\mob\living\carbon\human\examine.dm" -#include "code\modules\mob\living\carbon\human\examine_vr.dm" #include "code\modules\mob\living\carbon\human\human.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm" From bf47daf0990163c8af80a6e22732359c6762fdb8 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Thu, 30 Jan 2020 17:00:14 +0800 Subject: [PATCH 017/118] MY PRECIOUS! GONE!! GOOOOOONE!!! --- code/modules/clothing/gloves/_gloves.dm | 2 ++ code/modules/clothing/gloves/boxing.dm | 1 + code/modules/clothing/gloves/color.dm | 2 ++ code/modules/clothing/gloves/miscellaneous.dm | 15 +++++++++++++++ code/modules/mob/living/living.dm | 18 +++++++++++++++--- .../uplink/uplink_items/uplink_clothing.dm | 6 ++++++ icons/obj/clothing/gloves.dmi | Bin 14376 -> 14851 bytes 7 files changed, 41 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index 8ab897f5d9..0729317eac 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -11,6 +11,8 @@ var/transfer_blood = 0 strip_delay = 20 equip_delay_other = 40 + var/strip_mod = 1 //how much they alter stripping items time by, higher is quicker + var/strip_silence = FALSE //if it shows a warning when stripping /obj/item/clothing/gloves/ComponentInitialize() . = ..() diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index a76ff7c583..fe07cc7ab9 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -5,6 +5,7 @@ item_state = "boxing" equip_delay_other = 60 species_exception = list(/datum/species/golem) // now you too can be a golem boxing champion + strip_mod = 0.5 /obj/item/clothing/gloves/boxing/green icon_state = "boxinggreen" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index b630b121a9..f4b04f5bfe 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -41,6 +41,7 @@ permeability_coefficient = 1 resistance_flags = NONE transfer_prints = TRUE + strip_mod = 0.8 /obj/item/clothing/gloves/cut/family desc = "The old gloves your great grandfather stole from Engineering, many moons ago. They've seen some tough times recently." @@ -76,6 +77,7 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE var/can_be_cut = 1 + strip_mod = 1.2 /obj/item/clothing/gloves/color/black/hos item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index efe32a1473..1e58f6b0e2 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -10,6 +10,7 @@ equip_delay_other = 20 cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + strip_mod = 0.9 /obj/item/clothing/gloves/botanic_leather name = "botanist's leather gloves" @@ -23,6 +24,7 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30) + strip_mod = 0.9 /obj/item/clothing/gloves/combat name = "combat gloves" @@ -38,6 +40,7 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50) + strip_mod = 1.5 /obj/item/clothing/gloves/bracer @@ -103,3 +106,15 @@ /obj/item/clothing/gloves/rapid/hug/attack_self(mob/user) return FALSE + +/obj/item/clothing/gloves/thief + name = "thief's gloves" + desc = "Gloves made with completely frictionless, insulated cloth, easier to steal from people with." + icon_state = "thief" + item_state = "blackgloves" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + strip_delay = 80 + transfer_prints = FALSE + strip_mod = 5 + strip_silence = TRUE \ No newline at end of file diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 90ada3d718..02056ff947 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -763,10 +763,22 @@ if(HAS_TRAIT(what, TRAIT_NODROP)) to_chat(src, "You can't remove \the [what.name], it appears to be stuck!") return - who.visible_message("[src] tries to remove [who]'s [what.name].", \ + var/strip_mod = 1 + var/strip_silence = FALSE + if (ishuman(src)) //carbon doesn't actually wear gloves + var/mob/living/carbon/C = src + var/obj/item/clothing/gloves/g = C.gloves + if (istype(g)) + strip_mod = g.strip_mod + strip_silence = g.strip_silence + if (!strip_silence) + who.visible_message("[src] tries to remove [who]'s [what.name].", \ "[src] tries to remove [who]'s [what.name].") - what.add_fingerprint(src) - if(do_mob(src, who, what.strip_delay, ignorehelditem = TRUE)) + what.add_fingerprint(src) + else + to_chat(src,"You try to remove [who]'s [what.name].") + what.add_fingerprint(src) + if(do_mob(src, who, round(what.strip_delay / strip_mod), ignorehelditem = TRUE)) if(what && Adjacent(who)) if(islist(where)) var/list/L = where diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm index 3a3c53288a..e8d01a5465 100644 --- a/code/modules/uplink/uplink_items/uplink_clothing.dm +++ b/code/modules/uplink/uplink_items/uplink_clothing.dm @@ -78,3 +78,9 @@ cost = 30 include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) exclude_modes = list() + +/datum/uplink_item/suits/thiefgloves + name = "Thief's Gloves" + desc = "A pair of gloves that are insulated and frictionless, allowing you to steal easily from anyone you see." + item = /obj/item/clothing/gloves/thief + cost = 4 \ No newline at end of file diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 7e0d03abd56bcd7fa2e543382d0b42845405ca2b..515d6212c0da783a6680e76ea0f0a70999a5b77a 100644 GIT binary patch literal 14851 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 literal 14376 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 E2hBqr;{X5v From a415dbf31b1061a01d6f7a70f4183beb5f230e85 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 31 Jan 2020 08:19:35 +0800 Subject: [PATCH 018/118] yas --- code/modules/clothing/gloves/miscellaneous.dm | 2 +- code/modules/uplink/uplink_items/uplink_clothing.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 1e58f6b0e2..9f4b89f607 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -108,7 +108,7 @@ return FALSE /obj/item/clothing/gloves/thief - name = "thief's gloves" + name = "black gloves" desc = "Gloves made with completely frictionless, insulated cloth, easier to steal from people with." icon_state = "thief" item_state = "blackgloves" diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm index e8d01a5465..79272ada7b 100644 --- a/code/modules/uplink/uplink_items/uplink_clothing.dm +++ b/code/modules/uplink/uplink_items/uplink_clothing.dm @@ -80,7 +80,7 @@ exclude_modes = list() /datum/uplink_item/suits/thiefgloves - name = "Thief's Gloves" + name = "Thieving Gloves" desc = "A pair of gloves that are insulated and frictionless, allowing you to steal easily from anyone you see." item = /obj/item/clothing/gloves/thief cost = 4 \ No newline at end of file From 43c4debb4f5f8d883460640525faf2b050f415fb Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Fri, 31 Jan 2020 11:54:18 +1100 Subject: [PATCH 019/118] Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. --- code/modules/cargo/packs/security.dm | 14 +++++------ code/modules/clothing/suits/armor.dm | 25 ++++++++++++++++++- code/modules/clothing/suits/jobs.dm | 22 ---------------- code/modules/clothing/suits/miscellaneous.dm | 2 +- .../mob/living/simple_animal/corpse.dm | 4 +-- code/modules/vending/wardrobes.dm | 1 - .../code/modules/client/loadout/_security.dm | 8 +++--- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index 69967d65d1..4bbb400cd4 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -81,8 +81,8 @@ desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!" contraband = TRUE cost = 5750 // Its basicly sec suits, good boots/gloves - contains = list(/obj/item/clothing/suit/security/officer/russian, - /obj/item/clothing/suit/security/officer/russian, + contains = list(/obj/item/clothing/suit/armor/navyblue/russian, + /obj/item/clothing/suit/armor/navyblue/russian, /obj/item/clothing/shoes/combat, /obj/item/clothing/shoes/combat, /obj/item/clothing/head/ushanka, @@ -104,7 +104,7 @@ contraband = TRUE access = FALSE cost = 5500 // - contains = list(/obj/item/clothing/suit/security/officer/russian, + contains = list(/obj/item/clothing/suit/armor/navyblue/russian, /obj/item/clothing/shoes/combat, /obj/item/clothing/head/ushanka, /obj/item/clothing/suit/armor/bulletproof, @@ -141,15 +141,15 @@ cost = 3250 contains = list(/obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, - /obj/item/clothing/suit/security/officer, - /obj/item/clothing/suit/security/officer, + /obj/item/clothing/suit/armor/navyblue, + /obj/item/clothing/suit/armor/navyblue, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/under/rank/warden/navyblue, - /obj/item/clothing/suit/security/warden, + /obj/item/clothing/suit/armor/vest/warden/navyblue, /obj/item/clothing/head/beret/sec/navywarden, /obj/item/clothing/under/rank/head_of_security/navyblue, - /obj/item/clothing/suit/security/hos, + /obj/item/clothing/suit/armor/hos/navyblue, /obj/item/clothing/head/beret/sec/navyhos) crate_name = "security clothing crate" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index e536d307ef..4591ba8b4e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -15,6 +15,13 @@ if(!allowed) allowed = GLOB.security_vest_allowed +/obj/item/clothing/suit/armor/navyblue + name = "security officer's jacket" + desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor." + icon_state = "officerbluejacket" + item_state = "officerbluejacket" + body_parts_covered = CHEST|ARMS + /obj/item/clothing/suit/armor/vest name = "armor vest" desc = "A slim Type I armored vest that provides decent protection against most types of damage." @@ -52,8 +59,17 @@ heat_protection = CHEST|GROIN|LEGS|ARMS strip_delay = 80 +/obj/item/clothing/suit/armor/hos/navyblue + name = "head of security's jacket" + desc = "This piece of clothing was specifically designed for asserting superior authority." + icon_state = "hosbluejacket" + item_state = "hosbluejacket" + body_parts_covered = CHEST|ARMS + cold_protection = CHEST|ARMS + heat_protection = CHEST|ARMS + /obj/item/clothing/suit/armor/hos/trenchcoat - name = "armored trenchoat" + name = "armored trenchcoat" desc = "A trenchcoat enhanced with a special lightweight kevlar. The epitome of tactical plainclothes." icon_state = "hostrench" item_state = "hostrench" @@ -78,6 +94,13 @@ desc = "A red jacket with silver rank pips and body armor strapped on top." icon_state = "warden_jacket" +/obj/item/clothing/suit/armor/vest/warden/navyblue + name = "warden's jacket" + desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." + icon_state = "wardenbluejacket" + item_state = "wardenbluejacket" + body_parts_covered = CHEST|ARMS + /obj/item/clothing/suit/armor/vest/leather name = "security overcoat" desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 88bafc842b..48fd8ccf1c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -155,28 +155,6 @@ blood_overlay_type = "armor" //it's the less thing that I can put here body_parts_covered = NONE -//Security -/obj/item/clothing/suit/security/officer - name = "security officer's jacket" - desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor." - icon_state = "officerbluejacket" - item_state = "officerbluejacket" - body_parts_covered = CHEST|ARMS - -/obj/item/clothing/suit/security/warden - name = "warden's jacket" - desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." - icon_state = "wardenbluejacket" - item_state = "wardenbluejacket" - body_parts_covered = CHEST|ARMS - -/obj/item/clothing/suit/security/hos - name = "head of security's jacket" - desc = "This piece of clothing was specifically designed for asserting superior authority." - icon_state = "hosbluejacket" - item_state = "hosbluejacket" - body_parts_covered = CHEST|ARMS - //Surgeon /obj/item/clothing/suit/apron/surgical name = "surgical apron" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 127d2e4f04..c5f99a6c53 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -317,7 +317,7 @@ flags_cover = HEADCOVERSEYES flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR -/obj/item/clothing/suit/security/officer/russian +/obj/item/clothing/suit/armor/navyblue/russian name = "\improper Russian officer's jacket" desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor." icon_state = "officertanjacket" diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 17d7530c29..9f3e44fee7 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -143,7 +143,7 @@ /datum/outfit/russiancorpse/officer name = "Russian Officer Corpse" uniform = /obj/item/clothing/under/rank/security/navyblue/russian - suit = /obj/item/clothing/suit/security/officer/russian + suit = /obj/item/clothing/suit/armor/navyblue/russian shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/ushanka @@ -207,7 +207,7 @@ /obj/effect/mob_spawn/human/corpse/bee_terrorist name = "BLF Operative" outfit = /datum/outfit/bee_terrorist - + /datum/outfit/bee_terrorist name = "BLF Operative" uniform = /obj/item/clothing/under/color/yellow diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index cd643e4220..0a3ded63bd 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -20,7 +20,6 @@ /obj/item/clothing/under/rank/security/grey = 5, /obj/item/clothing/under/pants/khaki = 5) premium = list(/obj/item/clothing/under/rank/security/navyblue = 5, - /obj/item/clothing/suit/security/officer = 5, /obj/item/clothing/head/beret/sec/navyofficer = 5) refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe diff --git a/modular_citadel/code/modules/client/loadout/_security.dm b/modular_citadel/code/modules/client/loadout/_security.dm index 7a49b1f049..c9591540e6 100644 --- a/modular_citadel/code/modules/client/loadout/_security.dm +++ b/modular_citadel/code/modules/client/loadout/_security.dm @@ -5,7 +5,7 @@ restricted_roles = list("Head of Security") /datum/gear/navybluehosberet - name = "Head of security's Naviblue beret" + name = "Head of security's navyblue beret" category = SLOT_HEAD path = /obj/item/clothing/head/beret/sec/navyhos restricted_roles = list("Head of Security") @@ -13,13 +13,13 @@ /datum/gear/navybluejackethos name = "head of security's navyblue jacket" category = SLOT_WEAR_SUIT - path = /obj/item/clothing/suit/security/hos + path = /obj/item/clothing/suit/armor/hos/navyblue restricted_roles = list("Head of Security") /datum/gear/navybluejacketofficer name = "security officer's navyblue jacket" category = SLOT_WEAR_SUIT - path = /obj/item/clothing/suit/security/officer + path = /obj/item/clothing/suit/armor/navyblue restricted_roles = list("Security Officer") /datum/gear/navyblueofficerberet @@ -37,7 +37,7 @@ /datum/gear/navybluejacketwarden name = "warden navyblue jacket" category = SLOT_WEAR_SUIT - path = /obj/item/clothing/suit/security/warden + path = /obj/item/clothing/suit/armor/vest/warden/navyblue restricted_roles = list("Warden") /datum/gear/navybluewardenberet From 29e0ac52c43bc5f8ff51506f9f09dfc6abb0470f Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 31 Jan 2020 11:52:05 -0800 Subject: [PATCH 020/118] fuzzy objectives --- code/__HELPERS/roundend.dm | 9 +++++++- code/game/gamemodes/objective_sabotage.dm | 21 ++++++++++--------- .../modules/antagonists/_common/antag_team.dm | 7 +++++-- code/modules/antagonists/brother/brother.dm | 7 +++++-- .../antagonists/changeling/changeling.dm | 11 +++++++--- code/modules/antagonists/cult/cult.dm | 9 +++++--- .../antagonists/disease/disease_datum.dm | 11 ++++++---- .../antagonists/traitor/datum_traitor.dm | 11 ++++++---- code/modules/antagonists/wizard/wizard.dm | 11 ++++++---- interface/stylesheet.dm | 1 + 10 files changed, 65 insertions(+), 33 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 5102eb4802..906f60d65b 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -111,7 +111,14 @@ if(A.objectives.len) for(var/datum/objective/O in A.objectives) - var/result = O.check_completion() ? "SUCCESS" : "FAIL" + var/result = "UNKNOWN" + var/actual_result = O.check_completion() + if(actual_result >= 1) + result = "SUCCESS" + else if(actual_result <= 0) + result = "FAIL" + else + result = "[actual_result*100]%" antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result)) SSblackbox.record_feedback("associative", "antagonists", 1, antag_info) diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm index 0ede317626..467983a346 100644 --- a/code/game/gamemodes/objective_sabotage.dm +++ b/code/game/gamemodes/objective_sabotage.dm @@ -20,13 +20,16 @@ START_PROCESSING(SSprocessing, src) /datum/sabotage_objective/processing/proc/check_condition_processing() - return TRUE + return 100 /datum/sabotage_objective/processing/process() - won = check_condition_processing() - if(won) + check_condition_processing() + if(won >= 100) STOP_PROCESSING(SSprocessing,src) +/datum/sabotage_objective/processing/check_conditions() + return won + /datum/sabotage_objective/processing/power_sink name = "Drain at least 1 gigajoule of power using a power sink." sabotage_type = "powersink" @@ -41,8 +44,7 @@ for(var/datum/powernet/PN in GLOB.powernets) for(var/obj/item/powersink/sink in PN.nodes) sink_found_this_time = TRUE - if(sink.power_drained>1e9) - return TRUE + won = max(won,sink.power_drained/1e9) sink_found = sink_found_this_time count = 0 return FALSE @@ -59,7 +61,7 @@ " /datum/sabotage_objective/processing/supermatter - name = "Sabotage the supermatter so that it goes under 50% integrity." + name = "Sabotage the supermatter so that it goes under 50% integrity. If it is delaminated, you will fail." sabotage_type = "supermatter" special_equipment = list(/obj/item/paper/guides/antag/supermatter_sabotage) var/list/supermatters = list() @@ -73,9 +75,8 @@ if (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z))) continue supermatters.Add(S) - for(var/obj/machinery/power/supermatter_crystal/S in supermatters) - if(S.get_integrity() < 50) - return TRUE + for(var/obj/machinery/power/supermatter_crystal/S in supermatters) // you can win this with a wishgranter... lol. + won = max(1-((S.get_integrity()-50)/50),won) return FALSE /datum/sabotage_objective/station_integrity @@ -83,7 +84,7 @@ sabotage_type = "integrity" /datum/sabotage_objective/station_integrity/check_conditions() - return SSticker.station_integrity < 80 + return 100/(100-max(SSticker.station_integrity,80)) /datum/sabotage_objective/cloner name = "Destroy all Nanotrasen cloning machines." diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index b376287f7a..027abc7c94 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -37,11 +37,14 @@ var/objective_count = 1 for(var/datum/objective/objective in objectives) if(objective.completable) - if(objective.check_completion()) + var/completion = objective.check_completion() + if(completion >= 1) report += "Objective #[objective_count]: [objective.explanation_text] Success!" - else + else if(completion <= 0) report += "Objective #[objective_count]: [objective.explanation_text] Fail." win = FALSE + else + report += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%" else report += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 22a343fb5f..2292006da1 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -109,11 +109,14 @@ var/objective_count = 1 for(var/datum/objective/objective in objectives) if(objective.completable) - if(objective.check_completion()) + var/completion = objective.check_completion() + if(completion >= 1) parts += "Objective #[objective_count]: [objective.explanation_text] Success!" - else + else if(completion <= 0) parts += "Objective #[objective_count]: [objective.explanation_text] Fail." win = FALSE + else + parts += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%" else parts += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 7d702ac25d..a81c409233 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -54,8 +54,10 @@ var/honorific if(owner.current.gender == FEMALE) honorific = "Ms." - else + else if(owner.current.gender == MALE) honorific = "Mr." + else + honorific = "Mx." if(GLOB.possible_changeling_IDs.len) changelingID = pick(GLOB.possible_changeling_IDs) GLOB.possible_changeling_IDs -= changelingID @@ -553,11 +555,14 @@ var/count = 1 for(var/datum/objective/objective in objectives) if(objective.completable) - if(objective.check_completion()) + var/completion = objective.check_completion() + if(completion >= 1) parts += "Objective #[count]: [objective.explanation_text] Success!" - else + else if(completion <= 0) parts += "Objective #[count]: [objective.explanation_text] Fail." changelingwin = FALSE + else + parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else parts += "Objective #[count]: [objective.explanation_text]" count++ diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index df2383f892..6f9cf78514 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -425,10 +425,13 @@ parts += "The cultists' objectives were:" var/count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - parts += "Objective #[count]: [objective.explanation_text] Success!" + var/completion = objective.check_completion() + if(completion >= 1) + parts += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + parts += "Objective #[count]: [objective.explanation_text] Fail." else - parts += "Objective #[count]: [objective.explanation_text] Fail." + parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" count++ if(members.len) diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index 1aef9ceba6..3d3de3bab2 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -44,11 +44,14 @@ var/objectives_text = "" var/count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - objectives_text += "
Objective #[count]: [objective.explanation_text] Success!" - else - objectives_text += "
Objective #[count]: [objective.explanation_text] Fail." + var/completion = objective.check_completion() + if(completion >= 1) + result += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + result += "Objective #[count]: [objective.explanation_text] Fail." win = FALSE + else + result += "Objective #[count]: [objective.explanation_text] [completion*100]%" count++ result += objectives_text diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 3385991116..01d3dd5694 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -384,11 +384,14 @@ var/count = 1 for(var/datum/objective/objective in objectives) if(objective.completable) - if(objective.check_completion()) - objectives_text += "Objective #[count]: [objective.explanation_text] Success!" - else - objectives_text += "Objective #[count]: [objective.explanation_text] Fail." + var/completion = objective.check_completion() + if(completion >= 1) + result += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + result += "Objective #[count]: [objective.explanation_text] Fail." traitorwin = FALSE + else + result += "Objective #[count]: [objective.explanation_text] [completion*100]%" else objectives_text += "Objective #[count]: [objective.explanation_text]" count++ diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index cc3cde79e4..3fd0d3263c 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -266,11 +266,14 @@ var/count = 1 var/wizardwin = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - parts += "Objective #[count]: [objective.explanation_text] Success!" - else + var/completion = objective.check_completion() + if(completion >= 1) + parts += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) parts += "Objective #[count]: [objective.explanation_text] Fail." - wizardwin = 0 + wizardwin = FALSE + else + parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" count++ if(wizardwin) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 6ee9e6e824..9f3d8911ec 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -151,6 +151,7 @@ h1.alert, h2.alert {color: #000000;} .extremelybig {font-size: 5;} .greentext {color: #00FF00; font-size: 3;} .redtext {color: #FF0000; font-size: 3;} +.yellowtext {color: #FFCC00; font-size: 3;} .clown {color: #FF69Bf; font-size: 3; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;} .his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;} .spooky {color: #FF9100;} From 809f57a15d37fe2fb894214ea6b44d499f96c864 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 31 Jan 2020 12:25:19 -0800 Subject: [PATCH 021/118] also added kill-once objectives --- code/datums/mind.dm | 1 + code/game/gamemodes/objective.dm | 24 +++++++++++++++++++ code/modules/antagonists/ninja/ninja.dm | 4 ++-- .../antagonists/traitor/datum_traitor.dm | 13 ++++++---- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 464ea37d02..628e698ae0 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -458,6 +458,7 @@ var/list/allowed_types = list( /datum/objective/assassinate, + /datum/objective/assassinate/once, /datum/objective/maroon, /datum/objective/debrain, /datum/objective/protect, diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a9c9e227df..d7ee749f34 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -173,6 +173,30 @@ GLOBAL_LIST_EMPTY(objectives) /datum/objective/assassinate/admin_edit(mob/admin) admin_simple_target_pick(admin) +/datum/objective/assassinate/once + name = "kill once" + var/won = FALSE + +/datum/objective/assassinate/once/update_explanation_text() + ..() + if(target && target.current) + explanation_text = "Kill [target.name], the [!target_role_type ? target.assigned_role : target.special_role]. You only need to kill [target.p_them()] once; if they come back, you've still succeeded." + else + explanation_text = "Free Objective" + +/datum/objective/assassinate/once/find_target_by_role() + . = ..() + if(.) + START_PROCESSING(SSprocessing,src) + +/datum/objective/assassinate/once/check_completion() + return won || ..() + +/datum/objective/assassinate/once/process() + won = check_completion() + if(won) + STOP_PROCESSING(SSprocessing,src) + /datum/objective/assassinate/internal var/stolen = 0 //Have we already eliminated this target? diff --git a/code/modules/antagonists/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm index fe83e2fb2b..42412709fa 100644 --- a/code/modules/antagonists/ninja/ninja.dm +++ b/code/modules/antagonists/ninja/ninja.dm @@ -62,10 +62,10 @@ possible_targets.Cut(index,index+1) if(is_bad_guy ^ helping_station) //kill (good-ninja + bad-guy or bad-ninja + good-guy) - var/datum/objective/assassinate/O = new /datum/objective/assassinate() + var/datum/objective/assassinate/once/O = new /datum/objective/assassinate() O.owner = owner O.target = M - O.explanation_text = "Slay \the [M.current.real_name], the [M.assigned_role]." + O.explanation_text = "Slay \the [M.current.real_name], the [M.assigned_role]. You may let [M.p_they()] live, if they come back from death." objectives += O else //protect var/datum/objective/protect/O = new /datum/objective/protect() diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 01d3dd5694..f584b6c149 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -191,28 +191,33 @@ maroon_objective.owner = owner maroon_objective.find_target() add_objective(maroon_objective) - else + else if(prob(30)) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = owner kill_objective.find_target() add_objective(kill_objective) + else + var/datum/objective/assassinate/once/kill_objective = new + kill_objective.owner = owner + kill_objective.find_target() + add_objective(kill_objective) else if(prob(15) && !(locate(/datum/objective/download) in objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist"))) var/datum/objective/download/download_objective = new download_objective.owner = owner download_objective.gen_amount_goal() add_objective(download_objective) - else if(prob(40)) + else if(prob(33)) // cum. not counting download: 33%. yes, i do know 33/33 won't be equal and that i want 33/50 for that var/datum/objective/steal/steal_objective = new steal_objective.owner = owner steal_objective.find_target() add_objective(steal_objective) - else if(prob(40)) + else if(prob(33)) // cum. not counting download: 22.11% var/datum/objective/sabotage/sabotage_objective = new sabotage_objective.owner = owner sabotage_objective.find_target() add_objective(sabotage_objective) - else + else // cum. not counting download: 44.89% var/datum/objective/flavor/traitor/flavor_objective = new flavor_objective.owner = owner flavor_objective.forge_objective() From 425f532f767bff16d66a986dea91e05ea8f0e93b Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 31 Jan 2020 13:12:50 -0800 Subject: [PATCH 022/118] WHOOPS --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index d7ee749f34..1fdb621866 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -184,7 +184,7 @@ GLOBAL_LIST_EMPTY(objectives) else explanation_text = "Free Objective" -/datum/objective/assassinate/once/find_target_by_role() +/datum/objective/assassinate/once/find_target_by_role(role, role_type=0, invert=0) . = ..() if(.) START_PROCESSING(SSprocessing,src) From 3d9e84a3f8a9c5cfe1c160e17bf3be0ee7ef1901 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 00:23:45 -0800 Subject: [PATCH 023/118] Tweaks and fixes --- code/__HELPERS/roundend.dm | 12 +++++++++--- code/game/gamemodes/objective_sabotage.dm | 2 +- code/modules/antagonists/cult/cult.dm | 15 +++++++++------ .../antagonists/disease/disease_datum.dm | 17 ++++++++++------- code/modules/antagonists/wizard/wizard.dm | 17 ++++++++++------- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 906f60d65b..535f1154e7 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -557,10 +557,16 @@ var/list/objective_parts = list() var/count = 1 for(var/datum/objective/objective in objectives) - if(objective.check_completion()) - objective_parts += "Objective #[count]: [objective.explanation_text] Success!" + if(objective.completable) + var/completion = objective.check_completion() + if(completion >= 1) + objective_parts += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + objective_parts += "Objective #[count]: [objective.explanation_text] Fail." + else + objective_parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - objective_parts += "Objective #[count]: [objective.explanation_text] Fail." + objective_parts += "Objective #[count]: [objective.explanation_text]" count++ return objective_parts.Join("
") diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm index 467983a346..248524f1d2 100644 --- a/code/game/gamemodes/objective_sabotage.dm +++ b/code/game/gamemodes/objective_sabotage.dm @@ -84,7 +84,7 @@ sabotage_type = "integrity" /datum/sabotage_objective/station_integrity/check_conditions() - return 100/(100-max(SSticker.station_integrity,80)) + return 5-(max(SSticker.station_integrity*4,320)/80) /datum/sabotage_objective/cloner name = "Destroy all Nanotrasen cloning machines." diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 6f9cf78514..2b6c24f8dc 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -425,13 +425,16 @@ parts += "The cultists' objectives were:" var/count = 1 for(var/datum/objective/objective in objectives) - var/completion = objective.check_completion() - if(completion >= 1) - parts += "Objective #[count]: [objective.explanation_text] Success!" - else if(completion <= 0) - parts += "Objective #[count]: [objective.explanation_text] Fail." + if(objective.completable) + var/completion = objective.check_completion() + if(completion >= 1) + parts += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + parts += "Objective #[count]: [objective.explanation_text] Fail." + else + parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(members.len) diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index 3d3de3bab2..3c7de589d9 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -44,14 +44,17 @@ var/objectives_text = "" var/count = 1 for(var/datum/objective/objective in objectives) - var/completion = objective.check_completion() - if(completion >= 1) - result += "Objective #[count]: [objective.explanation_text] Success!" - else if(completion <= 0) - result += "Objective #[count]: [objective.explanation_text] Fail." - win = FALSE + if(objective.completable) + var/completion = objective.check_completion() + if(completion >= 1) + result += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + result += "Objective #[count]: [objective.explanation_text] Fail." + win = FALSE + else + result += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - result += "Objective #[count]: [objective.explanation_text] [completion*100]%" + result += "Objective #[count]: [objective.explanation_text]" count++ result += objectives_text diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 3fd0d3263c..c5e365d4eb 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -266,14 +266,17 @@ var/count = 1 var/wizardwin = 1 for(var/datum/objective/objective in objectives) - var/completion = objective.check_completion() - if(completion >= 1) - parts += "Objective #[count]: [objective.explanation_text] Success!" - else if(completion <= 0) - parts += "Objective #[count]: [objective.explanation_text] Fail." - wizardwin = FALSE + if(objective.completable) + var/completion = objective.check_completion() + if(completion >= 1) + parts += "Objective #[count]: [objective.explanation_text] Success!" + else if(completion <= 0) + parts += "Objective #[count]: [objective.explanation_text] Fail." + wizardwin = FALSE + else + parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(wizardwin) From 847e6382c0b53f958dc10bc723b3073384079a0f Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 00:32:08 -0800 Subject: [PATCH 024/118] fixes some quirk stuff --- code/controllers/subsystem/processing/quirks.dm | 6 +++--- code/modules/antagonists/_common/antag_datum.dm | 12 ++++++------ code/modules/antagonists/survivalist/survivalist.dm | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index a52bcf4607..10655981e5 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -35,7 +35,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) var/list/my_quirks = cli.prefs.all_quirks.Copy() var/list/cut if(job?.blacklisted_quirks) - cut = filter_quirks(my_quirks, job) + cut = filter_quirks(my_quirks, job.blacklisted_quirks) for(var/V in my_quirks) var/datum/quirk/Q = quirks[V] if(Q) @@ -63,11 +63,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks) for(var/i in quirk_names) . += quirk_points_by_name(i) -/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, datum/job/job) +/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, list/blacklisted_quirks) var/list/cut = list() var/list/banned_names = list() var/pointscut = 0 - for(var/i in job.blacklisted_quirks) + for(var/i in blacklisted_quirks) var/name = quirk_name_by_path(i) if(name) banned_names += name diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index eafe4f4ec7..5921b465e2 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(antagonists) var/show_in_antagpanel = TRUE //This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type - var/list/blacklisted_quirks = list("Pacifist","Mute") // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. + var/list/blacklisted_quirks = list(/datum/quirk/nonviolent,/datum/quirk/mute) // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. /datum/antagonist/New() GLOB.antagonists += src @@ -122,12 +122,12 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist/proc/remove_blacklisted_quirks() var/mob/living/L = owner if(istype(L)) - for(var/q in L.roundstart_quirks) + var/list/cut = list() + cut = SSquirks.filter_quirks(L.roundstart_quirks,blacklisted_quirks) + for(var/q in cut) var/datum/quirk/Q = q - if(Q.name in blacklisted_quirks) - if(Q.antag_removal_text) - to_chat(L, "[Q.antag_removal_text]") - L.remove_quirk(Q.type) + if(Q.antag_removal_text) + to_chat(L, "[Q.antag_removal_text]") //Returns the team antagonist belongs to if any. /datum/antagonist/proc/get_team() diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm index 1b870ec389..0b66e8cb23 100644 --- a/code/modules/antagonists/survivalist/survivalist.dm +++ b/code/modules/antagonists/survivalist/survivalist.dm @@ -2,7 +2,7 @@ name = "Survivalist" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE - blacklisted_quirks = list("Pacifist") // mutes are allowed + blacklisted_quirks = list(/datum/quirk/nonviolent) // mutes are allowed var/greet_message = "" /datum/antagonist/survivalist/proc/forge_objectives() From 7e3ea27ff46e0e51c09194ace0a106509a1590d8 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 00:42:25 -0800 Subject: [PATCH 025/118] dumb formatting. dumb dumb. --- code/modules/antagonists/traitor/datum_traitor.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index f584b6c149..830555e9a2 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -207,17 +207,17 @@ download_objective.owner = owner download_objective.gen_amount_goal() add_objective(download_objective) - else if(prob(33)) // cum. not counting download: 33%. yes, i do know 33/33 won't be equal and that i want 33/50 for that + else if(prob(40)) // cum. not counting download: 40%. var/datum/objective/steal/steal_objective = new steal_objective.owner = owner steal_objective.find_target() add_objective(steal_objective) - else if(prob(33)) // cum. not counting download: 22.11% + else if(prob(100/3)) // cum. not counting download: 20%. var/datum/objective/sabotage/sabotage_objective = new sabotage_objective.owner = owner sabotage_objective.find_target() add_objective(sabotage_objective) - else // cum. not counting download: 44.89% + else // cum. not counting download: 40% var/datum/objective/flavor/traitor/flavor_objective = new flavor_objective.owner = owner flavor_objective.forge_objective() @@ -391,12 +391,12 @@ if(objective.completable) var/completion = objective.check_completion() if(completion >= 1) - result += "Objective #[count]: [objective.explanation_text] Success!" + objectives_text += "Objective #[count]: [objective.explanation_text] Success!" else if(completion <= 0) - result += "Objective #[count]: [objective.explanation_text] Fail." + objectives_text += "Objective #[count]: [objective.explanation_text] Fail." traitorwin = FALSE else - result += "Objective #[count]: [objective.explanation_text] [completion*100]%" + objectives_text += "Objective #[count]: [objective.explanation_text] [completion*100]%" else objectives_text += "Objective #[count]: [objective.explanation_text]" count++ From 50a53c6558f156de3bd827bb05e190928425826a Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 00:47:44 -0800 Subject: [PATCH 026/118] aaand a formatting oddity --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 1fdb621866..db6d0a6672 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(objectives) /datum/objective/assassinate/once/update_explanation_text() ..() if(target && target.current) - explanation_text = "Kill [target.name], the [!target_role_type ? target.assigned_role : target.special_role]. You only need to kill [target.p_them()] once; if they come back, you've still succeeded." + explanation_text = "Kill [target.name], the [!target_role_type ? target.assigned_role : target.special_role]. You only need to kill them once; if they come back, you've still succeeded." else explanation_text = "Free Objective" From d6d01d848cd6c6e78f40698d3e85fafe473c3bf8 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 06:01:54 -0800 Subject: [PATCH 027/118] --- code/__HELPERS/roundend.dm | 2 +- code/datums/mind.dm | 8 ++++---- code/game/gamemodes/objective.dm | 3 +++ code/modules/antagonists/_common/antag_team.dm | 2 +- code/modules/antagonists/bloodsucker/datum_bloodsucker.dm | 2 +- code/modules/antagonists/brother/brother.dm | 2 +- code/modules/antagonists/changeling/changeling.dm | 2 +- code/modules/antagonists/cult/cult.dm | 2 +- code/modules/antagonists/disease/disease_datum.dm | 2 +- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- code/modules/antagonists/wizard/wizard.dm | 2 +- 11 files changed, 16 insertions(+), 13 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 535f1154e7..c42d60c88f 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -566,7 +566,7 @@ else objective_parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - objective_parts += "Objective #[count]: [objective.explanation_text]" + objective_parts += "Objective #[count]: [objective.explanation_text]" count++ return objective_parts.Join("
") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 628e698ae0..aa1a2ed55f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -374,7 +374,7 @@ output += "Objectives:" var/obj_count = 1 for(var/datum/objective/objective in all_objectives) - output += "
Objective #[obj_count++]: [objective.explanation_text]" + output += "
Objective #[obj_count++]: [objective.explanation_text]" var/list/datum/mind/other_owners = objective.get_owners() - src if(other_owners.len) output += "
    " @@ -523,8 +523,8 @@ to_chat(usr,"Invalid objective.") return qdel(objective) //TODO: Needs cleaning objective destroys (whatever that means) - message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]") - log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]") + message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]") + log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]") else if(href_list["obj_completed"]) var/datum/objective/objective @@ -537,7 +537,7 @@ to_chat(usr,"Invalid objective.") return objective.completed = !objective.completed - log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]") + log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]") else if (href_list["silicon"]) switch(href_list["silicon"]) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index db6d0a6672..c044680302 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1157,3 +1157,6 @@ GLOBAL_LIST_EMPTY(possible_sabotages) /datum/objective/flavor/wizard flavor_file = "strings/flavor_objectives/wizard.txt" + +/datum/objective/flavor/bloodsucker + flavor_file = "strings/flavor_objectives/bloodsucker.txt" diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index 027abc7c94..958a50460c 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -46,7 +46,7 @@ else report += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%" else - report += "Objective #[objective_count]: [objective.explanation_text]" + report += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ if(win) report += "The [name] was successful!" diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index 844b523135..a768978583 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -372,7 +372,7 @@ datum/antagonist/bloodsucker/proc/SpendRank() protege_objective.generate_objective() add_objective(protege_objective) - if (rand(0,1) == 0) + if (prob(50)) // Heart Thief Objective var/datum/objective/bloodsucker/heartthief/heartthief_objective = new heartthief_objective.owner = owner diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 2292006da1..7d2bd45827 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -118,7 +118,7 @@ else parts += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[objective_count]: [objective.explanation_text]" + parts += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ if(win) parts += "The blood brothers were successful!" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index a81c409233..7afe336319 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -564,7 +564,7 @@ else parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(changelingwin) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 2b6c24f8dc..278746db5a 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -434,7 +434,7 @@ else parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(members.len) diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index 3c7de589d9..b118aeb308 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -54,7 +54,7 @@ else result += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - result += "Objective #[count]: [objective.explanation_text]" + result += "Objective #[count]: [objective.explanation_text]" count++ result += objectives_text diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 830555e9a2..480264297e 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -398,7 +398,7 @@ else objectives_text += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - objectives_text += "Objective #[count]: [objective.explanation_text]" + objectives_text += "Objective #[count]: [objective.explanation_text]" count++ if(uplink_true) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index c5e365d4eb..42b09abf38 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -276,7 +276,7 @@ else parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(wizardwin) From e812844c704606c69d4480e760a70f72753f0b3e Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 21:05:27 -0800 Subject: [PATCH 028/118] Revert "" This reverts commit d6d01d848cd6c6e78f40698d3e85fafe473c3bf8. --- code/__HELPERS/roundend.dm | 2 +- code/datums/mind.dm | 8 ++++---- code/game/gamemodes/objective.dm | 3 --- code/modules/antagonists/_common/antag_team.dm | 2 +- code/modules/antagonists/bloodsucker/datum_bloodsucker.dm | 2 +- code/modules/antagonists/brother/brother.dm | 2 +- code/modules/antagonists/changeling/changeling.dm | 2 +- code/modules/antagonists/cult/cult.dm | 2 +- code/modules/antagonists/disease/disease_datum.dm | 2 +- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- code/modules/antagonists/wizard/wizard.dm | 2 +- 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index c42d60c88f..535f1154e7 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -566,7 +566,7 @@ else objective_parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - objective_parts += "Objective #[count]: [objective.explanation_text]" + objective_parts += "Objective #[count]: [objective.explanation_text]" count++ return objective_parts.Join("
    ") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index aa1a2ed55f..628e698ae0 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -374,7 +374,7 @@ output += "Objectives:" var/obj_count = 1 for(var/datum/objective/objective in all_objectives) - output += "
    Objective #[obj_count++]: [objective.explanation_text]" + output += "
    Objective #[obj_count++]: [objective.explanation_text]" var/list/datum/mind/other_owners = objective.get_owners() - src if(other_owners.len) output += "
      " @@ -523,8 +523,8 @@ to_chat(usr,"Invalid objective.") return qdel(objective) //TODO: Needs cleaning objective destroys (whatever that means) - message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]") - log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]") + message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]") + log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]") else if(href_list["obj_completed"]) var/datum/objective/objective @@ -537,7 +537,7 @@ to_chat(usr,"Invalid objective.") return objective.completed = !objective.completed - log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]") + log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]") else if (href_list["silicon"]) switch(href_list["silicon"]) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c044680302..db6d0a6672 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1157,6 +1157,3 @@ GLOBAL_LIST_EMPTY(possible_sabotages) /datum/objective/flavor/wizard flavor_file = "strings/flavor_objectives/wizard.txt" - -/datum/objective/flavor/bloodsucker - flavor_file = "strings/flavor_objectives/bloodsucker.txt" diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index 958a50460c..027abc7c94 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -46,7 +46,7 @@ else report += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%" else - report += "Objective #[objective_count]: [objective.explanation_text]" + report += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ if(win) report += "The [name] was successful!" diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index a768978583..844b523135 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -372,7 +372,7 @@ datum/antagonist/bloodsucker/proc/SpendRank() protege_objective.generate_objective() add_objective(protege_objective) - if (prob(50)) + if (rand(0,1) == 0) // Heart Thief Objective var/datum/objective/bloodsucker/heartthief/heartthief_objective = new heartthief_objective.owner = owner diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 7d2bd45827..2292006da1 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -118,7 +118,7 @@ else parts += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[objective_count]: [objective.explanation_text]" + parts += "Objective #[objective_count]: [objective.explanation_text]" objective_count++ if(win) parts += "The blood brothers were successful!" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 7afe336319..a81c409233 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -564,7 +564,7 @@ else parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(changelingwin) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 278746db5a..2b6c24f8dc 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -434,7 +434,7 @@ else parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(members.len) diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index b118aeb308..3c7de589d9 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -54,7 +54,7 @@ else result += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - result += "Objective #[count]: [objective.explanation_text]" + result += "Objective #[count]: [objective.explanation_text]" count++ result += objectives_text diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 480264297e..830555e9a2 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -398,7 +398,7 @@ else objectives_text += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - objectives_text += "Objective #[count]: [objective.explanation_text]" + objectives_text += "Objective #[count]: [objective.explanation_text]" count++ if(uplink_true) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 42b09abf38..c5e365d4eb 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -276,7 +276,7 @@ else parts += "Objective #[count]: [objective.explanation_text] [completion*100]%" else - parts += "Objective #[count]: [objective.explanation_text]" + parts += "Objective #[count]: [objective.explanation_text]" count++ if(wizardwin) From dd63e8cf84798b4df6e00d4dc9c2455ce42c7766 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 1 Feb 2020 21:07:21 -0800 Subject: [PATCH 029/118] oofies --- code/modules/antagonists/traitor/datum_traitor.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 830555e9a2..3180c1b305 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -391,14 +391,14 @@ if(objective.completable) var/completion = objective.check_completion() if(completion >= 1) - objectives_text += "Objective #[count]: [objective.explanation_text] Success!" + objectives_text += "
      Objective #[count]: [objective.explanation_text] Success!" else if(completion <= 0) - objectives_text += "Objective #[count]: [objective.explanation_text] Fail." + objectives_text += "
      Objective #[count]: [objective.explanation_text] Fail." traitorwin = FALSE else - objectives_text += "Objective #[count]: [objective.explanation_text] [completion*100]%" + objectives_text += "
      Objective #[count]: [objective.explanation_text] [completion*100]%" else - objectives_text += "Objective #[count]: [objective.explanation_text]" + objectives_text += "
      Objective #[count]: [objective.explanation_text]" count++ if(uplink_true) From 07a4515b2392be3e8f6a3aab16253ca06f7a00bc Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Mon, 3 Feb 2020 15:03:16 +1100 Subject: [PATCH 030/118] Thankfully I didn't fuck it up this way --- _maps/map_files/MetaStation/MetaStation.dmm | 16 ++++++++-------- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index cd50d90edb..145d35f650 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -29753,15 +29753,15 @@ /obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, /obj/item/clothing/under/rank/security/navyblue, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/under/rank/warden/navyblue, +/obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/suit/armor/vest/warden/navyblue, /obj/item/clothing/suit/security/warden, -/obj/item/clothing/under/rank/head_of_security/navyblue, +/obj/item/clothing/suit/armor/hos/navyblue, /obj/item/clothing/suit/security/hos, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 2947395ccb..8967c9f0fa 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2564,7 +2564,7 @@ "aij" = ( /obj/structure/closet/secure_closet/contraband/armory, /obj/item/poster/random_contraband, -/obj/item/clothing/suit/security/officer/russian, +/obj/item/clothing/suit/armor/navyblue/russian, /obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/dark, /area/security/armory) From 0779b67accc1772154397ce16bdb5aefd348b720 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Mon, 3 Feb 2020 15:51:07 +1100 Subject: [PATCH 031/118] whoops --- _maps/map_files/MetaStation/MetaStation.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 145d35f650..f030044712 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -29759,10 +29759,10 @@ /obj/item/clothing/suit/armor/navyblue, /obj/item/clothing/suit/armor/navyblue, /obj/item/clothing/suit/armor/navyblue, +/obj/item/clothing/under/rank/warden/navyblue, /obj/item/clothing/suit/armor/vest/warden/navyblue, -/obj/item/clothing/suit/security/warden, +/obj/item/clothing/under/rank/head_of_security/navyblue, /obj/item/clothing/suit/armor/hos/navyblue, -/obj/item/clothing/suit/security/hos, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, From f2fd48bfd9a2c2900d50f30a0f9357a1fd90d3cc Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 3 Feb 2020 08:31:12 +0100 Subject: [PATCH 032/118] Update holosign.dm --- code/game/objects/structures/holosign.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 9d22f669d5..c20fbcfcca 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -8,14 +8,16 @@ max_integrity = 1 armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20) var/obj/item/holosign_creator/projector + var/init_vis_overlay = TRUE /obj/structure/holosign/Initialize(mapload, source_projector) . = ..() if(source_projector) projector = source_projector projector.signs += src - SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, alpha, RESET_ALPHA) //you see mobs under it, but you hit them like they are above it - alpha = 0 + if(init_vis_overlay) + SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, alpha, RESET_ALPHA) //you see mobs under it, but you hit them like they are above it + alpha = 0 /obj/structure/holosign/Destroy() if(projector) @@ -76,6 +78,7 @@ anchored = TRUE CanAtmosPass = ATMOS_PASS_NO alpha = 150 + init_vis_overlay = FALSE /obj/structure/holosign/barrier/atmos/Initialize() . = ..() @@ -101,6 +104,7 @@ density = FALSE anchored = TRUE alpha = 150 + init_vis_overlay = FALSE CanAtmosPass = ATMOS_PASS_NO resistance_flags = FIRE_PROOF From ccd557122c730cfd6bb51766ec2a26bc52399e25 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 3 Feb 2020 08:35:47 +0100 Subject: [PATCH 033/118] Update holosign.dm --- code/game/objects/structures/holosign.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index c20fbcfcca..92fda29101 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -76,6 +76,7 @@ icon_state = "holo_fan" density = FALSE anchored = TRUE + layer = ABOVE_NORMAL_TURF_LAYER CanAtmosPass = ATMOS_PASS_NO alpha = 150 init_vis_overlay = FALSE @@ -103,6 +104,7 @@ max_integrity = 30 density = FALSE anchored = TRUE + layer = ABOVE_NORMAL_TURF_LAYER alpha = 150 init_vis_overlay = FALSE CanAtmosPass = ATMOS_PASS_NO From 76e34c7e0f95731527db6134999033388bfc34a4 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 3 Feb 2020 08:48:12 +0100 Subject: [PATCH 034/118] Update update_icons.dm --- code/modules/mob/living/carbon/human/update_icons.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index fa6cc44fca..f1b1570e24 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -182,10 +182,10 @@ There are several things that need to be remembered: if(!gloves && bloody_hands) var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER, color = blood_DNA_to_color()) - if(get_num_arms() < 2) - if(has_left_hand()) + if(get_num_arms(FALSE) < 2) + if(has_left_hand(FALSE)) bloody_overlay.icon_state = "bloodyhands_left" - else if(has_right_hand()) + else if(has_right_hand(FALSE)) bloody_overlay.icon_state = "bloodyhands_right" overlays_standing[GLOVES_LAYER] = bloody_overlay @@ -265,7 +265,7 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_inv_shoes() remove_overlay(SHOES_LAYER) - if(get_num_legs() <2) + if(get_num_legs(FALSE) <2) return if(client && hud_used) From 52432ed0a760909eda17878d91321fd8d13a98e8 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 3 Feb 2020 07:12:27 -0800 Subject: [PATCH 035/118] too many dynamic changes for my sanity --- code/__DEFINES/dynamic.dm | 1 + code/__DEFINES/role_preferences.dm | 1 + code/__DEFINES/vote.dm | 1 + .../configuration/configuration.dm | 23 +++++++ .../configuration/entries/dynamic.dm | 4 ++ code/controllers/subsystem/persistence.dm | 7 +-- code/controllers/subsystem/vote.dm | 61 +++++++++++------- code/game/gamemodes/dynamic/dynamic.dm | 15 ++++- .../dynamic/dynamic_rulesets_latejoin.dm | 30 +++++++-- .../dynamic/dynamic_rulesets_midround.dm | 2 +- .../gamemodes/dynamic/dynamic_storytellers.dm | 62 ++++++++++++++----- config/dynamic_config.txt | 14 +++++ tgstation.dme | 1 + 13 files changed, 170 insertions(+), 52 deletions(-) diff --git a/code/__DEFINES/dynamic.dm b/code/__DEFINES/dynamic.dm index 45c1ba9cb2..0d57961f48 100644 --- a/code/__DEFINES/dynamic.dm +++ b/code/__DEFINES/dynamic.dm @@ -5,6 +5,7 @@ #define NO_ASSASSIN (1<<0) #define WAROPS_ALWAYS_ALLOWED (1<<1) +#define USE_PREF_WEIGHTS (1<<2) #define ONLY_RULESET (1<<0) #define HIGHLANDER_RULESET (1<<1) diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 28a04c2a51..7fabb74157 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -38,6 +38,7 @@ #define ROLE_BLOODSUCKER "bloodsucker" //#define ROLE_MONSTERHUNTER "monster hunter" Disabled for now #define ROLE_GHOSTCAFE "ghostcafe" +#define ROLE_MINOR_ANTAG "minorantag" //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR. //The gamemode specific ones are just so the gamemodes can query whether a player is old enough //(in game days played) to play that role diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm index 8fb2e6deab..6553447029 100644 --- a/code/__DEFINES/vote.dm +++ b/code/__DEFINES/vote.dm @@ -2,5 +2,6 @@ #define APPROVAL_VOTING 1 #define RANKED_CHOICE_VOTING 2 #define SCORE_VOTING 3 +#define MAJORITY_JUDGEMENT_VOTING 4 GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great")) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 79d125f608..974a0c0e88 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -364,6 +364,29 @@ runnable_modes[M] = final_weight return runnable_modes +/datum/controller/configuration/proc/get_runnable_storytellers() + var/list/datum/dynamic_storyteller/runnable_storytellers = new + var/list/probabilities = Get(/datum/config_entry/keyed_list/storyteller_weight) + var/list/repeated_mode_adjust = Get(/datum/config_entry/number_list/repeated_mode_adjust) + for(var/T in storyteller_cache) + var/datum/dynamic_storyteller/S = T + var/config_tag = initial(S.config_tag) + var/final_weight = initial(S.weight) + if(probabilities[config_tag]<=0) + continue + final_weight = probabilities[config_tag] + if(SSpersistence.saved_storytellers.len == 3 && repeated_mode_adjust.len == 3) + var/name = initial(S.name) + var/recent_round = min(SSpersistence.saved_storytellers.Find(name),3) + var/adjustment = 0 + while(recent_round) + adjustment += repeated_mode_adjust[recent_round] + recent_round = SSpersistence.saved_modes.Find(name,recent_round+1,0) + final_weight *= ((100-adjustment)/100) + runnable_storytellers[S] = final_weight + return runnable_storytellers + + /datum/controller/configuration/proc/get_runnable_midround_modes(crew) var/list/datum/game_mode/runnable_modes = new var/list/probabilities = Get(/datum/config_entry/keyed_list/probability) diff --git a/code/controllers/configuration/entries/dynamic.dm b/code/controllers/configuration/entries/dynamic.dm index 7f3e16d57e..4c03de4678 100644 --- a/code/controllers/configuration/entries/dynamic.dm +++ b/code/controllers/configuration/entries/dynamic.dm @@ -88,3 +88,7 @@ /datum/config_entry/number/dynamic_warops_cost config_entry_value = 10 min_val = 0 + +/datum/config_entry/keyed_list/storyteller_weight + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_NUM diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index e43c8f21a2..eecee740c9 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(persistence) var/list/saved_messages = list() var/list/saved_modes = list(1,2,3) var/list/saved_dynamic_rules = list(list(),list(),list()) - var/list/saved_storytellers = list("foo","bar","baz","foo again","bar again") + var/list/saved_storytellers = list("foo","bar","baz") var/list/saved_maps var/list/saved_trophies = list() var/list/spawned_objects = list() @@ -190,6 +190,7 @@ SUBSYSTEM_DEF(persistence) if(!json) return saved_storytellers = json["data"] + saved_storytellers.len = 3 /datum/controller/subsystem/persistence/proc/LoadRecentMaps() var/json_file = file("data/RecentMaps.json") @@ -411,9 +412,7 @@ SUBSYSTEM_DEF(persistence) WRITE_FILE(json_file, json_encode(file_data)) /datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode) - saved_storytellers.len = 5 - saved_storytellers[5] = saved_storytellers[4] - saved_storytellers[4] = saved_storytellers[3] + saved_storytellers.len = 3 saved_storytellers[3] = saved_storytellers[2] saved_storytellers[2] = saved_storytellers[1] saved_storytellers[1] = mode.storyteller.name diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index c67a1620f1..67fc1cf237 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -197,11 +197,16 @@ SUBSYSTEM_DEF(vote) for(var/choice in choices) if("[choice]" in this_vote && "[choice]" in scores_by_choice) sorted_insert(scores_by_choice["[choice]"],this_vote["[choice]"],/proc/cmp_numeric_asc) - var/middle_score = round(GLOB.vote_score_options.len/2,1) + var/min_score = 100 + var/max_score = -100 for(var/score_name in scores_by_choice) var/list/score = scores_by_choice[score_name] for(var/S in score) - scores[score_name] += S-middle_score + scores[score_name] += S + max_score=max(max_score,scores[score_name]) + min_score=min(min_score,scores[score_name]) + for(var/score_name in scores) // normalize the scores from 0-1 + scores[score_name] = (scores[score_name]-min_score)/(max_score-min_score) SSblackbox.record_feedback("nested tally","voting",scores[score_name],list(blackbox_text,"Total scores",score_name)) @@ -217,16 +222,20 @@ SUBSYSTEM_DEF(vote) if(vote_system == RANKED_CHOICE_VOTING) calculate_condorcet_votes(vote_title_text) if(vote_system == SCORE_VOTING) - calculate_majority_judgement_vote(vote_title_text) calculate_scores(vote_title_text) + if(vote_system == MAJORITY_JUDGEMENT_VOTING) + calculate_majority_judgement_vote(vote_title_text) // nothing uses this at the moment var/list/winners = get_result() var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic" if(winners.len > 0) if(was_roundtype_vote) stored_gamemode_votes = list() - if(!obfuscated && vote_system == RANKED_CHOICE_VOTING) - text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" - if(mode == "mode tiers") + if(!obfuscated) + if(vote_system == RANKED_CHOICE_VOTING) + text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" + if(vote_system == MAJORITY_JUDGEMENT_VOTING) + text += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" + if(vote_system == SCORE_VOTING) for(var/score_name in scores) var/score = scores[score_name] if(!score) @@ -266,13 +275,18 @@ SUBSYSTEM_DEF(vote) SSblackbox.record_feedback("nested tally","voting",1,list(vote_title_text,"[j]\th",choices[myvote[j]])) if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results var/admintext = "Obfuscated results" - if(vote_system == RANKED_CHOICE_VOTING) - admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" - else if(vote_system == SCORE_VOTING) - admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" - for(var/i=1,i<=choices.len,i++) - var/votes = choices[choices[i]] - admintext += "\n[choices[i]]: [votes]" + if(vote_system != SCORE_VOTING) + if(vote_system == RANKED_CHOICE_VOTING) + admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" + else if(vote_system == MAJORITY_JUDGEMENT_VOTING) + admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" + for(var/i=1,i<=choices.len,i++) + var/votes = choices[choices[i]] + admintext += "\n[choices[i]]: [votes]" + else + for(var/i=1,i<=scores.len,i++) + var/score = scores[scores[i]] + admintext += "\n[scores[i]]: [score]" message_admins(admintext) return . @@ -323,7 +337,11 @@ SUBSYSTEM_DEF(vote) log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].") else GLOB.master_mode = "dynamic" - var/datum/dynamic_storyteller/S = config.pick_storyteller(.) + var/list/runnable_storytellers = config.get_runnable_storytellers() + for(var/T in runnable_storytellers) + var/datum/dynamic_storyteller/S = T + runnable_storytellers[S] *= scores[initial(S.name)] + var/datum/dynamic_storyteller/S = pickweightAllowZero(runnable_storytellers) GLOB.dynamic_storyteller_type = S if("map") var/datum/map_config/VM = config.maplist[.] @@ -444,11 +462,8 @@ SUBSYSTEM_DEF(vote) if("dynamic") for(var/T in config.storyteller_cache) var/datum/dynamic_storyteller/S = T - var/recent_rounds = 0 - for(var/i in 1 to SSpersistence.saved_storytellers.len) - if(SSpersistence.saved_storytellers[i] == initial(S.name)) - recent_rounds++ - if(recent_rounds < initial(S.weight)) + var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight) + if(probabilities[initial(S.config_tag)] > 0) choices.Add(initial(S.name)) choice_descs.Add(initial(S.desc)) choices.Add("Secret") @@ -516,7 +531,7 @@ SUBSYSTEM_DEF(vote) . += "

      Vote any number of choices.

      " if(RANKED_CHOICE_VOTING) . += "

      Vote by order of preference. Revoting will demote to the bottom. 1 is your favorite, and higher numbers are worse.

      " - if(SCORE_VOTING) + if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING) . += "

      Grade the candidates by how much you like them.

      " . += "

      No-votes have no power--your opinion is only heard if you vote!

      " . += "Time Left: [DisplayTimeText(end_time-world.time)]
        " @@ -553,7 +568,7 @@ SUBSYSTEM_DEF(vote) . += "(Saved!)" . += "(Load vote from save)" . += "(Reset votes)" - if(SCORE_VOTING) + if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING) var/list/myvote = voted[C.ckey] for(var/i=1,i<=choices.len,i++) . += "
      • [choices[i]]" @@ -656,7 +671,7 @@ SUBSYSTEM_DEF(vote) voted[usr.ckey] = SSpersistence.saved_votes[usr.ckey][mode] if(islist(voted[usr.ckey])) var/malformed = FALSE - if(vote_system == SCORE_VOTING) + if(vote_system == SCORE_VOTING || vote_system == MAJORITY_JUDGEMENT_VOTING) for(var/thing in voted[usr.ckey]) if(!(thing in choices)) malformed = TRUE @@ -670,7 +685,7 @@ SUBSYSTEM_DEF(vote) to_chat(usr,"Your saved vote was malformed! Start over!") voted -= usr.ckey else - if(vote_system == SCORE_VOTING) + if(vote_system == SCORE_VOTING || vote_system == MAJORITY_JUDGEMENT_VOTING) submit_vote(round(text2num(href_list["vote"])),round(text2num(href_list["score"]))) else submit_vote(round(text2num(href_list["vote"]))) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 821c819664..6fe52b0f8d 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -239,12 +239,20 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null) . += "Peaceful Waypoint
        " . += "Your station orbits deep within controlled, core-sector systems and serves as a waypoint for routine traffic through Nanotrasen's trade empire. Due to the combination of high security, interstellar traffic, and low strategic value, it makes any direct threat of violence unlikely. Your primary enemies will be incompetence and bored crewmen: try to organize team-building events to keep staffers interested and productive. However, even deep in our territory there may be subversive elements, especially for such a high-value target as your station. Keep an eye out, but don't expect much trouble." set_security_level(SEC_LEVEL_GREEN) + for(var/T in subtypesof(/datum/station_goal)) + var/datum/station_goal/G = new T + if(!(G in station_goals)) + station_goals += G if(21 to 79) var/perc_green = 100-round(100*((threat_level-21)/(79-21))) if(prob(perc_green)) . += "Core Territory
        " . += "Your station orbits within reliably mundane, secure space. Although Nanotrasen has a firm grip on security in your region, the valuable resources and strategic position aboard your station make it a potential target for infiltrations. Monitor crew for non-loyal behavior, but expect a relatively tame shift free of large-scale destruction. We expect great things from your station." set_security_level(SEC_LEVEL_GREEN) + for(var/T in subtypesof(/datum/station_goal)) + var/datum/station_goal/G = new T + if(!(G in station_goals)) + station_goals += G else if(prob(perc_green)) . += "Contested System
        " . += "Your station's orbit passes along the edge of Nanotrasen's sphere of influence. While subversive elements remain the most likely threat against your station, hostile organizations are bolder here, where our grip is weaker. Exercise increased caution against elite Syndicate strike forces, or Executives forbid, some kind of ill-conceived unionizing attempt." @@ -273,7 +281,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null) if(GLOB.security_level >= SEC_LEVEL_BLUE) priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", "intercept") else - priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no likely threats to [station_name()]. Have a secure shift!", "Security Report", "commandreport") + priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no likely threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", "commandreport") // Yes, this is copy pasted from game_mode /datum/game_mode/dynamic/check_finished(force_ending) @@ -346,7 +354,8 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null) generate_threat() storyteller.start_injection_cooldowns() - + SSevents.frequency_lower = storyteller.event_frequency_lower // 6 minutes by default + SSevents.frequency_upper = storyteller.event_frequency_upper // 20 minutes by default log_game("DYNAMIC: Dynamic Mode initialized with a Threat Level of... [threat_level]!") initial_threat_level = threat_level return TRUE @@ -395,7 +404,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null) /datum/game_mode/dynamic/post_setup(report) update_playercounts() - + for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) ..() diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index f4e9971a05..f6755057e2 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -47,6 +47,8 @@ assigned += M.mind M.mind.special_role = antag_flag M.mind.add_antag_datum(antag_datum) + log_admin("[M.name] was made into a [name] by dynamic.") + message_admins("[M.name] was made into a [name] by dynamic.") return TRUE ////////////////////////////////////////////// @@ -72,12 +74,6 @@ property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1) always_max_weight = TRUE -/datum/dynamic_ruleset/latejoin/infiltrator/execute() - . = ..() - for(var/datum/mind/M in assigned) - log_admin("[M.name] was made into a traitor by dynamic.") - message_admins("[M.name] was made into a traitor by dynamic.") - ////////////////////////////////////////////// // // // REVOLUTIONARY PROVOCATEUR // @@ -225,3 +221,25 @@ log_admin("[M.name] was made into a bloodsucker by dynamic.") message_admins("[M.name] was made into a bloodsucker by dynamic.") return TRUE + +////////////////////////////////////////////// +// // +// COLLECTOR // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/latejoin/collector + name = "Contraband Collector" + config_tag = "latejoin_collector" + antag_datum = /datum/antagonist/collector + antag_flag = ROLE_MINOR_ANTAG + restricted_roles = list("AI", "Cyborg") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + required_candidates = 1 + weight = 5 + cost = 1 + requirements = list(10,10,10,10,10,10,10,10,10,10) + high_population_requirement = 10 + repeatable = TRUE + flags = TRAITOR_RULESET + property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 2) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 92a02f5920..abd560171e 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -494,7 +494,7 @@ high_population_requirement = 50 repeatable_weight_decrease = 2 repeatable = TRUE - property_weights = list("story_potential" = 1, "trust" = 1, "extended" = 1, "valid" = 2, "integrity" = 2) + property_weights = list("story_potential" = 1, "trust" = 1, "extended" = 1, "valid" = 2, "integrity" = 1) var/list/spawn_locs = list() /datum/dynamic_ruleset/midround/from_ghosts/nightmare/execute() diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index afa6ed8ba7..303c436f99 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -1,5 +1,6 @@ /datum/dynamic_storyteller var/name = "none" + var/config_tag = null var/desc = "A coder's idiocy." var/list/property_weights = list() var/curve_centre = 0 @@ -7,6 +8,8 @@ var/forced_threat_level = -1 var/flags = 0 var/weight = 3 // how many rounds need to have been recently played for this storyteller to be left out of the vote + var/event_frequency_lower = 6 MINUTES + var/event_frequency_upper = 20 MINUTES var/datum/game_mode/dynamic/mode = null /** @@ -20,14 +23,6 @@ Property weights are: "conversion" -- Basically a bool. Conversion antags, well, convert. It's its own class for a good reason. */ -/datum/dynamic_storyteller/New() - ..() - if (istype(SSticker.mode, /datum/game_mode/dynamic)) - mode = SSticker.mode - GLOB.dynamic_curve_centre = curve_centre - GLOB.dynamic_curve_width = curve_width - GLOB.dynamic_forced_threat_level = forced_threat_level - /datum/dynamic_storyteller/proc/start_injection_cooldowns() var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_latejoin_delay_max + GLOB.dynamic_first_latejoin_delay_min) mode.latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_first_latejoin_delay_min, GLOB.dynamic_first_latejoin_delay_max)) + world.time @@ -42,7 +37,28 @@ Property weights are: return /datum/dynamic_storyteller/proc/on_start() - return + if (istype(SSticker.mode, /datum/game_mode/dynamic)) + mode = SSticker.mode + GLOB.dynamic_curve_centre = curve_centre + GLOB.dynamic_curve_width = curve_width + if(flags & USE_PREF_WEIGHTS) + var/voters = 0 + var/mean = 0 + for(var/client/c in GLOB.clients) + var/vote = c.prefs.preferred_chaos + if(vote) + voters += 1 + switch(vote) + if(CHAOS_NONE) + mean -= 5 + if(CHAOS_LOW) + mean -= 2.5 + if(CHAOS_HIGH) + mean += 2.5 + if(CHAOS_MAX) + mean += 5 + GLOB.dynamic_curve_centre += (mean/voters) + GLOB.dynamic_forced_threat_level = forced_threat_level /datum/dynamic_storyteller/proc/get_midround_cooldown() var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min) @@ -154,12 +170,15 @@ Property weights are: /datum/dynamic_storyteller/cowabunga name = "Chaotic" + config_tag = "chaotic" curve_centre = 10 desc = "Chaos: high. Variation: high. Likely antags: clock cult, revs, wizard." property_weights = list("extended" = -1, "chaos" = 10) - weight = 2 + weight = 1 + event_frequency_lower = 2 MINUTES + event_frequency_upper = 10 MINUTES flags = WAROPS_ALWAYS_ALLOWED - var/refund_cooldown + var/refund_cooldown = 0 /datum/dynamic_storyteller/cowabunga/get_midround_cooldown() return ..() / 4 @@ -169,12 +188,13 @@ Property weights are: /datum/dynamic_storyteller/cowabunga/do_process() if(refund_cooldown < world.time) - mode.refund_threat(10) - mode.log_threat("Cowabunga it is. Refunded 10 threat. Threat is now [mode.threat].") - refund_cooldown = world.time + 300 SECONDS + mode.refund_threat(20) + mode.log_threat("Cowabunga it is. Refunded 20 threat. Threat is now [mode.threat].") + refund_cooldown = world.time + 600 SECONDS /datum/dynamic_storyteller/team name = "Teamwork" + config_tag = "teamwork" desc = "Chaos: high. Variation: low. Likely antags: nukies, clockwork cult, wizard, blob, xenomorph." curve_centre = 2 curve_width = 1.5 @@ -187,6 +207,7 @@ Property weights are: /datum/dynamic_storyteller/conversion name = "Conversion" + config_tag = "conversion" desc = "Chaos: high. Variation: medium. Likely antags: cults, bloodsuckers, revs." curve_centre = 3 curve_width = 1 @@ -196,24 +217,33 @@ Property weights are: /datum/dynamic_storyteller/classic name = "Random" + config_tag = "random" desc = "Chaos: varies. Variation: highest. No special weights attached." weight = 6 + flags = USE_PREF_WEIGHTS curve_width = 4 /datum/dynamic_storyteller/memes name = "Story" + config_tag = "story" desc = "Chaos: varies. Variation: high. Likely antags: abductors, nukies, wizard, traitor." + weight = 4 + flags = USE_PREF_WEIGHTS curve_width = 4 property_weights = list("story_potential" = 10) /datum/dynamic_storyteller/suspicion name = "Intrigue" + config_tag = "intrigue" desc = "Chaos: low. Variation: high. Likely antags: traitor, bloodsucker. Rare: revs, blood cult." + weight = 4 + flags = USE_PREF_WEIGHTS curve_width = 4 property_weights = list("trust" = -5) /datum/dynamic_storyteller/liteextended name = "Calm" + config_tag = "calm" desc = "Chaos: low. Variation: medium. Likely antags: bloodsuckers, traitors, sentient disease, revenant." curve_centre = -5 curve_width = 0.5 @@ -226,10 +256,12 @@ Property weights are: /datum/dynamic_storyteller/extended name = "Extended" + config_tag = "extended" desc = "Chaos: none. Variation: none. Likely antags: none." curve_centre = -20 - weight = 2 + weight = 0 curve_width = 0.5 /datum/dynamic_storyteller/extended/on_start() + ..() GLOB.dynamic_forced_extended = TRUE diff --git a/config/dynamic_config.txt b/config/dynamic_config.txt index 2ddebdf37a..25bc763d0b 100644 --- a/config/dynamic_config.txt +++ b/config/dynamic_config.txt @@ -1,3 +1,13 @@ +## Dynamic storytellers weights: how likely each storyteller is to show up. This is adjusted by voting and recency. +STORYTELLER_WEIGHT CHAOTIC 2 +STORYTELLER_WEIGHT TEAMWORK 4 +STORYTELLER_WEIGHT CONVERSION 2 +STORYTELLER_WEIGHT RANDOM 6 +STORYTELLER_WEIGHT INTRIGUE 6 +STORYTELLER_WEIGHT STORY 6 +STORYTELLER_WEIGHT CALM 6 +STORYTELLER_WEIGHT EXTENDED 0 + ## Injection delays: how long (in minutes) will pass before a midround or latejoin antag is injected. DYNAMIC_MIDROUND_DELAY_MIN 5 DYNAMIC_MIDROUND_DELAY_MAX 15 @@ -92,6 +102,7 @@ DYNAMIC_WEIGHT RADIATION_STORM 1 DYNAMIC_WEIGHT LATEJOIN_TRAITOR 7 DYNAMIC_WEIGHT LATEJOIN_REVOLUTION 2 DYNAMIC_WEIGHT LATEJOIN_BLOODSUCKER 4 +DYNAMIC_WEIGHT LATEJOIN_COLLECTOR 5 ## Threat cost. This is decreased from the mode's threat when the rule is executed. DYNAMIC_COST TRAITOR 10 @@ -153,6 +164,7 @@ DYNAMIC_COST RADIATION_STORM 3 DYNAMIC_COST LATEJOIN_TRAITOR 5 DYNAMIC_COST LATEJOIN_REVOLUTION 20 DYNAMIC_COST LATEJOIN_BLOODSUCKER 10 +DYNAMIC_COST LATEJOIN_COLLECTOR 1 ## Rule will not be generated with threat levels below requirement at a pop value. Pop values are determined by dynamic's pop-per-requirement. ## By default it's 0-8, 9-17, 18-26, 27-35, 36-44, 45-53, 54-60, 61-69, 70-78, 79+. @@ -210,6 +222,7 @@ DYNAMIC_REQUIREMENTS RADIATION_STORM 5 5 5 5 5 5 5 5 5 5 DYNAMIC_REQUIREMENTS LATEJOIN_TRAITOR 40 30 20 15 15 15 15 15 15 15 DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 40 40 40 40 40 40 DYNAMIC_REQUIREMENTS LATEJOIN_BLOODSUCKER 40 30 20 15 15 15 15 15 15 15 +DYNAMIC_REQUIREMENTS LATEJOIN_COLLECTOR 10 10 10 10 10 10 10 10 10 10 ## An alternative, static requirement used instead when pop is over mode's high_pop_limit. DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 50 @@ -267,6 +280,7 @@ DYNAMIC_HIGH_POPULATION_REQUIREMENT RADIATION_STORM 5 DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_TRAITOR 15 DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_REVOLUTION 50 DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_BLOODSUCKER 15 +DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_COLLECTOR 10 ## Dynamic traitor stuff diff --git a/tgstation.dme b/tgstation.dme index 476f20cfe3..8552cbb7bc 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1391,6 +1391,7 @@ #include "code\modules\antagonists\clockcult\clock_structures\traps\brass_skewer.dm" #include "code\modules\antagonists\clockcult\clock_structures\traps\power_null.dm" #include "code\modules\antagonists\clockcult\clock_structures\traps\steam_vent.dm" +#include "code\modules\antagonists\collector\collector.dm" #include "code\modules\antagonists\cult\blood_magic.dm" #include "code\modules\antagonists\cult\cult.dm" #include "code\modules\antagonists\cult\cult_comms.dm" From 72c1f60af776d996d0ff051e4a1bca8aa58278bb Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 3 Feb 2020 08:10:34 -0800 Subject: [PATCH 036/118] and now the voting works --- code/controllers/subsystem/vote.dm | 54 ++++++++++++------------------ 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 67fc1cf237..49f1f3f851 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -188,24 +188,19 @@ SUBSYSTEM_DEF(vote) choices[score_name]++ /datum/controller/subsystem/vote/proc/calculate_scores(var/blackbox_text) - var/list/scores_by_choice = list() for(var/choice in choices) - scores_by_choice += "[choice]" - scores_by_choice["[choice]"] = list() + scores += "[choice]" + scores["[choice]"] = 0 for(var/ckey in voted) var/list/this_vote = voted[ckey] - for(var/choice in choices) - if("[choice]" in this_vote && "[choice]" in scores_by_choice) - sorted_insert(scores_by_choice["[choice]"],this_vote["[choice]"],/proc/cmp_numeric_asc) + for(var/choice in this_vote) + scores["[choice]"] += this_vote["[choice]"] var/min_score = 100 var/max_score = -100 - for(var/score_name in scores_by_choice) - var/list/score = scores_by_choice[score_name] - for(var/S in score) - scores[score_name] += S + for(var/score_name in scores) // normalize the scores from 0-1 max_score=max(max_score,scores[score_name]) min_score=min(min_score,scores[score_name]) - for(var/score_name in scores) // normalize the scores from 0-1 + for(var/score_name in scores) scores[score_name] = (scores[score_name]-min_score)/(max_score-min_score) SSblackbox.record_feedback("nested tally","voting",scores[score_name],list(blackbox_text,"Total scores",score_name)) @@ -235,12 +230,6 @@ SUBSYSTEM_DEF(vote) text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" if(vote_system == MAJORITY_JUDGEMENT_VOTING) text += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" - if(vote_system == SCORE_VOTING) - for(var/score_name in scores) - var/score = scores[score_name] - if(!score) - score = 0 - text = "\n[score_name]: [obfuscated ? "???" : score]" else for(var/i=1,i<=choices.len,i++) var/votes = choices[choices[i]] @@ -258,6 +247,15 @@ SUBSYSTEM_DEF(vote) text += "\nVote Result: [obfuscated ? "???" : .]" //CIT CHANGE - adds obfuscated votes else text += "\nDid not vote: [GLOB.clients.len-voted.len]" + else if(vote_system == SCORE_VOTING) + for(var/score_name in scores) + var/score = scores[score_name] + if(!score) + score = 0 + if(was_roundtype_vote) + stored_gamemode_votes[score_name] = score + text = "\n[score_name]: [obfuscated ? "???" : score]" + . = 1 else text += "Vote Result: Inconclusive - No Votes!" log_vote(text) @@ -330,19 +328,13 @@ SUBSYSTEM_DEF(vote) if("dynamic") if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started. return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.") - if(. == "Secret") - GLOB.master_mode = "secret" - SSticker.save_mode(.) - message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]") - log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].") - else - GLOB.master_mode = "dynamic" - var/list/runnable_storytellers = config.get_runnable_storytellers() - for(var/T in runnable_storytellers) - var/datum/dynamic_storyteller/S = T - runnable_storytellers[S] *= scores[initial(S.name)] - var/datum/dynamic_storyteller/S = pickweightAllowZero(runnable_storytellers) - GLOB.dynamic_storyteller_type = S + GLOB.master_mode = "dynamic" + var/list/runnable_storytellers = config.get_runnable_storytellers() + for(var/T in runnable_storytellers) + var/datum/dynamic_storyteller/S = T + runnable_storytellers[S] *= scores[initial(S.name)] + var/datum/dynamic_storyteller/S = pickweightAllowZero(runnable_storytellers) + GLOB.dynamic_storyteller_type = S if("map") var/datum/map_config/VM = config.maplist[.] message_admins("The map has been voted for and will change to: [VM.map_name]") @@ -466,8 +458,6 @@ SUBSYSTEM_DEF(vote) if(probabilities[initial(S.config_tag)] > 0) choices.Add(initial(S.name)) choice_descs.Add(initial(S.desc)) - choices.Add("Secret") - choice_descs.Add("Standard secret. Switches mode if it wins.") if("custom") question = stripped_input(usr,"What is the vote for?") if(!question) From 88ce25a09b17c1d0f9bf1d6275815e34b4204656 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 3 Feb 2020 08:10:45 -0800 Subject: [PATCH 037/118] hopefully fixing the once-assassin --- code/game/gamemodes/objective.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c713c71b49..459ff2f3d6 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -181,14 +181,10 @@ GLOBAL_LIST_EMPTY(objectives) ..() if(target && target.current) explanation_text = "Kill [target.name], the [!target_role_type ? target.assigned_role : target.special_role]. You only need to kill them once; if they come back, you've still succeeded." + START_PROCESSING(SSprocessing,src) else explanation_text = "Free Objective" -/datum/objective/assassinate/once/find_target_by_role(role, role_type=0, invert=0) - . = ..() - if(.) - START_PROCESSING(SSprocessing,src) - /datum/objective/assassinate/once/check_completion() return won || ..() From e4e5b651e69e2321ac97b5d89809bed02d405be8 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 3 Feb 2020 08:11:03 -0800 Subject: [PATCH 038/118] making permassassin scale with dynamic --- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 3180c1b305..1c7ee48f71 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -191,7 +191,7 @@ maroon_objective.owner = owner maroon_objective.find_target() add_objective(maroon_objective) - else if(prob(30)) + else if(prob(max(0,assassin_prob-20))) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = owner kill_objective.find_target() From aabd0b9e7936b20ceee3454f6bd782c0298ab671 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 3 Feb 2020 08:18:49 -0800 Subject: [PATCH 039/118] fixing quirk removal (whoops) --- code/modules/antagonists/_common/antag_datum.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index f019858319..0c05afb155 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -128,6 +128,7 @@ GLOBAL_LIST_EMPTY(antagonists) var/datum/quirk/Q = q if(Q.antag_removal_text) to_chat(L, "[Q.antag_removal_text]") + L.remove_quirk(Q.type) //Returns the team antagonist belongs to if any. /datum/antagonist/proc/get_team() From 63c8612ccd2497cdf196372cf8c87a46b10fb94f Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 01:42:59 +0100 Subject: [PATCH 040/118] Refactoring mob holders into an element. --- code/__DEFINES/components.dm | 4 +- code/_onclick/click.dm | 6 +- code/controllers/subsystem/pai.dm | 1 + code/datums/elements/mob_holder.dm | 185 ++++++++++++++++++ code/datums/elements/wuv.dm | 4 + code/modules/mob/living/carbon/examine.dm | 5 +- .../mob/living/carbon/human/examine.dm | 1 + .../carbon/human/species_types/dullahan.dm | 8 +- .../mob/living/carbon/monkey/monkey.dm | 10 +- code/modules/mob/living/inhand_holder.dm | 130 ------------ code/modules/mob/living/living.dm | 7 - code/modules/mob/living/living_defines.dm | 2 - code/modules/mob/living/silicon/pai/pai.dm | 5 +- .../mob/living/silicon/pai/pai_shell.dm | 21 +- .../mob/living/simple_animal/friendly/cat.dm | 9 +- .../mob/living/simple_animal/friendly/dog.dm | 23 +-- .../simple_animal/friendly/drone/_drone.dm | 11 +- .../friendly/drone/interaction.dm | 6 - .../mob/living/simple_animal/friendly/fox.dm | 5 +- .../living/simple_animal/friendly/lizard.dm | 9 +- .../living/simple_animal/friendly/mouse.dm | 12 +- .../living/simple_animal/friendly/sloth.dm | 4 +- code/modules/mob/mob.dm | 10 +- tgstation.dme | 2 +- 24 files changed, 256 insertions(+), 224 deletions(-) create mode 100644 code/datums/elements/mob_holder.dm delete mode 100644 code/modules/mob/living/inhand_holder.dm diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 0d2e88042d..0efd5a1f79 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -106,6 +106,9 @@ #define COMSIG_CLICK "atom_click" //from base of atom/Click(): (location, control, params, mob/user) #define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob) + #define COMPONENT_ALLOW_EXAMINATE 1 + #define COMPONENT_DENY_EXAMINATE 2 //Higher priority compared to the above one + #define COMSIG_CLICK_CTRL "ctrl_click" //from base of atom/CtrlClickOn(): (/mob) #define COMSIG_CLICK_ALT "alt_click" //from base of atom/AltClick(): (/mob) #define COMSIG_CLICK_CTRL_SHIFT "ctrl_shift_click" //from base of atom/CtrlShiftClick(/mob) @@ -159,7 +162,6 @@ // /mob signals #define COMSIG_MOB_EXAMINATE "mob_examinate" //from base of /mob/verb/examinate(): (atom/A) - #define COMPONENT_ALLOW_EXAMINE 1 #define COMSIG_MOB_DEATH "mob_death" //from base of mob/death(): (gibbed) #define COMPONENT_BLOCK_DEATH_BROADCAST 1 //stops the death from being broadcasted in deadchat. #define COMSIG_MOB_GHOSTIZE "mob_ghostize" //from base of mob/Ghostize(): (can_reenter_corpse, special, penalize) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 9bf59d5e76..e8a57bb257 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -319,9 +319,11 @@ /mob/proc/ShiftClickOn(atom/A) A.ShiftClick(src) return + /atom/proc/ShiftClick(mob/user) - SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user) - user.examinate(src) + var/flags = SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user) + if(!(flags & COMPONENT_DENY_EXAMINATE) && user.client && (user.client.eye == user || user.client.eye == user.loc || flags & COMPONENT_ALLOW_EXAMINATE)) + user.examinate(src) return /* diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index dd9848e465..7fc6f3b7c7 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -7,6 +7,7 @@ SUBSYSTEM_DEF(pai) var/ghost_spam = FALSE var/spam_delay = 100 var/list/pai_card_list = list() + var/list/mob_holders_by_chassis = list() /datum/controller/subsystem/pai/Topic(href, href_list) if(href_list["download"]) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm new file mode 100644 index 0000000000..5e1e47013a --- /dev/null +++ b/code/datums/elements/mob_holder.dm @@ -0,0 +1,185 @@ +/datum/element/mob_holder + element_flags = ELEMENT_BESPOKE + id_arg_index = 2 + var/worn_state + var/alt_worn + var/right_hand + var/left_hand + var/can_head + var/proctype //if present, will be invoked on headwear generation. + +/datum/element/mob_holder/Attach(datum/target, _worn_state, _alt_worn, _right_hand, _left_hand, _can_head = FALSE, _proctype) + . = ..() + + if(!isliving(target)) + return ELEMENT_INCOMPATIBLE + + worn_state = _worn_state + alt_worn = _alt_worn + right_hand = _right_hand + left_hand = _left_hand + can_head = _can_head + proctype = _proctype + + RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + +/datum/element/mob_holder/Detach(datum/source, force) + . = ..() + UnregisterSignal(source, COMSIG_CLICK_ALT) + UnregisterSignal(source, COMSIG_PARENT_EXAMINE) + +/datum/element/mob_holder/proc/on_examine(mob/living/source, mob/user, .) + if(ishuman(user) && !istype(source.loc, /obj/item/clothing/head/mob_holder)) + . += "Looks like [source.p_they(TRUE)] can be picked up with Alt+Click!" + +/datum/element/mob_holder/proc/mob_try_pickup(mob/living/source, mob/user) + if(!ishuman(user) || !user.Adjacent(source) || user.incapacitated()) + return FALSE + if(user.get_active_held_item()) + to_chat(user, "Your hands are full!") + return FALSE + if(source.buckled) + to_chat(user, "[src] is buckled to something!") + return FALSE + if(source == user) + to_chat(user, "You can't pick yourself up.") + return FALSE + source.visible_message("[user] starts picking up [source].", \ + "[user] starts picking you up!") + if(!do_after(user, 20, target = src) || source.buckled) + return FALSE + + source.visible_message("[user] picks up [source]!", \ + "[user] picks you up!") + to_chat(user, "You pick [src] up.") + source.drop_all_held_items() + var/obj/item/clothing/head/mob_holder/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, can_head) + if(proctype) + INVOKE_ASYNC(src, proctype, source, holder, user) + user.put_in_hands(holder) + return TRUE + +/datum/element/mob_holder/proc/drone_worn_icon(mob/living/simple_animal/drone/D, obj/item/clothing/head/mob_holder/holder, mob/user) + var/new_state = "[D.visualAppearence]_hat" + holder.item_state = new_state + holder.icon_state = new_state + + +//The item itself, +/obj/item/clothing/head/mob_holder + name = "bugged mob" + desc = "Yell at coderbrush." + icon = null + alternate_worn_icon = 'icons/mob/animals_held.dmi' + righthand_file = 'icons/mob/animals_held_rh.dmi' + lefthand_file = 'icons/mob/animals_held_lh.dmi' + icon_state = "" + w_class = WEIGHT_CLASS_BULKY + var/mob/living/held_mob + +/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, can_head = FALSE) + . = ..() + + if(target) + assimilate(target) + + if(alt_worn) + alternate_worn_icon = alt_worn + if(worn_state) + item_state = worn_state + icon_state = worn_state + if(left_hand) + lefthand_file = left_hand + if(right_hand) + righthand_file = right_hand + if(!can_head) + slot_flags &= ~SLOT_HEAD + +/obj/item/clothing/head/mob_holder/proc/assimilate(mob/living/target) + target.setDir(SOUTH) + held_mob = target + target.forceMove(src) + var/image/I = new //work around to retain the same appearance to the mob idependently from inhands/worn states. + I.appearance = target.appearance + I.override = TRUE + add_overlay(I) + name = target.name + desc = target.desc + switch(target.mob_size) + if(MOB_SIZE_TINY) + w_class = WEIGHT_CLASS_TINY + if(MOB_SIZE_SMALL) + w_class = WEIGHT_CLASS_NORMAL + if(MOB_SIZE_LARGE) + w_class = WEIGHT_CLASS_HUGE + RegisterSignal(src, COMSIG_CLICK_SHIFT, .proc/examine_held_mob) + +/obj/item/clothing/head/mob_holder/Destroy() + if(held_mob) + release() + return ..() + +/obj/item/clothing/head/mob_holder/proc/examine_held_mob(datum/source, mob/user) + held_mob.ShiftClick(user) + return COMPONENT_DENY_EXAMINATE + +/obj/item/clothing/head/mob_holder/Exited(atom/movable/AM, atom/newloc) + . = ..() + if(AM == held_mob) + held_mob.reset_perspective() + held_mob = null + qdel(src) + +/obj/item/clothing/head/mob_holder/Entered(atom/movable/AM, atom/newloc) + . = ..() + if(AM != held_mob) + var/destination = loc + if(isliving(loc)) //the mob is held or worn, drop things on the floor + destination = get_turf(loc) + AM.forceMove(destination) + +/obj/item/clothing/head/mob_holder/dropped() + . = ..() + if(held_mob && isturf(loc))//don't release on soft-drops + release() + +/obj/item/clothing/head/mob_holder/proc/release() + if(held_mob) + var/mob/living/L = held_mob + held_mob = null + L.forceMove(get_turf(L)) + L.reset_perspective() + L.setDir(SOUTH) + qdel(src) + +/obj/item/clothing/head/mob_holder/relaymove(mob/user) + return + +/obj/item/clothing/head/mob_holder/container_resist() + if(isliving(loc)) + var/mob/living/L = loc + L.visible_message("[src] escapes from [L]!", "[src] escapes your grip!") + release() + +/obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env) + var/atom/location = loc + if(!loc) + return //null + var/turf/T = get_turf(loc) + while(location != T) + location = location.loc + if(ismob(location)) + return location.loc.assume_air(env) + return loc.assume_air(env) + +/obj/item/clothing/head/mob_holder/remove_air(amount) + var/atom/location = loc + if(!loc) + return //null + var/turf/T = get_turf(loc) + while(location != T) + location = location.loc + if(ismob(location)) + return location.loc.remove_air(amount) + return loc.remove_air(amount) diff --git a/code/datums/elements/wuv.dm b/code/datums/elements/wuv.dm index 84f327500f..ac900c30fd 100644 --- a/code/datums/elements/wuv.dm +++ b/code/datums/elements/wuv.dm @@ -30,6 +30,10 @@ RegisterSignal(target, COMSIG_MOB_ATTACK_HAND, .proc/on_attack_hand) +/datum/element/wuv/Detach(datum/source, force) + . = ..() + UnregisterSignal(source, COMSIG_MOB_ATTACK_HAND) + /datum/element/wuv/proc/on_attack_hand(datum/source, mob/user) var/mob/living/L = source diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 34c268578c..3f2a259df7 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -16,10 +16,6 @@ . += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face." if (wear_neck) . += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n" - if(can_be_held) - . += "[t_He] looks small enough to be picked up with Alt+Click!\n" - - for(var/obj/item/I in held_items) if(!(I.item_flags & ABSTRACT)) @@ -116,4 +112,5 @@ . += "[t_He] look[p_s()] very happy." if(MOOD_LEVEL_HAPPY4 to INFINITY) . += "[t_He] look[p_s()] ecstatic." + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) . += "*---------*" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ef8a745b89..b560699a58 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -396,6 +396,7 @@ var/temp_flavor = print_flavor_text_2() if(temp_flavor) . += temp_flavor + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) . += "*---------*" /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects! diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 96d52dcb27..220e639e34 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -132,14 +132,14 @@ return INITIALIZE_HINT_QDEL owner = new_owner START_PROCESSING(SSobj, src) - RegisterSignal(owner, COMSIG_MOB_EXAMINATE, .proc/examinate_check) + RegisterSignal(owner, COMSIG_CLICK_SHIFT, .proc/examinate_check) RegisterSignal(src, COMSIG_ATOM_HEARER_IN_VIEW, .proc/include_owner) RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, .proc/unlist_head) RegisterSignal(owner, COMSIG_LIVING_FULLY_HEAL, .proc/retrieve_head) -/obj/item/dullahan_relay/proc/examinate_check(mob/source, atom/A) - if(source.client.eye == src && ((A in view(source.client.view, src)) || (isturf(A) && source.sight & SEE_TURFS) || (ismob(A) && source.sight & SEE_MOBS) || (isobj(A) && source.sight & SEE_OBJS))) - return COMPONENT_ALLOW_EXAMINE +/obj/item/dullahan_relay/proc/examinate_check(atom/source, mob/user) + if(user.client.eye == src) + return COMPONENT_ALLOW_EXAMINATE /obj/item/dullahan_relay/proc/include_owner(datum/source, list/processing_list, list/hearers) if(!QDELETED(owner)) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index ea5203778b..94a50b6806 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -15,7 +15,6 @@ bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey, /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey) hud_type = /datum/hud/monkey - can_be_held = "monkey" /mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner) verbs += /mob/living/proc/mob_sleep @@ -42,14 +41,15 @@ create_dna(src) dna.initialize_dna(random_blood_type()) +/mob/living/carbon/monkey/ComponentInitialize() + . = ..() + AddElement(/datum/element/mob_holder, "monkey", null, null, null, TRUE) + + /mob/living/carbon/monkey/Destroy() SSmobs.cubemonkeys -= src return ..() -/mob/living/carbon/monkey/generate_mob_holder() - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "monkey", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE) - return holder - /mob/living/carbon/monkey/create_internal_organs() internal_organs += new /obj/item/organ/appendix internal_organs += new /obj/item/organ/lungs diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm deleted file mode 100644 index 695258f944..0000000000 --- a/code/modules/mob/living/inhand_holder.dm +++ /dev/null @@ -1,130 +0,0 @@ -//Generic system for picking up mobs. -//Currently works for head and hands. -/obj/item/clothing/head/mob_holder - name = "bugged mob" - desc = "Yell at coderbrush." - icon = null - icon_state = "" - var/mob/living/held_mob - var/can_head = FALSE - w_class = WEIGHT_CLASS_BULKY - -/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/M, _worn_state, alt_worn, lh_icon, rh_icon, _can_head_override = FALSE) - . = ..() - - if(M) - M.setDir(SOUTH) - held_mob = M - M.forceMove(src) - appearance = M.appearance - name = M.name - desc = M.desc - - if(_can_head_override) - can_head = _can_head_override - if(alt_worn) - alternate_worn_icon = alt_worn - if(_worn_state) - item_state = _worn_state - icon_state = _worn_state - if(lh_icon) - lefthand_file = lh_icon - if(rh_icon) - righthand_file = rh_icon - if(!can_head) - slot_flags = NONE - -/obj/item/clothing/head/mob_holder/Destroy() - if(held_mob) - release() - return ..() - -/obj/item/clothing/head/mob_holder/dropped() - ..() - if(isturf(loc))//don't release on soft-drops - release() - -/obj/item/clothing/head/mob_holder/proc/release() - if(isliving(loc)) - var/mob/living/L = loc - L.dropItemToGround(src) - if(held_mob) - var/mob/living/m = held_mob - m.forceMove(get_turf(m)) - m.reset_perspective() - m.setDir(SOUTH) - held_mob = null - qdel(src) - -/obj/item/clothing/head/mob_holder/relaymove(mob/user) - return - -/obj/item/clothing/head/mob_holder/container_resist() - if(isliving(loc)) - var/mob/living/L = loc - visible_message("[src] escapes [L]!") - release() - -/mob/living/proc/mob_pickup(mob/living/L) - var/obj/item/clothing/head/mob_holder/holder = generate_mob_holder() - if(!holder) - return - drop_all_held_items() - L.put_in_hands(holder) - return - -/mob/living/proc/mob_try_pickup(mob/living/user) - if(!ishuman(user) || !src.Adjacent(user) || user.incapacitated() || !can_be_held) - return FALSE - if(user.get_active_held_item()) - to_chat(user, "Your hands are full!") - return FALSE - if(buckled) - to_chat(user, "[src] is buckled to something!") - return FALSE - if(src == user) - to_chat(user, "You can't pick yourself up.") - return FALSE - visible_message("[user] starts picking up [src].", \ - "[user] starts picking you up!") - if(!do_after(user, 20, target = src)) - return FALSE - - if(user.get_active_held_item()||buckled) - return FALSE - - visible_message("[user] picks up [src]!", \ - "[user] picks you up!") - to_chat(user, "You pick [src] up.") - mob_pickup(user) - return TRUE - -/mob/living/AltClick(mob/user) - . = ..() - if(mob_try_pickup(user)) - return TRUE - - -// I didn't define these for mobs, because you shouldn't be able to breathe out of mobs and using their loc isn't always the logical thing to do. - -/obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env) - var/atom/location = loc - if(!loc) - return //null - var/turf/T = get_turf(loc) - while(location != T) - location = location.loc - if(ismob(location)) - return location.loc.assume_air(env) - return loc.assume_air(env) - -/obj/item/clothing/head/mob_holder/remove_air(amount) - var/atom/location = loc - if(!loc) - return //null - var/turf/T = get_turf(loc) - while(location != T) - location = location.loc - if(ismob(location)) - return location.loc.remove_air(amount) - return loc.remove_air(amount) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 90ada3d718..b3dc82a40f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -40,11 +40,6 @@ QDEL_LIST(diseases) return ..() - -/mob/living/proc/generate_mob_holder() - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi') - return holder - /mob/living/onZImpact(turf/T, levels) if(!isgroundlessturf(T)) ZImpactDamage(T, levels) @@ -1172,8 +1167,6 @@ return if(!over.Adjacent(src) || (user != src) || !canUseTopic(over)) return - if(can_be_held) - mob_try_pickup(over) /mob/living/proc/get_static_viruses() //used when creating blood and other infective objects if(!LAZYLEN(diseases)) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index e668828392..84f0004805 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -101,8 +101,6 @@ var/list/obj/effect/proc_holder/abilities = list() - var/can_be_held = FALSE //whether this can be picked up and held. - var/radiation = 0 //If the mob is irradiated. var/ventcrawl_layer = PIPING_LAYER_DEFAULT var/losebreath = 0 diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 9e2dea0442..409665f792 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -11,7 +11,7 @@ health = 500 maxHealth = 500 layer = BELOW_MOB_LAYER - can_be_held = TRUE + var/datum/element/mob_holder/current_mob_holder //because only a few of their chassis can be actually held. var/network = "ss13" var/obj/machinery/camera/current = null @@ -64,9 +64,6 @@ var/list/possible_chassis //initialized in initialize. var/list/dynamic_chassis_icons //ditto. var/list/chassis_pixel_offsets_x //stupid dogborgs - var/static/item_head_icon = 'icons/mob/pai_item_head.dmi' - var/static/item_lh_icon = 'icons/mob/pai_item_lh.dmi' - var/static/item_rh_icon = 'icons/mob/pai_item_rh.dmi' var/emitterhealth = 20 var/emittermaxhealth = 20 diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index bb02bf172d..8aa38169ff 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -43,6 +43,12 @@ set_light(0) icon_state = "[chassis]" visible_message("[src] folds out its holochassis emitter and forms a holoshell around itself!") + if(possible_chassis[chassis]) + var/datum/element/mob_holder/ele = SSpai.mob_holders_by_chassis[chassis] + if(ele) + current_mob_holder = ele.Attach(src) + else + current_mob_holder = SSpai.mob_holders_by_chassis[chassis] = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', TRUE) holoform = TRUE /mob/living/silicon/pai/proc/fold_in(force = FALSE) @@ -69,6 +75,8 @@ holoform = FALSE if(resting) lay_down() + current_mob_holder?.Detach(src) + current_mob_holder = null /mob/living/silicon/pai/proc/choose_chassis() if(!isturf(loc) && loc != card) @@ -117,19 +125,6 @@ set_light(0) to_chat(src, "You disable your integrated light.") -/mob/living/silicon/pai/mob_pickup(mob/living/L) - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, chassis, item_head_icon, item_lh_icon, item_rh_icon) - if(!L.put_in_hands(holder)) - qdel(holder) - else - L.visible_message("[L] scoops up [src]!") - -/mob/living/silicon/pai/mob_try_pickup(mob/living/user) - if(!possible_chassis[chassis]) - to_chat(user, "[src]'s current form isn't able to be carried!") - return FALSE - return ..() - /mob/living/silicon/pai/verb/toggle_chassis_sit() set name = "Toggle Chassis Sit" set category = "IC" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 016bee2d44..f12f3649cf 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 @@ var/mob/living/simple_animal/mouse/movement_target gold_core_spawnable = FRIENDLY_SPAWN collar_type = "cat" - can_be_held = "cat2" + var/held_icon = "cat2" do_footstep = TRUE /mob/living/simple_animal/pet/cat/Initialize() @@ -41,6 +41,7 @@ /mob/living/simple_animal/pet/cat/ComponentInitialize() . = ..() AddElement(/datum/element/wuv, "purrs!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "hisses!", EMOTE_AUDIBLE) + AddElement(/datum/element/mob_holder, held_icon) /mob/living/simple_animal/pet/cat/update_canmove() ..() @@ -60,6 +61,7 @@ icon_state = "spacecat" icon_living = "spacecat" icon_dead = "spacecat_dead" + held_icon = "spacecat" unsuitable_atmos_damage = 0 minbodytemp = TCMB maxbodytemp = T0C + 40 @@ -71,6 +73,7 @@ icon_state = "original" icon_living = "original" icon_dead = "original_dead" + held_icon = "original" collar_type = null unique_pet = TRUE @@ -84,7 +87,7 @@ pass_flags = PASSMOB mob_size = MOB_SIZE_SMALL collar_type = "kitten" - can_be_held = "cat" + held_icon = "cat" //RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_animal/pet/cat/Runtime @@ -249,7 +252,7 @@ attacked_sound = 'sound/items/eatfood.ogg' deathmessage = "loses its false life and collapses!" death_sound = "bodyfall" - can_be_held = "cak" + held_icon = "cak" /mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts) ..() diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 554d03991a..f02d21c2af 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -13,13 +13,14 @@ see_in_dark = 5 speak_chance = 1 turns_per_move = 10 + var/held_icon = "corgi" do_footstep = TRUE - can_be_held = TRUE /mob/living/simple_animal/pet/dog/ComponentInitialize() . = ..() AddElement(/datum/element/wuv, "yaps_happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE) + AddElement(/datum/element/mob_holder, held_icon) //Corgis and pugs are now under one dog subtype @@ -34,13 +35,11 @@ childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5) animal_species = /mob/living/simple_animal/pet/dog gold_core_spawnable = FRIENDLY_SPAWN - can_be_held = TRUE collar_type = "corgi" var/obj/item/inventory_head var/obj/item/inventory_back var/shaved = FALSE var/nofur = FALSE //Corgis that have risen past the material plane of existence. - can_be_held = "corgi" /mob/living/simple_animal/pet/dog/corgi/Destroy() QDEL_NULL(inventory_head) @@ -69,7 +68,7 @@ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3) gold_core_spawnable = FRIENDLY_SPAWN collar_type = "pug" - can_be_held = "pug" + held_icon = "pug" /mob/living/simple_animal/pet/dog/corgi/exoticcorgi name = "Exotic Corgi" @@ -156,13 +155,6 @@ ..() update_corgi_fluff() -/mob/living/simple_animal/pet/dog/corgi/mob_pickup(mob/living/L) - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "corgi", null, 'icons/mob/pets_held_lh.dmi', 'icons/mob/pets_held_rh.dmi', FALSE) - if(!L.put_in_hands(holder)) - qdel(holder) - else - L.visible_message("[L] scoops up [src]!") - /mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list) if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) usr << browse(null, "window=mob[REF(src)]") @@ -371,7 +363,10 @@ icon_dead = "old_corgi_dead" desc = "At a ripe old age of [record_age] Ian's not as spry as he used to be, but he'll always be the HoP's beloved corgi." //RIP turns_per_move = 20 - can_be_held = "old_corgi" + var/datum/element/mob_holder/ele = SSdcs.GetElement(/datum/element/mob_holder, held_icon) + if(ele) + ele.Detach(src) + AddElement(/datum/element/mob_holder, "old_corgi") /mob/living/simple_animal/pet/dog/corgi/Ian/Life() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) @@ -594,7 +589,7 @@ unsuitable_atmos_damage = 0 minbodytemp = TCMB maxbodytemp = T0C + 40 - can_be_held = "void_puppy" + held_icon = "void_puppy" /mob/living/simple_animal/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0) return 1 //Void puppies can navigate space. @@ -616,7 +611,7 @@ response_harm = "kicks" var/turns_since_scan = 0 var/puppies = 0 - can_be_held = "lisa" + held_icon = "lisa" //Lisa already has a cute bow! /mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 28fb1f5a42..158719414a 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -51,7 +51,7 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE see_in_dark = 7 blood_volume = 0 - can_be_held = TRUE + var/can_be_held = TRUE //mob holder element. held_items = list(null, null) var/staticChoice = "static" var/list/staticChoices = list("static", "blank", "letter", "animal") @@ -101,6 +101,11 @@ for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_to_hud(src) +/mob/living/simple_animal/drone/ComponentInitialize() + . = ..() + if(can_be_held) + //icon/item state is defined in mob_holder/drone_worn_icon() + AddElement(/datum/element/mob_holder, null, 'icons/mob/head.dmi', 'icons/mob/inhands/clothing_righthand.dmi', 'icons/mob/inhands/clothing_lefthand.dmi', TRUE, /datum/element/mob_holder.proc/drone_worn_icon) /mob/living/simple_animal/drone/med_hud_set_health() var/image/holder = hud_list[DIAG_HUD] @@ -283,7 +288,3 @@ var/obj/item/clothing/H = head if(H.clothing_flags & SCAN_REAGENTS) return TRUE - -/mob/living/simple_animal/drone/generate_mob_holder() - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "[visualAppearence]_hat", null, null, null, TRUE) - return holder diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index c9207fcf89..0f97a4c496 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -29,12 +29,6 @@ if("Nothing") return -//picky up the drone c: -/mob/living/simple_animal/drone/attack_hand(mob/user) - if(user.a_intent != INTENT_HELP) - return ..() // TODO: convert picking up mobs into an element or component. - mob_try_pickup(user) - /mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user) var/mob/dead/observer/G = get_ghost() if(!client && (!G || !G.client)) diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index 3f58ca593e..95b082b733 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -18,9 +18,12 @@ response_disarm = "gently pushes aside" response_harm = "kicks" gold_core_spawnable = FRIENDLY_SPAWN - can_be_held = "fox" do_footstep = TRUE +/mob/living/simple_animal/pet/fox/ComponentInitialize() + . = ..() + AddElement(/datum/element/mob_holder, "fox") + //Captain fox /mob/living/simple_animal/pet/fox/Renault name = "Renault" diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index cafa0d9009..0918005061 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -23,7 +23,10 @@ obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption. - can_be_held = "lizard" //you can hold lizards now. + +/mob/living/simple_animal/hostile/lizard/ComponentInitialize() + . = ..() + AddElement(/datum/element/mob_holder, "lizard", null, null, null, TRUE) //you can hold lizards now. /mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target? if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it @@ -40,7 +43,3 @@ return TRUE else return ..() - -/mob/living/simple_animal/hostile/lizard/generate_mob_holder() - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "lizard", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE) - return holder diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 69d9a0eef3..d326573957 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -26,17 +26,16 @@ var/body_color //brown, gray and white, leave blank for random gold_core_spawnable = FRIENDLY_SPAWN var/chew_probability = 1 - can_be_held = TRUE /mob/living/simple_animal/mouse/Initialize() . = ..() AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100) if(!body_color) - body_color = pick( list("brown","gray","white") ) + body_color = pick(list("brown","gray","white")) + AddElement(/datum/element/mob_holder, "mouse_[body_color]") icon_state = "mouse_[body_color]" icon_living = "mouse_[body_color]" icon_dead = "mouse_[body_color]_dead" - can_be_held = "mouse_[body_color]" /mob/living/simple_animal/mouse/proc/splat() src.health = 0 @@ -89,17 +88,14 @@ /mob/living/simple_animal/mouse/white body_color = "white" icon_state = "mouse_white" - can_be_held = "mouse_white" /mob/living/simple_animal/mouse/gray body_color = "gray" icon_state = "mouse_gray" - can_be_held = "mouse_gray" /mob/living/simple_animal/mouse/brown body_color = "brown" icon_state = "mouse_brown" - can_be_held = "mouse_brown" //TOM IS ALIVE! SQUEEEEEEEE~K :) /mob/living/simple_animal/mouse/brown/Tom @@ -124,7 +120,3 @@ /obj/item/reagent_containers/food/snacks/deadmouse/on_grind() reagents.clear_reagents() -/mob/living/simple_animal/mouse/generate_mob_holder() - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi') - holder.w_class = WEIGHT_CLASS_TINY - return holder diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm index 175cb8e838..21df73fa61 100644 --- a/code/modules/mob/living/simple_animal/friendly/sloth.dm +++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm @@ -22,9 +22,11 @@ maxHealth = 50 speed = 10 glide_size = 2 - can_be_held = "sloth" //finally oranges can be held do_footstep = TRUE +/mob/living/simple_animal/pet/fox/ComponentInitialize() + . = ..() + AddElement(/datum/element/mob_holder, "sloth") //finally oranges can be held //Cargo Sloth /mob/living/simple_animal/sloth/paperwork diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 52e2673dd6..35c7510ad9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -321,20 +321,18 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA set name = "Examine" set category = "IC" - if(!client) - return - - if(!(SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, A) & COMPONENT_ALLOW_EXAMINE) && ((client.eye != src && client.eye != loc) || (isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src))))) - //cameras & co don't allow users to examine far away things, also shift-click catcher may issue examinate() calls for out-of-sight turfs + if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src))) + // shift-click catcher may issue examinate() calls for out-of-sight turfs return if(is_blind(src)) - to_chat(src, "Something is there but you can't see it.") + to_chat(src, "Something is there but you can't see it!") return face_atom(A) var/list/result = A.examine(src) to_chat(src, result.Join("\n")) + SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, A) //same as above //note: ghosts can point, this is intended diff --git a/tgstation.dme b/tgstation.dme index b5f5442d67..a23fe5edc4 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -487,6 +487,7 @@ #include "code\datums\elements\dusts_on_leaving_area.dm" #include "code\datums\elements\earhealing.dm" #include "code\datums\elements\ghost_role_eligibility.dm" +#include "code\datums\elements\mob_holder.dm" #include "code\datums\elements\wuv.dm" #include "code\datums\helper_datums\events.dm" #include "code\datums\helper_datums\getrev.dm" @@ -2123,7 +2124,6 @@ #include "code\modules\mob\living\damage_procs.dm" #include "code\modules\mob\living\death.dm" #include "code\modules\mob\living\emote.dm" -#include "code\modules\mob\living\inhand_holder.dm" #include "code\modules\mob\living\life.dm" #include "code\modules\mob\living\living.dm" #include "code\modules\mob\living\living_defense.dm" From d13d8dd95398f574297fa37e842a822eec2934ff Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 02:13:11 +0100 Subject: [PATCH 041/118] Less hacky. --- code/controllers/subsystem/pai.dm | 1 - code/datums/elements/mob_holder.dm | 13 ++++++------- code/modules/mob/living/carbon/monkey/monkey.dm | 2 +- code/modules/mob/living/silicon/pai/pai_shell.dm | 11 +++++------ .../mob/living/simple_animal/friendly/lizard.dm | 2 +- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 7fc6f3b7c7..dd9848e465 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -7,7 +7,6 @@ SUBSYSTEM_DEF(pai) var/ghost_spam = FALSE var/spam_delay = 100 var/list/pai_card_list = list() - var/list/mob_holders_by_chassis = list() /datum/controller/subsystem/pai/Topic(href, href_list) if(href_list["download"]) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 5e1e47013a..af184a6353 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -5,10 +5,10 @@ var/alt_worn var/right_hand var/left_hand - var/can_head + var/inv_slots var/proctype //if present, will be invoked on headwear generation. -/datum/element/mob_holder/Attach(datum/target, _worn_state, _alt_worn, _right_hand, _left_hand, _can_head = FALSE, _proctype) +/datum/element/mob_holder/Attach(datum/target, _worn_state, _alt_worn, _right_hand, _left_hand, _inv_slots = NONE, _proctype) . = ..() if(!isliving(target)) @@ -18,7 +18,7 @@ alt_worn = _alt_worn right_hand = _right_hand left_hand = _left_hand - can_head = _can_head + inv_slots = _inv_slots proctype = _proctype RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup) @@ -54,7 +54,7 @@ "[user] picks you up!") to_chat(user, "You pick [src] up.") source.drop_all_held_items() - var/obj/item/clothing/head/mob_holder/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, can_head) + var/obj/item/clothing/head/mob_holder/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, inv_slots) if(proctype) INVOKE_ASYNC(src, proctype, source, holder, user) user.put_in_hands(holder) @@ -78,7 +78,7 @@ w_class = WEIGHT_CLASS_BULKY var/mob/living/held_mob -/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, can_head = FALSE) +/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, inv_slots = NONE) . = ..() if(target) @@ -93,8 +93,7 @@ lefthand_file = left_hand if(right_hand) righthand_file = right_hand - if(!can_head) - slot_flags &= ~SLOT_HEAD + slot_flags = slots /obj/item/clothing/head/mob_holder/proc/assimilate(mob/living/target) target.setDir(SOUTH) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 94a50b6806..cd51a4234b 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -43,7 +43,7 @@ /mob/living/carbon/monkey/ComponentInitialize() . = ..() - AddElement(/datum/element/mob_holder, "monkey", null, null, null, TRUE) + AddElement(/datum/element/mob_holder, "monkey", null, null, null, SLOT_HEAD) /mob/living/carbon/monkey/Destroy() diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 8aa38169ff..37353e2ed7 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -43,12 +43,6 @@ set_light(0) icon_state = "[chassis]" visible_message("[src] folds out its holochassis emitter and forms a holoshell around itself!") - if(possible_chassis[chassis]) - var/datum/element/mob_holder/ele = SSpai.mob_holders_by_chassis[chassis] - if(ele) - current_mob_holder = ele.Attach(src) - else - current_mob_holder = SSpai.mob_holders_by_chassis[chassis] = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', TRUE) holoform = TRUE /mob/living/silicon/pai/proc/fold_in(force = FALSE) @@ -104,6 +98,11 @@ dynamic_chassis = choice resist_a_rest(FALSE, TRUE) update_icon() + if(possible_chassis[chassis]) + current_mob_holder = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', SLOT_HEAD) + else + current_mob_holder?.Detach(src) + return to_chat(src, "You switch your holochassis projection composite to [chassis]") /mob/living/silicon/pai/lay_down() diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 0918005061..6275256f5a 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -26,7 +26,7 @@ /mob/living/simple_animal/hostile/lizard/ComponentInitialize() . = ..() - AddElement(/datum/element/mob_holder, "lizard", null, null, null, TRUE) //you can hold lizards now. + AddElement(/datum/element/mob_holder, "lizard", null, null, null, SLOT_HEAD) //you can hold lizards now. /mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target? if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it From 7723450d1117b6065784ab46599c812b3c7ebebd Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 02:21:23 +0100 Subject: [PATCH 042/118] welp. --- code/datums/elements/mob_holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index af184a6353..6ee9bddc90 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -78,7 +78,7 @@ w_class = WEIGHT_CLASS_BULKY var/mob/living/held_mob -/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, inv_slots = NONE) +/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, slots = NONE) . = ..() if(target) From 0f708cb85686110cd5e8e7f2f9e3f5102e197adb Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 02:26:42 +0100 Subject: [PATCH 043/118] pAI shenanigeans --- code/modules/mob/living/silicon/pai/pai_shell.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 37353e2ed7..8ae44c042f 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -69,8 +69,6 @@ holoform = FALSE if(resting) lay_down() - current_mob_holder?.Detach(src) - current_mob_holder = null /mob/living/silicon/pai/proc/choose_chassis() if(!isturf(loc) && loc != card) @@ -102,6 +100,7 @@ current_mob_holder = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', SLOT_HEAD) else current_mob_holder?.Detach(src) + current_mob_holder = null return to_chat(src, "You switch your holochassis projection composite to [chassis]") From 89466de29ee152e28c19557117c362cdb1fade2d Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 02:30:14 +0100 Subject: [PATCH 044/118] Good catch linter. --- code/datums/elements/mob_holder.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 6ee9bddc90..5b471a0dc7 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -29,9 +29,9 @@ UnregisterSignal(source, COMSIG_CLICK_ALT) UnregisterSignal(source, COMSIG_PARENT_EXAMINE) -/datum/element/mob_holder/proc/on_examine(mob/living/source, mob/user, .) +/datum/element/mob_holder/proc/on_examine(mob/living/source, mob/user, list/examine_list) if(ishuman(user) && !istype(source.loc, /obj/item/clothing/head/mob_holder)) - . += "Looks like [source.p_they(TRUE)] can be picked up with Alt+Click!" + examine_list += "Looks like [source.p_they(TRUE)] can be picked up with Alt+Click!" /datum/element/mob_holder/proc/mob_try_pickup(mob/living/source, mob/user) if(!ishuman(user) || !user.Adjacent(source) || user.incapacitated()) From 5aecdb6a4db6dc77faa0204909aeb3a2734d73c4 Mon Sep 17 00:00:00 2001 From: ancientpower Date: Mon, 3 Feb 2020 11:51:18 -0600 Subject: [PATCH 045/118] initial commit --- code/__DEFINES/interaction_flags.dm | 2 + code/game/atoms.dm | 1 + code/game/machinery/_machinery.dm | 2 +- code/game/machinery/newscaster.dm | 97 ++++++++++++++++++++-- code/game/turfs/turf.dm | 4 +- code/modules/library/lib_items.dm | 16 +++- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/mob_helpers.dm | 12 +++ 8 files changed, 123 insertions(+), 13 deletions(-) diff --git a/code/__DEFINES/interaction_flags.dm b/code/__DEFINES/interaction_flags.dm index dc3242c910..6df5bf77fb 100644 --- a/code/__DEFINES/interaction_flags.dm +++ b/code/__DEFINES/interaction_flags.dm @@ -20,3 +20,5 @@ #define INTERACT_MACHINE_SET_MACHINE (1<<6) //MACHINES HAVE THIS BY DEFAULT, SOMEONE SHOULD RUN THROUGH MACHINES AND REMOVE IT FROM THINGS LIKE LIGHT SWITCHES WHEN POSSIBLE!!-------------------------- //This flag determines if a machine set_machine's the user when the user uses it, making updateUsrDialog make the user re-call interact() on it. //THIS FLAG IS ON ALL MACHINES BY DEFAULT, NEEDS TO BE RE-EVALUATED LATER!! + +#define INTERACT_GHOST_READ (1<<0) \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1f62be8a24..4fbf84f116 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -6,6 +6,7 @@ var/flags_1 = NONE var/interaction_flags_atom = NONE + var/ghost_flags = NONE var/datum/reagents/reagents = null //This atom's HUD (med/sec, etc) images. Associative list. diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 5f44fccdac..58cfa93003 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -237,7 +237,7 @@ Class Procs: else if(interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SILICON) return FALSE - if(!Adjacent(user)) + if(!Adjacent(user) && !isobserver(user)) var/mob/living/carbon/H = user if(!(istype(H) && H.has_dna() && H.dna.check_mutation(TK))) return FALSE diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 6bf9930eec..5bb997405a 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -189,6 +189,7 @@ GLOBAL_LIST_EMPTY(allCasters) armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) max_integrity = 200 integrity_failure = 50 + ghost_flags = INTERACT_GHOST_READ var/screen = 0 var/paper_remaining = 15 var/securityCaster = 0 @@ -196,6 +197,7 @@ GLOBAL_LIST_EMPTY(allCasters) var/alert_delay = 500 var/alert = FALSE var/scanned_user = "Unknown" + var/mob/active_user = null var/msg = "" var/datum/picture/picture var/channel_name = "" @@ -264,10 +266,10 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/ui_interact(mob/user) . = ..() - if(ishuman(user) || issilicon(user)) - var/mob/living/human_or_robot_user = user + if(ishuman(user) || issilicon(user) || isobserver(user)) + var/mob/M = user var/dat - scan_user(human_or_robot_user) + scan_user(M) switch(screen) if(0) dat += "Welcome to Newscasting Unit #[unit_no].
        Interface & News networks Operational." @@ -279,7 +281,7 @@ GLOBAL_LIST_EMPTY(allCasters) dat+= "
        Submit new Feed story" dat+= "
        Print newspaper" dat+= "
        Re-scan User" - dat+= "

        Exit" + dat+= "

        Exit" if(securityCaster) var/wanted_already = 0 if(GLOB.news_network.wanted_issue.active) @@ -501,26 +503,38 @@ GLOBAL_LIST_EMPTY(allCasters) if(21) dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.

        " dat+="Return" - var/datum/browser/popup = new(human_or_robot_user, "newscaster_main", "Newscaster Unit #[unit_no]", 400, 600) + var/datum/browser/popup = new(M, "newscaster_main", "Newscaster Unit #[unit_no]", 400, 600) popup.set_content(dat) - popup.set_title_image(human_or_robot_user.browse_rsc_icon(icon, icon_state)) + popup.set_title_image(M.browse_rsc_icon(icon, icon_state)) popup.open() /obj/machinery/newscaster/Topic(href, href_list) if(..()) return - if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && isturf(loc))) || issilicon(usr)) + if(active_user && !isobserver(active_user) && get_dist(active_user,src)<=1 && usr!=active_user) + to_chat(usr, "You must wait for [active_user] to finish and move away.") + return + if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && isturf(loc))) || issilicon(usr) || isobserver(usr)) usr.set_machine(src) scan_user(usr) if(href_list["set_channel_name"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"set a channel's name")) + to_chat(usr, "You can't do that.") + return channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN) while (findtext(channel_name," ") == 1) channel_name = copytext(channel_name,2,length(channel_name)+1) updateUsrDialog() else if(href_list["set_channel_lock"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"locked a channel")) + to_chat(usr, "You can't do that.") + return c_locked = !c_locked updateUsrDialog() else if(href_list["submit_new_channel"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"created a new channel")) + to_chat(usr, "You can't do that.") + return var/list/existing_authors = list() for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels) if(FC.authorCensor) @@ -543,6 +557,9 @@ GLOBAL_LIST_EMPTY(allCasters) screen=5 updateUsrDialog() else if(href_list["set_channel_receiving"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set the receiving channel")) + to_chat(usr, "You can't do that.") + return var/list/available_channels = list() for(var/datum/newscaster/feed_channel/F in GLOB.news_network.network_channels) if( (!F.locked || F.author == scanned_user) && !F.censored) @@ -550,14 +567,23 @@ GLOBAL_LIST_EMPTY(allCasters) channel_name = input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels updateUsrDialog() else if(href_list["set_new_message"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"set the message of a new feed story")) + to_chat(usr, "You can't do that.") + return var/temp_message = trim(stripped_multiline_input(usr, "Write your Feed story", "Network Channel Handler", msg)) if(temp_message) msg = temp_message updateUsrDialog() else if(href_list["set_attachment"]) + if(isobserver(usr)) + to_chat(usr, "You can't do that.") + return AttachPhoto(usr) updateUsrDialog() else if(href_list["submit_new_message"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"added a new story")) + to_chat(usr, "You can't do that.") + return if(msg =="" || msg=="\[REDACTED\]" || scanned_user == "Unknown" || channel_name == "" ) screen=6 else @@ -567,15 +593,27 @@ GLOBAL_LIST_EMPTY(allCasters) msg = "" updateUsrDialog() else if(href_list["create_channel"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"created a channel")) + to_chat(usr, "You can't do that.") + return screen=2 updateUsrDialog() else if(href_list["create_feed_story"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"created a feed story")) + to_chat(usr, "You can't do that.") + return screen=3 updateUsrDialog() else if(href_list["menu_paper"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"")) + to_chat(usr, "You can't do that.") + return screen=8 updateUsrDialog() else if(href_list["print_paper"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"printed a paper")) + to_chat(usr, "You can't do that.") + return if(!paper_remaining) screen=21 else @@ -583,12 +621,21 @@ GLOBAL_LIST_EMPTY(allCasters) screen = 20 updateUsrDialog() else if(href_list["menu_censor_story"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"censored a story")) + to_chat(usr, "You can't do that.") + return screen=10 updateUsrDialog() else if(href_list["menu_censor_channel"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"censored a channel")) + to_chat(usr, "You can't do that.") + return screen=11 updateUsrDialog() else if(href_list["menu_wanted"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"")) + to_chat(usr, "You can't do that.") + return var/already_wanted = 0 if(GLOB.news_network.wanted_issue.active) already_wanted = 1 @@ -598,12 +645,21 @@ GLOBAL_LIST_EMPTY(allCasters) screen = 14 updateUsrDialog() else if(href_list["set_wanted_name"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set the name of a wanted person")) + to_chat(usr, "You can't do that.") + return channel_name = stripped_input(usr, "Provide the name of the Wanted person", "Network Security Handler") updateUsrDialog() else if(href_list["set_wanted_desc"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set the description of a wanted person")) + to_chat(usr, "You can't do that.") + return msg = stripped_input(usr, "Provide a description of the Wanted person and any other details you deem important", "Network Security Handler") updateUsrDialog() else if(href_list["submit_wanted"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"submitted a wanted poster")) + to_chat(usr, "You can't do that.") + return var/input_param = text2num(href_list["submit_wanted"]) if(msg == "" || channel_name == "" || scanned_user == "Unknown") screen = 16 @@ -634,6 +690,9 @@ GLOBAL_LIST_EMPTY(allCasters) screen=18 updateUsrDialog() else if(href_list["censor_channel_author"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to censor an author")) + to_chat(usr, "You can't do that.") + return var/datum/newscaster/feed_channel/FC = locate(href_list["censor_channel_author"]) if(FC.is_admin_channel) alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") @@ -641,6 +700,9 @@ GLOBAL_LIST_EMPTY(allCasters) FC.toggleCensorAuthor() updateUsrDialog() else if(href_list["censor_channel_story_author"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to censor a story's author")) + to_chat(usr, "You can't do that.") + return var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_author"]) if(MSG.is_admin_message) alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok") @@ -648,6 +710,9 @@ GLOBAL_LIST_EMPTY(allCasters) MSG.toggleCensorAuthor() updateUsrDialog() else if(href_list["censor_channel_story_body"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to censor a story")) + to_chat(usr, "You can't do that.") + return var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_body"]) if(MSG.is_admin_message) alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") @@ -655,11 +720,17 @@ GLOBAL_LIST_EMPTY(allCasters) MSG.toggleCensorBody() updateUsrDialog() else if(href_list["pick_d_notice"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"")) + to_chat(usr, "You can't do that.") + return var/datum/newscaster/feed_channel/FC = locate(href_list["pick_d_notice"]) viewing_channel = FC screen=13 updateUsrDialog() else if(href_list["toggle_d_notice"]) + if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set a D-notice")) + to_chat(usr, "You can't do that.") + return var/datum/newscaster/feed_channel/FC = locate(href_list["toggle_d_notice"]) if(FC.is_admin_channel) alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok") @@ -807,6 +878,12 @@ GLOBAL_LIST_EMPTY(allCasters) picture = selection /obj/machinery/newscaster/proc/scan_user(mob/living/user) + if(active_user) + if(active_user != user) + if(get_dist(active_user,src)<=1) + if(!isobserver(active_user)) + to_chat(user, "Wait for [active_user] to finish and move away.") + return if(ishuman(user)) var/mob/living/carbon/human/human_user = user if(human_user.wear_id) @@ -826,9 +903,14 @@ GLOBAL_LIST_EMPTY(allCasters) else if(issilicon(user)) var/mob/living/silicon/ai_user = user scanned_user = "[ai_user.name] ([ai_user.job])" + else if (IsAdminGhost(user)) + scanned_user = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]" + else if (isobserver(user)) + scanned_user = "Space-Time Anomaly #[rand(0,9)][rand(0,9)][rand(0,9)]" else throw EXCEPTION("Invalid user for this proc") return + active_user = user /obj/machinery/newscaster/proc/print_paper() SSblackbox.record_feedback("amount", "newspapers_printed", 1) @@ -861,7 +943,6 @@ GLOBAL_LIST_EMPTY(allCasters) say("Attention! Wanted issue distributed!") playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, 1) - /obj/item/newspaper name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index d8434f986c..688e03def3 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -362,8 +362,10 @@ . = ..() if(.) return + if(!user || !istype(user, /mob/living)) + return FALSE if(length(src_object.contents())) - to_chat(usr, "You start dumping out the contents...") + to_chat(user, "You start dumping out the contents...") if(!do_after(usr,20,target=src_object.parent)) return FALSE diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 5ff1cbceb1..f128a76da2 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -129,6 +129,14 @@ choice.forceMove(drop_location()) update_icon() +/obj/structure/bookcase/attack_ghost(mob/dead/observer/user as mob) + if(contents.len && in_range(user, src)) + var/obj/item/book/choice = input("Which book would you like to read?") as null|obj in contents + if(choice) + if(!istype(choice)) //spellbook, cult tome, or the one weird bible storage + to_chat(user,"A mysterious force is keeping you from reading that.") + return + choice.attack_self(user) /obj/structure/bookcase/deconstruct(disassembled = TRUE) new /obj/item/stack/sheet/mineral/wood(loc, 4) @@ -204,8 +212,9 @@ return if(dat) user << browse("Penned by [author].
        " + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]") - user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.") - SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd) + if(istype(user, /mob/living)) + user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.") + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd) onclose(user, "book") else to_chat(user, "This book is completely blank!") @@ -311,6 +320,9 @@ else ..() +/obj/item/book/attack_ghost(mob/user) + attack_self(user) + /* * Barcode Scanner diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 97007ebd11..401e154913 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -794,7 +794,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp update_icon() /mob/dead/observer/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) - return IsAdminGhost(usr) + return IsAdminGhost(usr) || (M.ghost_flags & INTERACT_GHOST_READ) /mob/dead/observer/is_literate() return 1 diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index d78ae0ba8c..583ac75649 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -409,6 +409,18 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return return TRUE +/proc/canGhostWrite(var/mob/A, var/obj/target, var/desc="", var/allow_all=FALSE) + if(allow_all & TRUE) + if(!target.GetComponent(/datum/component/anti_magic)) + return 1 + if(IsAdminGhost(A)) + if (desc != "") + log_admin("GHOST: [key_name(A)] [desc] ([target.name] at [loc_name(target)])") + else + log_admin("GHOST: [key_name(A)] fucked with the [target.name] at [loc_name(target)]") + return 1 + return 0 + /proc/offer_control(mob/M) to_chat(M, "Control of your mob has been offered to dead players.") if(usr) From 0eb5aa0a2ae55996ab3e4a47a2100e748479aa2e Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 04:58:09 +0100 Subject: [PATCH 046/118] Removing a couple troublesome NSFW unused prefs. --- code/modules/client/preferences.dm | 3 --- code/modules/client/preferences_savefile.dm | 2 -- modular_citadel/code/modules/arousal/organs/breasts.dm | 5 +++-- modular_citadel/code/modules/arousal/organs/testicles.dm | 1 - modular_citadel/code/modules/client/preferences_savefile.dm | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 006cdf8dc8..ba20fdacd2 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -137,7 +137,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, - "balls_fluid" = "semen", "has_ovi" = FALSE, "ovi_shape" = "knotted", "ovi_length" = 6, @@ -152,7 +151,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) "breasts_color" = "fff", "breasts_size" = "C", "breasts_shape" = "Pair", - "breasts_fluid" = "milk", "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = "Human", @@ -163,7 +161,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) "womb_cum_rate" = CUM_RATE, "womb_cum_mult" = CUM_RATE_MULT, "womb_efficiency" = CUM_EFFICIENCY, - "womb_fluid" = "femcum", "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 24e44f191e..03c6051c5d 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -423,13 +423,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["feature_balls_size"] >> features["balls_size"] S["feature_balls_shape"] >> features["balls_shape"] S["feature_balls_sack_size"] >> features["balls_sack_size"] - S["feature_balls_fluid"] >> features["balls_fluid"] //breasts features S["feature_has_breasts"] >> features["has_breasts"] S["feature_breasts_size"] >> features["breasts_size"] S["feature_breasts_shape"] >> features["breasts_shape"] S["feature_breasts_color"] >> features["breasts_color"] - S["feature_breasts_fluid"] >> features["breasts_fluid"] S["feature_breasts_producing"] >> features["breasts_producing"] //vagina features S["feature_has_vag"] >> features["has_vag"] diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index d1f1a08ea8..1537d5cebe 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -46,7 +46,9 @@ desc += " You estimate that they're [uppertext(size)]-cups." if(CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION) && aroused_state) - desc += " They're leaking [initial(fluid_id.name)]." + var/datum/reagent/R = GLOB.chemical_reagents_list[fluid_id] + if(R) + desc += " They're leaking [lowertext(R.name)]." var/string if(owner) if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) @@ -120,7 +122,6 @@ color = "#[D.features["breasts_color"]]" size = D.features["breasts_size"] shape = D.features["breasts_shape"] - fluid_id = D.features["breasts_fluid"] if(!D.features["breasts_producing"]) DISABLE_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH) if(!isnum(size)) diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index e5b34926de..9573020417 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -68,7 +68,6 @@ shape = D.features["balls_shape"] if(D.features["balls_shape"] == "Hidden") ENABLE_BITFIELD(genital_flags, GENITAL_INTERNAL) - fluid_id = D.features["balls_fluid"] fluid_rate = D.features["balls_cum_rate"] fluid_mult = D.features["balls_cum_mult"] fluid_efficiency = D.features["balls_efficiency"] diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index 5584181a70..334f301dca 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -57,13 +57,11 @@ WRITE_FILE(S["feature_balls_size"], features["balls_size"]) WRITE_FILE(S["feature_balls_shape"], features["balls_shape"]) WRITE_FILE(S["feature_balls_sack_size"], features["balls_sack_size"]) - WRITE_FILE(S["feature_balls_fluid"], features["balls_fluid"]) //breasts features WRITE_FILE(S["feature_has_breasts"], features["has_breasts"]) WRITE_FILE(S["feature_breasts_size"], features["breasts_size"]) WRITE_FILE(S["feature_breasts_shape"], features["breasts_shape"]) WRITE_FILE(S["feature_breasts_color"], features["breasts_color"]) - WRITE_FILE(S["feature_breasts_fluid"], features["breasts_fluid"]) WRITE_FILE(S["feature_breasts_producing"], features["breasts_producing"]) //vagina features WRITE_FILE(S["feature_has_vag"], features["has_vag"]) From 26d8d9387a6af5cedef24d0eb00d00d96d31e137 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 05:06:59 +0100 Subject: [PATCH 047/118] ok --- code/__HELPERS/mobs.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 339069a364..1669c941c2 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -179,7 +179,6 @@ "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, - "balls_fluid" = "semen", "has_ovi" = FALSE, "ovi_shape" = "knotted", "ovi_length" = 6, @@ -194,7 +193,6 @@ "breasts_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "breasts_size" = pick(GLOB.breasts_size_list), "breasts_shape" = "Pair", - "breasts_fluid" = "milk", "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = pick(GLOB.vagina_shapes_list), @@ -206,7 +204,6 @@ "womb_cum_rate" = CUM_RATE, "womb_cum_mult" = CUM_RATE_MULT, "womb_efficiency" = CUM_EFFICIENCY, - "womb_fluid" = "femcum", "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", From b6509d25e663b235bf4d10af32403553c920c0a5 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 06:34:42 +0100 Subject: [PATCH 048/118] Ports "Cleans up plante gene mutability." --- code/modules/hydroponics/grown/flowers.dm | 5 +++-- code/modules/hydroponics/grown/misc.dm | 5 +++-- code/modules/hydroponics/grown/mushrooms.dm | 7 ++++--- code/modules/hydroponics/plant_genes.dm | 4 +++- code/modules/hydroponics/seeds.dm | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 8cdf403b00..b9118f0bee 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -72,8 +72,9 @@ rarity = 30 /obj/item/seeds/poppy/lily/trumpet/Initialize() - ..() - unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE) + . = ..() + if(!nogenes) + unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE) /obj/item/reagent_containers/food/snacks/grown/trumpet seed = /obj/item/seeds/poppy/lily/trumpet diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index e0a2453353..18ca5cc812 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -83,8 +83,9 @@ reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/silibinin = 0.1) /obj/item/seeds/galaxythistle/Initialize() - ..() - unset_mutability(/datum/plant_gene/trait/invasive, PLANT_GENE_REMOVABLE) + . = ..() + if(!nogenes) + unset_mutability(/datum/plant_gene/trait/invasive, PLANT_GENE_REMOVABLE) /obj/item/reagent_containers/food/snacks/grown/galaxythistle seed = /obj/item/seeds/galaxythistle diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 7e43911c5c..2610a2c044 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -218,9 +218,10 @@ reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) /obj/item/seeds/chanterelle/jupitercup/Initialize() - ..() - unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE) - unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE) + . = ..() + if(!nogenes) + unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE) + unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE) /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup seed = /obj/item/seeds/chanterelle/jupitercup diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 99fd873995..756788898a 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -18,7 +18,9 @@ return !istype(S, /obj/item/seeds/sample) // Samples can't accept new genes /datum/plant_gene/proc/Copy() - return new type + var/datum/plant_gene/G = new type + G.mutability_flags = mutability_flags + return G /datum/plant_gene/proc/apply_vars(obj/item/seeds/S) // currently used for fire resist, can prob. be further refactored return diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index f459e97814..aa0e789721 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -37,7 +37,7 @@ var/weed_rate = 1 //If the chance below passes, then this many weeds sprout during growth var/weed_chance = 5 //Percentage chance per tray update to grow weeds -/obj/item/seeds/Initialize(loc, nogenes = 0) +/obj/item/seeds/Initialize(mapload, nogenes = 0) . = ..() pixel_x = rand(-8, 8) pixel_y = rand(-8, 8) From dcb3447c12e57899f8d70c44c8ab195be69f43be Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 06:51:50 +0100 Subject: [PATCH 049/118] Update misc.dm --- code/modules/hydroponics/grown/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 18ca5cc812..b8496c865c 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -82,7 +82,7 @@ mutatelist = list() reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/silibinin = 0.1) -/obj/item/seeds/galaxythistle/Initialize() +/obj/item/seeds/galaxythistle/Initialize(mapload, nogenes = FALSE) . = ..() if(!nogenes) unset_mutability(/datum/plant_gene/trait/invasive, PLANT_GENE_REMOVABLE) From 4e4b0d718ae4c38248cc01078979ac5512c9c8d4 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 06:52:54 +0100 Subject: [PATCH 050/118] Update mushrooms.dm --- code/modules/hydroponics/grown/mushrooms.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 2610a2c044..554115eb5f 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -217,7 +217,7 @@ growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) -/obj/item/seeds/chanterelle/jupitercup/Initialize() +/obj/item/seeds/chanterelle/jupitercup/Initialize(mapload, nogenes = FALSE) . = ..() if(!nogenes) unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE) From dd4e1d8f5796c54e0d099906393700e3e0852fa5 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 06:57:07 +0100 Subject: [PATCH 051/118] Update flowers.dm --- code/modules/hydroponics/grown/flowers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index b9118f0bee..4843d863c5 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -71,7 +71,7 @@ reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) rarity = 30 -/obj/item/seeds/poppy/lily/trumpet/Initialize() +/obj/item/seeds/poppy/lily/trumpet/Initialize(mapload, nogenes = FALSE) . = ..() if(!nogenes) unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE) From a0caada85943f2bb6d7dd8e21b7c5c623be7f661 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 08:05:27 +0100 Subject: [PATCH 052/118] runtime drifting --- code/game/objects/effects/spawners/gibspawner.dm | 4 ++-- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/antagonists/cult/cult.dm | 2 +- code/modules/antagonists/cult/runes.dm | 2 +- code/modules/mob/living/carbon/human/death.dm | 3 ++- code/modules/mob/living/carbon/human/say.dm | 2 +- code/modules/mob/living/simple_animal/bot/bot.dm | 5 +++-- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index f47d3b8ed3..c135458873 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -10,7 +10,7 @@ var/list/gibamounts = list() //amount to spawn for each gib decal type we'll spawn. var/list/gibdirections = list() //of lists of possible directions to spread each gib decal type towards. -/obj/effect/gibspawner/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases) +/obj/effect/gibspawner/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases, list/blood_dna) . = ..() if(gibtypes.len != gibamounts.len) stack_trace("Gib list amount length mismatch!") @@ -33,7 +33,7 @@ var/body_coloring = "" if(source_mob) if(!issilicon(source_mob)) - dna_to_add = source_mob.get_blood_dna_list() //ez pz + dna_to_add = blood_dna || source_mob.get_blood_dna_list() //ez pz if(ishuman(source_mob)) var/mob/living/carbon/human/H = source_mob if(H.dna.species.use_skintones) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 37c79b1123..b8b92b0a58 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -75,7 +75,7 @@ message_admins("[key_name_admin(src)] decided not to answer [key_name_admin(H)]'s [sender] request.") return - log_directed_talk(src, H, input, LOG_ADMIN, "reply") + log_directed_talk(mob, H, input, LOG_ADMIN, "reply") message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"") to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"") diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index df2383f892..ed912db044 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -300,7 +300,7 @@ if(ishuman(cultist)) var/mob/living/carbon/human/H = cultist H.eye_color = "f00" - H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) + H.dna?.update_ui_block(DNA_EYE_COLOR_BLOCK) ADD_TRAIT(H, TRAIT_CULT_EYES, "valid_cultist") H.update_body() diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 7948b30035..0111334748 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -885,7 +885,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(new_human) new_human.visible_message("[new_human] suddenly dissolves into bones and ashes.", \ "Your link to the world fades. Your form breaks apart.") - for(var/obj/I in new_human) + for(var/obj/item/I in new_human) new_human.dropItemToGround(I, TRUE) new_human.dust() else if(choice == "Ascend as a Dark Spirit") diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index d6f6b6d9ae..49053d17db 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -6,6 +6,7 @@ /mob/living/carbon/human/spawn_gibs(with_bodyparts, atom/loc_override) var/location = loc_override ? loc_override.drop_location() : drop_location() + var/blood_dna = get_blood_dna_list() if(dna?.species?.gib_types) var/datum/species/S = dna.species var/length = length(S.gib_types) @@ -13,7 +14,7 @@ var/path = (with_bodyparts && length > 1) ? S.gib_types[2] : S.gib_types[1] new path(location, src, get_static_viruses()) else - new S.gib_types(location, src, get_static_viruses()) + new S.gib_types(location, src, get_static_viruses(), dna) else if(with_bodyparts) new /obj/effect/gibspawner/human(location, src, get_static_viruses()) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 29597344cf..1079c48bf9 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -91,7 +91,7 @@ var/say_starter = "Say \"" //" if(findtextEx(temp, say_starter, 1, length(say_starter) + 1) && length(temp) > length(say_starter)) //case sensitive means - temp = trim_left(copytext(temp, length(say_starter + 1))) + temp = trim_left(copytext(temp, length(say_starter) + 1)) temp = replacetext(temp, ";", "", 1, 2) //general radio while(trim_left(temp)[1] == ":") //dept radio again (necessary) temp = copytext_char(trim_left(temp), 3) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index cd449dacd9..69aacbf1d6 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -182,8 +182,9 @@ return TRUE /mob/living/simple_animal/bot/death(gibbed) - explode() - ..() + . = ..() + if(!gibbed) + explode() /mob/living/simple_animal/bot/proc/explode() qdel(src) From 4842e29c2e0d5cacca1433696d86e41950f39f68 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 4 Feb 2020 07:09:50 -0500 Subject: [PATCH 053/118] buffs carps again --- .../mob/living/simple_animal/hostile/carp.dm | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 4122cab6d9..d8da7c04c3 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -17,8 +17,8 @@ emote_taunt = list("gnashes") taunt_chance = 30 speed = 0 - maxHealth = 25 - health = 25 + maxHealth = 35 + health = 35 spacewalk = TRUE harm_intent_damage = 8 @@ -59,8 +59,8 @@ icon_living = "megacarp" icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" - maxHealth = 20 - health = 20 + maxHealth = 30 + health = 30 pixel_x = -16 mob_size = MOB_SIZE_LARGE @@ -73,9 +73,9 @@ /mob/living/simple_animal/hostile/carp/megacarp/Initialize() . = ..() name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]" - melee_damage_lower += rand(2, 10) + melee_damage_lower += rand(4, 10) melee_damage_upper += rand(10,20) - maxHealth += rand(30,60) + maxHealth += rand(40,60) move_to_delay = rand(3,7) /mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) @@ -104,4 +104,14 @@ melee_damage_lower = 15 melee_damage_upper = 18 +/mob/living/simple_animal/hostile/carp/cayenne/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(.) + regen_cooldown = world.time + REGENERATION_DELAY + +/mob/living/simple_animal/hostile/carp/cayenne/Life() + . = ..() + if(regen_cooldown < world.time) + heal_overall_damage(8) + #undef REGENERATION_DELAY From f66d40151689eec55b31e60f700e5c22435a8ecf Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 4 Feb 2020 07:16:15 -0500 Subject: [PATCH 054/118] forgot to move the var --- code/modules/mob/living/simple_animal/hostile/carp.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index d8da7c04c3..17d8b2dff0 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -21,6 +21,8 @@ health = 35 spacewalk = TRUE + var/regen_cooldown = 0 //Used for Mega carp and Cayenne + harm_intent_damage = 8 obj_damage = 50 melee_damage_lower = 15 @@ -68,8 +70,6 @@ melee_damage_lower = 20 melee_damage_upper = 20 - var/regen_cooldown = 0 - /mob/living/simple_animal/hostile/carp/megacarp/Initialize() . = ..() name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]" From ab1730ad1f3258e14af27203d68d7c8e48c05200 Mon Sep 17 00:00:00 2001 From: EmeraldSundisk <51142887+EmeraldSundisk@users.noreply.github.com> Date: Tue, 4 Feb 2020 11:38:36 -0800 Subject: [PATCH 055/118] Add files via upload --- .../map_files/Deltastation/DeltaStation2.dmm | 254 ++++++++++-------- 1 file changed, 139 insertions(+), 115 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f4135b7566..dc7ff335e4 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -35039,9 +35039,9 @@ /area/quartermaster/miningoffice) "blX" = ( /obj/machinery/disposal/bin, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "blY" = ( @@ -35915,7 +35915,6 @@ /area/quartermaster/miningoffice) "bnA" = ( /obj/structure/plasticflaps/opaque, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northright{ req_access_txt = "48" @@ -35923,7 +35922,6 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "bnB" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -36760,6 +36758,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "boX" = ( @@ -36767,7 +36768,6 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -36780,10 +36780,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "boY" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -36796,11 +36798,13 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "boZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" }, @@ -36808,18 +36812,17 @@ dir = 9 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) -"bpa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) +"bpa" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "bpb" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -39341,12 +39344,14 @@ /area/hallway/primary/central) "bsV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1; + name = "Mining Junction"; + sortType = 20 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bsW" = ( @@ -85386,10 +85391,6 @@ }, /turf/open/floor/plasteel, /area/medical/medbay/central) -"cNB" = ( -/obj/machinery/status_display/evac, -/turf/closed/wall, -/area/medical/medbay/central) "cNC" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -125676,6 +125677,23 @@ }, /turf/open/floor/plasteel/dark, /area/library) +"ekx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "exE" = ( /obj/machinery/air_sensor/atmos/toxins_mixing_tank, /turf/open/floor/engine/vacuum, @@ -125766,17 +125784,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) -"eYg" = ( -/obj/machinery/door/airlock/external{ - name = "External Docking Port" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "faI" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -125935,15 +125942,6 @@ }, /turf/open/floor/engine, /area/science/mixing) -"gdb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "giN" = ( /obj/structure/window/reinforced{ dir = 8 @@ -125955,19 +125953,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/circuit) -"gmn" = ( -/obj/machinery/door/airlock/external{ - name = "External Docking Port" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "gut" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -126102,11 +126087,6 @@ /obj/structure/sign/warning/vacuum, /turf/closed/wall/r_wall, /area/chapel/office) -"hlu" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/computer/shuttle/mining/common, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "hrP" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -126284,6 +126264,11 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"iUX" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "jdO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -126373,6 +126358,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"jyj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "jBE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -126499,6 +126492,19 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) +"kyt" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kKn" = ( /obj/structure/window/reinforced{ dir = 8 @@ -126700,23 +126706,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/aft) -"mgh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "mkm" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ @@ -126842,6 +126831,17 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"ohY" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "oHk" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -127315,6 +127315,17 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"uau" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "upk" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -127389,6 +127400,10 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"uSB" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/maintenance/starboard/fore) "uYS" = ( /obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; @@ -127472,6 +127487,21 @@ heat_capacity = 1e+006 }, /area/maintenance/port/aft) +"xfw" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "xmt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -127510,17 +127540,6 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) -"xDY" = ( -/obj/docking_port/stationary{ - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/meta; - width = 7 - }, -/turf/open/space/basic, -/area/space) "xDZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -127539,6 +127558,17 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"xII" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/fore) "xJl" = ( /obj/structure/table, /obj/item/folder/white, @@ -127578,6 +127608,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output, /turf/open/floor/engine/vacuum, /area/science/mixing) +"xZc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "xZM" = ( /obj/structure/fans/tiny/invisible, /turf/open/space/basic, @@ -127608,21 +127647,6 @@ }, /turf/open/floor/plating, /area/science/research/abandoned) -"ylW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) (1,1,1) = {" aaa @@ -137517,7 +137541,7 @@ bPC bRK bTC bVK -ylW +xfw cal bPC aaa @@ -137774,7 +137798,7 @@ bPC bRL bTC bVx -mgh +ekx cam bPC bRO @@ -138031,7 +138055,7 @@ bPC bRM bTD bVL -mgh +ekx can bPC bkE @@ -160040,10 +160064,10 @@ aaa aaa aaa aaa -xDY -eYg -gdb -gmn +uau +ohY +xZc +kyt abe abp abC @@ -160301,7 +160325,7 @@ aaa aaO aaO aaO -hlu +iUX abq abD abD @@ -168897,7 +168921,7 @@ cHP cIS bqX cMa -cNB +iQI cPr cQW cSF @@ -171422,7 +171446,7 @@ baU baQ baQ boW -brb +jyj bsV bup bvN @@ -172449,7 +172473,7 @@ bio bjZ blW aig -aiC +xII aig aad but @@ -172706,7 +172730,7 @@ bip bka baQ aig -apw +auv aig aaa but @@ -172962,7 +172986,7 @@ bgP biq bjZ blX -aig +uSB bpa aig aaa From 56ef22f4721adc1b3cf2f9b33e1c87d70a1234f1 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 20:49:49 +0100 Subject: [PATCH 056/118] Update death.dm --- code/modules/mob/living/carbon/human/death.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 49053d17db..3db71f90f3 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -14,7 +14,7 @@ var/path = (with_bodyparts && length > 1) ? S.gib_types[2] : S.gib_types[1] new path(location, src, get_static_viruses()) else - new S.gib_types(location, src, get_static_viruses(), dna) + new S.gib_types(location, src, get_static_viruses(), blood_dna) else if(with_bodyparts) new /obj/effect/gibspawner/human(location, src, get_static_viruses()) @@ -68,4 +68,4 @@ /mob/living/carbon/proc/makeUncloneable() ADD_TRAIT(src, TRAIT_NOCLONE, MADE_UNCLONEABLE) blood_volume = 0 - return TRUE \ No newline at end of file + return TRUE From fc7c900cded693ed30cef37dab6698fbc1605995 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 20:51:01 +0100 Subject: [PATCH 057/118] Update death.dm --- code/modules/mob/living/carbon/human/death.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 3db71f90f3..4e6aac4bcb 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -6,8 +6,8 @@ /mob/living/carbon/human/spawn_gibs(with_bodyparts, atom/loc_override) var/location = loc_override ? loc_override.drop_location() : drop_location() - var/blood_dna = get_blood_dna_list() if(dna?.species?.gib_types) + var/blood_dna = get_blood_dna_list() var/datum/species/S = dna.species var/length = length(S.gib_types) if(length) From 8c252779133bb05f8e13b4146871b93fef36b45a Mon Sep 17 00:00:00 2001 From: EmeraldSundisk <51142887+EmeraldSundisk@users.noreply.github.com> Date: Tue, 4 Feb 2020 12:17:28 -0800 Subject: [PATCH 058/118] Add files via upload --- .../map_files/Deltastation/DeltaStation2.dmm | 241 ++++++++++-------- 1 file changed, 128 insertions(+), 113 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index dc7ff335e4..fd0f0a1742 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -36746,6 +36746,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "boW" = ( @@ -36759,7 +36762,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -38206,6 +38209,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "brb" = ( @@ -39347,10 +39351,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - name = "Mining Junction"; - sortType = 20 +/obj/structure/disposalpipe/segment{ + dir = 10 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -125677,23 +125679,6 @@ }, /turf/open/floor/plasteel/dark, /area/library) -"ekx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "exE" = ( /obj/machinery/air_sensor/atmos/toxins_mixing_tank, /turf/open/floor/engine/vacuum, @@ -125820,6 +125805,27 @@ }, /turf/open/floor/plasteel, /area/medical/medbay/central) +"fiK" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8; + name = "Mining Junction"; + sortType = 22 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "fno" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -126264,11 +126270,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) -"iUX" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/computer/shuttle/mining/common, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "jdO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -126358,14 +126359,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) -"jyj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "jBE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -126380,6 +126373,10 @@ }, /turf/open/floor/plasteel, /area/medical/morgue) +"jOB" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/maintenance/starboard/fore) "jOE" = ( /obj/machinery/newscaster{ pixel_x = 32 @@ -126492,19 +126489,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) -"kyt" = ( -/obj/machinery/door/airlock/external{ - name = "External Docking Port" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "kKn" = ( /obj/structure/window/reinforced{ dir = 8 @@ -126591,6 +126575,17 @@ }, /turf/open/floor/plasteel/dark, /area/medical/medbay/central) +"lDl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/fore) "lEl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -126756,6 +126751,15 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) +"mvx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mxm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/circuit/green, @@ -126765,6 +126769,17 @@ /obj/item/assembly/signaler, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"mLI" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mPj" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -126827,19 +126842,26 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/maintenance/port/fore) +"nQR" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "nSh" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"ohY" = ( +"nSS" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "oHk" = ( @@ -127063,6 +127085,21 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) +"qeN" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "qhc" = ( /obj/structure/table/reinforced, /obj/item/integrated_electronics/analyzer, @@ -127315,17 +127352,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) -"uau" = ( -/obj/docking_port/stationary{ - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/meta; - width = 7 - }, -/turf/open/space/basic, -/area/space) "upk" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -127400,10 +127426,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) -"uSB" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/maintenance/starboard/fore) "uYS" = ( /obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; @@ -127473,6 +127495,17 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"xdp" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "xdZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -127487,21 +127520,6 @@ heat_capacity = 1e+006 }, /area/maintenance/port/aft) -"xfw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "xmt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -127540,6 +127558,23 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) +"xCB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "xDZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -127558,17 +127593,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) -"xII" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/starboard/fore) "xJl" = ( /obj/structure/table, /obj/item/folder/white, @@ -127608,15 +127632,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output, /turf/open/floor/engine/vacuum, /area/science/mixing) -"xZc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "xZM" = ( /obj/structure/fans/tiny/invisible, /turf/open/space/basic, @@ -137541,7 +137556,7 @@ bPC bRK bTC bVK -xfw +qeN cal bPC aaa @@ -137798,7 +137813,7 @@ bPC bRL bTC bVx -ekx +xCB cam bPC bRO @@ -138055,7 +138070,7 @@ bPC bRM bTD bVL -ekx +xCB can bPC bkE @@ -160064,10 +160079,10 @@ aaa aaa aaa aaa -uau -ohY -xZc -kyt +xdp +mLI +mvx +nSS abe abp abC @@ -160325,7 +160340,7 @@ aaa aaO aaO aaO -iUX +nQR abq abD abD @@ -171190,7 +171205,7 @@ blS baQ boV bra -bsU +fiK bus bvM bwZ @@ -171446,7 +171461,7 @@ baU baQ baQ boW -jyj +brb bsV bup bvN @@ -172473,7 +172488,7 @@ bio bjZ blW aig -xII +lDl aig aad but @@ -172986,7 +173001,7 @@ bgP biq bjZ blX -uSB +jOB bpa aig aaa From a67902ee32a885d84f20f36aeadfabcf9d7c78eb Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 4 Feb 2020 12:43:59 -0800 Subject: [PATCH 059/118] Also added instant runoff and renamed schulze. yak shaving --- code/__DEFINES/vote.dm | 3 ++- code/controllers/subsystem/vote.dm | 40 +++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm index 6553447029..b83ea7b8f6 100644 --- a/code/__DEFINES/vote.dm +++ b/code/__DEFINES/vote.dm @@ -1,7 +1,8 @@ #define PLURALITY_VOTING 0 #define APPROVAL_VOTING 1 -#define RANKED_CHOICE_VOTING 2 +#define SCHULZE_VOTING 2 #define SCORE_VOTING 3 #define MAJORITY_JUDGEMENT_VOTING 4 +#define INSTANT_RUNOFF_VOTING 5 GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great")) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 49f1f3f851..2a7c4401f3 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -204,6 +204,28 @@ SUBSYSTEM_DEF(vote) scores[score_name] = (scores[score_name]-min_score)/(max_score-min_score) SSblackbox.record_feedback("nested tally","voting",scores[score_name],list(blackbox_text,"Total scores",score_name)) +/datum/controller/subsystem/vote/proc/get_runoff_results(var/blackbox_text) + var/already_lost_runoff = list() + var/list/cur_choices = choices.Copy() + for(var/ckey in voted) + choices[choices[voted[ckey][1]]]++ // jesus christ how horrifying + for(var/_this_var_unused_ignore_it in 1 to choices.len) // if it takes more than this something REALLY wrong happened + for(var/ckey in voted) + cur_choices[cur_choices[voted[ckey][1]]]++ // jesus christ how horrifying + var/least_vote = 100000 + var/least_voted + for(var/i in 1 to cur_choices.len) + var/option = cur_choices[i] + if(cur_choices[option] > voted.len/2) + return list(option) + else if(cur_choices[option] < least_vote && !(option in already_lost_runoff)) + least_vote = cur_choices[option] + least_voted = i + already_lost_runoff += cur_choices[least_voted] + for(var/ckey in voted) + voted[ckey] -= least_voted + for(var/option in cur_choices) + cur_choices[option] = 0 /datum/controller/subsystem/vote/proc/announce_result() var/vote_title_text @@ -214,19 +236,19 @@ SUBSYSTEM_DEF(vote) else text += "[capitalize(mode)] Vote" vote_title_text = "[capitalize(mode)] Vote" - if(vote_system == RANKED_CHOICE_VOTING) + if(vote_system == SCHULZE_VOTING) calculate_condorcet_votes(vote_title_text) if(vote_system == SCORE_VOTING) calculate_scores(vote_title_text) if(vote_system == MAJORITY_JUDGEMENT_VOTING) calculate_majority_judgement_vote(vote_title_text) // nothing uses this at the moment - var/list/winners = get_result() + var/list/winners = vote_system == INSTANT_RUNOFF_VOTING ? get_runoff_results() : get_result() var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic" if(winners.len > 0) if(was_roundtype_vote) stored_gamemode_votes = list() if(!obfuscated) - if(vote_system == RANKED_CHOICE_VOTING) + if(vote_system == SCHULZE_VOTING) text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" if(vote_system == MAJORITY_JUDGEMENT_VOTING) text += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" @@ -265,7 +287,7 @@ SUBSYSTEM_DEF(vote) if(APPROVAL_VOTING,PLURALITY_VOTING) for(var/i=1,i<=choices.len,i++) SSblackbox.record_feedback("nested tally","voting",choices[choices[i]],list(vote_title_text,choices[i])) - if(RANKED_CHOICE_VOTING) + if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING) for(var/i=1,i<=voted.len,i++) var/list/myvote = voted[voted[i]] if(islist(myvote)) @@ -274,7 +296,7 @@ SUBSYSTEM_DEF(vote) if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results var/admintext = "Obfuscated results" if(vote_system != SCORE_VOTING) - if(vote_system == RANKED_CHOICE_VOTING) + if(vote_system == SCHULZE_VOTING) admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!" else if(vote_system == MAJORITY_JUDGEMENT_VOTING) admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!" @@ -385,7 +407,7 @@ SUBSYSTEM_DEF(vote) voted[usr.ckey] = list(vote) choices[choices[vote]]++ return vote - if(RANKED_CHOICE_VOTING) + if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING) if(usr.ckey in voted) if(vote in voted[usr.ckey]) voted[usr.ckey] -= vote @@ -394,7 +416,7 @@ SUBSYSTEM_DEF(vote) voted[usr.ckey] = list() voted[usr.ckey] += vote saved -= usr.ckey - if(SCORE_VOTING) + if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING) if(!(usr.ckey in voted)) voted += usr.ckey voted[usr.ckey] = list() @@ -519,7 +541,7 @@ SUBSYSTEM_DEF(vote) . += "

        Vote one.

        " if(APPROVAL_VOTING) . += "

        Vote any number of choices.

        " - if(RANKED_CHOICE_VOTING) + if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING) . += "

        Vote by order of preference. Revoting will demote to the bottom. 1 is your favorite, and higher numbers are worse.

        " if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING) . += "

        Grade the candidates by how much you like them.

        " @@ -541,7 +563,7 @@ SUBSYSTEM_DEF(vote) if(choice_descs.len >= i) . += "
      • [choice_descs[i]]
        • " . += "
      " - if(RANKED_CHOICE_VOTING) + if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING) var/list/myvote = voted[C.ckey] for(var/i=1,i<=choices.len,i++) var/vote = (islist(myvote) ? (myvote.Find(i)) : 0) From 06fd6645b3720bcbb1a6ff6e9e2703e2ff54d8f3 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 4 Feb 2020 16:01:22 -0500 Subject: [PATCH 060/118] And it wokrs --- .../circuitboards/machine_circuitboards.dm | 8 ++++ code/modules/cargo/packs/vending.dm | 44 ++++++++++++++++++ code/modules/vending/assist.dm | 4 ++ code/modules/vending/cartridge.dm | 4 ++ code/modules/vending/drinnerware.dm | 4 ++ code/modules/vending/engivend.dm | 4 ++ code/modules/vending/kinkmate.dm | 2 - code/modules/vending/megaseed.dm | 4 ++ code/modules/vending/nutrimax.dm | 4 ++ code/modules/vending/sovietvend.dm | 1 - code/modules/vending/sustenance.dm | 4 ++ code/modules/vending/youtool.dm | 4 ++ icons/obj/citvending.dmi | Bin 4504 -> 0 bytes icons/obj/vending.dmi | Bin 102556 -> 106864 bytes icons/obj/vending_restock.dmi | Bin 1777 -> 2289 bytes modular_citadel/icons/vending_restock.dmi | Bin 408 -> 0 bytes 16 files changed, 84 insertions(+), 3 deletions(-) delete mode 100644 icons/obj/citvending.dmi delete mode 100644 modular_citadel/icons/vending_restock.dmi diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 5621a946bb..2196246b03 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -238,6 +238,14 @@ /obj/machinery/vending/cigarette = "ShadyCigs Deluxe", /obj/machinery/vending/games = "\improper Good Clean Fun", /obj/machinery/vending/autodrobe = "AutoDrobe", + /obj/machinery/vending/assist = "\improper Vendomat", + /obj/machinery/vending/engivend = "\improper Engi-Vend", + /obj/machinery/vending/engivend = "\improper YouTool", + /obj/machinery/vending/sustenance = "\improper Sustenance Vendor", + /obj/machinery/vending/dinnerware = "\improper Plasteel Chef's Dinnerware Vendor", + /obj/machinery/vending/cart = "\improper PTech", + /obj/machinery/vending/hydronutrients = "\improper NutriMax", + /obj/machinery/vending/hydroseeds = "\improper MegaSeed Servitor", /obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe", /obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe", /obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe", diff --git a/code/modules/cargo/packs/vending.dm b/code/modules/cargo/packs/vending.dm index f9982d17b6..344d19f6c9 100644 --- a/code/modules/cargo/packs/vending.dm +++ b/code/modules/cargo/packs/vending.dm @@ -22,6 +22,14 @@ /obj/item/book/granter/action/drink_fling) crate_name = "bartending supply crate" +/datum/supply_pack/vending/hydro + name = "Cartridge Supply Crate" + desc = "Restock you cartridges for PDAs. Contains a PTech vending machine refill." + cost = 5000 + contains = list(/obj/item/vending_refill/cart) + crate_name = "hydroponics supply crate" + crate_type = /obj/structure/closet/crate + /datum/supply_pack/vending/cigarette name = "Cigarette Supply Crate" desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill." @@ -30,6 +38,25 @@ crate_name = "cigarette supply crate" crate_type = /obj/structure/closet/crate +/datum/supply_pack/vending/dinner + name = "Dinnerware Supply Crate" + desc = "Use a plate and have some utensils! Contains a dinnerware and sustenance vending machine refill." + cost = 2500 + contains = list(/obj/item/vending_refill/sustenance, + /obj/item/vending_refill/dinnerware) + crate_name = "dinnerware supply crate" + crate_type = /obj/structure/closet/crate + +/datum/supply_pack/vending/dinner + name = "Engineering Supply Crate" + desc = "Packs of tools waiting to be used for repairing. Contains a tool and engineering vending machine refill. Requires CE access." + cost = 5500 //Powerfull + access = ACCESS_CE + contains = list(/obj/item/vending_refill/tool, + /obj/item/vending_refill/engivend) + crate_name = "engineering supply crate" + crate_type = /obj/structure/closet/crate/secure/engineering + /datum/supply_pack/vending/games name = "Games Supply Crate" desc = "Get your game on with this game vending machine refill." @@ -38,8 +65,18 @@ crate_name = "games supply crate" crate_type = /obj/structure/closet/crate +/datum/supply_pack/vending/hydro + name = "Hydroponics Supply Crate" + desc = "Arnt you glad you dont have to do it the natural way? Contains a megaseed and nutrimax vending machine refill." + cost = 5000 + contains = list(/obj/item/vending_refill/hydroseeds, + /obj/item/vending_refill/hydronutrients) + crate_name = "hydroponics supply crate" + crate_type = /obj/structure/closet/crate + /datum/supply_pack/vending/kinkmate name = "Kinkmate Supply and Construction Kit" + desc = "A fun way to spend the shift. Contains unmentionable desires." cost = 2000 contraband = TRUE contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate) @@ -77,6 +114,13 @@ contains = list(/obj/item/vending_refill/cola) crate_name = "soft drinks supply crate" +/datum/supply_pack/vending/vendomat + name = "Vendomat Supply Crate" + desc = "Contains a Vendomat restock unit!" + cost = 1200 + contains = list(/obj/item/vending_refill/assist) + crate_name = "vendomat supply crate" + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Wardrobe Vendors //////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm index 0d0dd40b36..5dafd3935c 100644 --- a/code/modules/vending/assist.dm +++ b/code/modules/vending/assist.dm @@ -17,4 +17,8 @@ /obj/item/beacon = 2) product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!" armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/assist resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/assist + icon_state = "refill_engi" \ No newline at end of file diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm index 8b9c8e2e01..35b1a1da7a 100644 --- a/code/modules/vending/cartridge.dm +++ b/code/modules/vending/cartridge.dm @@ -14,4 +14,8 @@ /obj/item/cartridge/captain = 3, /obj/item/cartridge/quartermaster = 10) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/cart resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/cart + icon_state = "refill_pda" diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 9ba8c53f6c..be74cc675b 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -27,4 +27,8 @@ /obj/item/reagent_containers/food/condiment/enzyme = 1, /obj/item/reagent_containers/glass/bottle/cryoxadone = 2) // Bartender can literally make this with upgraded parts, or it gets stolen from medical. armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/dinnerware resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/dinnerware + icon_state = "refill_cook" \ No newline at end of file diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index ad65b5311f..15da7cab15 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -28,4 +28,8 @@ /obj/item/rcd_ammo/large = 5 ) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/engivend resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/engivend + icon_state = "refill_engi" \ No newline at end of file diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm index f840f391fa..39d5db8de8 100644 --- a/code/modules/vending/kinkmate.dm +++ b/code/modules/vending/kinkmate.dm @@ -1,7 +1,6 @@ /obj/machinery/vending/kink name = "KinkMate" desc = "A vending machine for all your unmentionable desires." - icon = 'icons/obj/citvending.dmi' icon_state = "kink" circuit = /obj/item/circuitboard/machine/kinkmate product_slogans = "Kinky!;Sexy!;Check me out, big boy!" @@ -44,5 +43,4 @@ /obj/item/vending_refill/kink machine_name = "KinkMate" - icon = 'modular_citadel/icons/vending_restock.dmi' icon_state = "refill_kink" diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 03241c4a86..37ce00069c 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -55,4 +55,8 @@ /obj/item/seeds/random = 2) premium = list(/obj/item/reagent_containers/spray/waterflower = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/hydroseeds resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/hydroseeds + icon_state = "refill_hydro" diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm index 392eecfc22..42b7848ac1 100644 --- a/code/modules/vending/nutrimax.dm +++ b/code/modules/vending/nutrimax.dm @@ -17,4 +17,8 @@ contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10, /obj/item/reagent_containers/glass/bottle/diethylamine = 5) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/hydronutrients resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/hydronutrients + icon_state = "refill_hydro" diff --git a/code/modules/vending/sovietvend.dm b/code/modules/vending/sovietvend.dm index 5157f68410..c62cf53612 100644 --- a/code/modules/vending/sovietvend.dm +++ b/code/modules/vending/sovietvend.dm @@ -1,7 +1,6 @@ /obj/machinery/vending/sovietvend name = "KomradeVendtink" desc = "Rodina-mat' zovyot!" - icon = 'icons/obj/citvending.dmi' icon_state = "soviet" vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!" product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!" diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm index 95838bbadd..9783607a21 100644 --- a/code/modules/vending/sustenance.dm +++ b/code/modules/vending/sustenance.dm @@ -12,4 +12,8 @@ /obj/item/tank/internals/emergency_oxygen = 6, /obj/item/clothing/mask/breath = 6) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) + refill_canister = /obj/item/vending_refill/sustenance resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/sustenance + icon_state = "refill_cook" diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index 2a8d5ef733..c027cea6e5 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -19,4 +19,8 @@ premium = list(/obj/item/clothing/gloves/color/yellow = 2, /obj/item/weldingtool/hugetank = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) + refill_canister = /obj/item/vending_refill/tool resistance_flags = FIRE_PROOF + +/obj/item/vending_refill/tool + icon_state = "refill_engi" \ No newline at end of file diff --git a/icons/obj/citvending.dmi b/icons/obj/citvending.dmi deleted file mode 100644 index 8f836b7eb5116b0def626f06c1194214e9ea2a8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4504 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 diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 143171f41411d8360c7d2614c3b4d9ef7a3f9afe..7d08a83fb79b9c9619221aa262f6e6a156525e19 100644 GIT binary patch delta 20757 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 LZC?p;FCp>&O-3^Q delta 16405 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 Xs;?F}ai)$900000NkvXXu0mjf9CW&@ diff --git a/modular_citadel/icons/vending_restock.dmi b/modular_citadel/icons/vending_restock.dmi deleted file mode 100644 index 5df68f4e4c712e77c352f5df946fd91134a73a9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyHUT~%t_Kbr2nh+9K7D%H8RP#z zK_D*7iAWdWaj5FFjUM54l5`s{r)Am;N#aPTHd-^=gyoD-VkbV z(fGk5o%24LCmD)*dUseD2N_>B_EMPhXws2MAqv4OHB5Dl)z$5+jrF5DyNy*huaMBl zI&pMn*pwNwxe~Rtcl_Gfz{}3S$SE^5mi5dvpw<1JE{-7I&-@*OhZVC!z)r5R;) z|9`CRYE!1!{0V!O{4Ey$wDikyroIRM%rhn!&3$-5`0S3DO}r1RUVP{5 Date: Tue, 4 Feb 2020 16:23:36 -0500 Subject: [PATCH 061/118] corrects this missing sprite --- code/modules/vending/security.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 6cf8136c50..666071e254 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -36,4 +36,4 @@ F.update_brightness() /obj/item/vending_refill/security - icon_state = "snackorange" + icon_state = "refill_games" From d2f106976470efb34551d2ccf35934a60df84f36 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 4 Feb 2020 14:32:39 -0800 Subject: [PATCH 062/118] Ported atmos reaction priority fix --- .../atmospherics/gasmixtures/gas_mixture.dm | 5 +++-- .../atmospherics/gasmixtures/reactions.dm | 22 +++++-------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 12efa01a38..5ff8586c34 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -337,8 +337,9 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list()) if(!length(cached_gases)) return var/list/reactions = list() - for(var/I in cached_gases) - reactions += SSair.gas_reactions[I] + for(var/datum/gas_reaction/G in SSair.gas_reactions) + if(cached_gases[G.major_gas]) + reactions += G if(!length(reactions)) return reaction_results = new diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index f9c831a65a..ebe894138d 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -2,8 +2,6 @@ /proc/init_gas_reactions() . = list() - for(var/type in subtypesof(/datum/gas)) - .[type] = list() for(var/r in subtypesof(/datum/gas_reaction)) var/datum/gas_reaction/reaction = r @@ -16,27 +14,19 @@ var/datum/gas/req_gas = req if (!reaction_key || initial(reaction_key.rarity) > initial(req_gas.rarity)) reaction_key = req_gas - .[reaction_key] += list(reaction) - sortTim(., /proc/cmp_gas_reactions, TRUE) + reaction.major_gas = reaction_key + . += reaction + sortTim(., /proc/cmp_gas_reaction) -/proc/cmp_gas_reactions(list/datum/gas_reaction/a, list/datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list - if (!length(a) || !length(b)) - return length(b) - length(a) - var/maxa - var/maxb - for (var/datum/gas_reaction/R in a) - if (R.priority > maxa) - maxa = R.priority - for (var/datum/gas_reaction/R in b) - if (R.priority > maxb) - maxb = R.priority - return maxb - maxa +/proc/cmp_gas_reaction(datum/gas_reaction/a, datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list + return b.priority - a.priority /datum/gas_reaction //regarding the requirements lists: the minimum or maximum requirements must be non-zero. //when in doubt, use MINIMUM_MOLE_COUNT. var/list/min_requirements var/list/max_requirements + var/major_gas //the highest rarity gas used in the reaction. var/exclude = FALSE //do it this way to allow for addition/removal of reactions midmatch in the future var/priority = 100 //lower numbers are checked/react later than higher numbers. if two reactions have the same priority they may happen in either order var/name = "reaction" From 205c38a7c5853c33b7fdc2a9a9e83d2cad3a2983 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 4 Feb 2020 17:40:25 -0500 Subject: [PATCH 063/118] edits 4-5 things, gets 40000 lines of code edits --- _maps/map_files/BoxStation/BoxStation.dmm | 10828 ++++++++++---------- 1 file changed, 5410 insertions(+), 5418 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 4743d12d0e..a630c54b6e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -173,19 +173,6 @@ "aay" = ( /turf/open/floor/plating, /area/security/prison) -"aaz" = ( -/obj/structure/lattice/catwalk, -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 3; - name = "Docking Beacon"; - picked_color = "Burgundy" - }, -/turf/open/space/basic, -/area/space/nearstation) "aaA" = ( /obj/machinery/seed_extractor, /turf/open/floor/plasteel, @@ -247,46 +234,10 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/security/prison) -"aaK" = ( -/obj/structure/lattice/catwalk, -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 3; - name = "Docking Beacon"; - picked_color = "Burgundy" - }, -/turf/open/floor/plating, -/area/space/nearstation) -"aaL" = ( -/obj/machinery/photocopier, -/turf/open/floor/wood, -/area/library) -"aaM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/quartermaster/office) "aaN" = ( /obj/structure/chair/sofa/right, /turf/open/floor/plasteel, /area/security/prison) -"aaO" = ( -/obj/effect/spawner/lootdrop/keg, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "aaP" = ( /obj/machinery/computer/cryopod{ dir = 8; @@ -297,12 +248,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"aaQ" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "aaR" = ( /obj/structure/lattice, /obj/structure/sign/warning/securearea{ @@ -340,15 +285,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"aaY" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 4; - name = "4maintenance loot spawner" - }, -/obj/item/poster/random_official, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "aaZ" = ( /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) @@ -569,11 +505,6 @@ "abF" = ( /turf/open/floor/plasteel/freezer, /area/security/prison) -"abG" = ( -/obj/structure/door_assembly/door_assembly_mai, -/obj/item/electronics/airlock, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "abH" = ( /obj/structure/table, /obj/item/storage/box/chemimp{ @@ -1634,10 +1565,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) -"adO" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating/airless, -/area/space/nearstation) "adP" = ( /obj/structure/cable{ icon_state = "2-8" @@ -2052,34 +1979,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aeD" = ( -/obj/structure/grille/broken, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"aeE" = ( -/obj/structure/girder, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"aeF" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/computer/station_alert{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "aeG" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -2458,12 +2357,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"afn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) "afo" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -2484,39 +2377,6 @@ }, /turf/open/space/basic, /area/space) -"afq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) -"afr" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) -"afs" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, -/obj/machinery/computer/monitor{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "aft" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -2827,15 +2687,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) -"age" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) "agf" = ( /obj/structure/table, /obj/item/stack/sheet/metal, @@ -2985,10 +2836,6 @@ /obj/machinery/suit_storage_unit/security, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"agv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) "agw" = ( /obj/structure/table, /obj/machinery/syndicatebomb/training, @@ -3118,14 +2965,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"agH" = ( -/obj/machinery/bluespace_beacon, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "agI" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -3255,12 +3094,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/warden) -"agX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) "agY" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -3501,16 +3334,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"ahw" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) "ahx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4651,16 +4474,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/brig) -"ajC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/grimy, -/area/ai_monitored/turret_protected/aisat_interior) "ajD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4869,18 +4682,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"ajX" = ( -/obj/machinery/computer/teleporter{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat_interior) -"ajY" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/atmos) "ajZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ @@ -5164,18 +4965,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"akz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/landmark/start/cyborg, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat_interior) "akA" = ( /obj/structure/chair{ dir = 8; @@ -6276,14 +6065,6 @@ /turf/open/floor/plasteel, /area/security/processing) "anu" = ( -/obj/machinery/button/door{ - desc = "A remote control switch for the exit."; - id = "laborexit"; - name = "exit button"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = -6 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -6432,10 +6213,8 @@ /area/space) "anP" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - id_tag = "laborexit"; - name = "Labor Shuttle"; - req_access_txt = "63" +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Airlock" }, /turf/open/floor/plasteel, /area/security/processing) @@ -16138,6 +15917,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"aNV" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/library) "aNW" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel Office"; @@ -22009,7 +21792,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/crew_quarters/heads/captain) "bcR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -22128,6 +21911,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/computer/arcade/minesweeper, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bdj" = ( @@ -23115,7 +22899,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/heads/captain) "bfD" = ( /obj/structure/cable{ @@ -26705,6 +26489,7 @@ /area/crew_quarters/heads/captain) "boa" = ( /obj/structure/toilet{ + contents = newlist(/obj/item/toy/snappop/phoenix); dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -30020,6 +29805,12 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"bvG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space/nearstation) "bvH" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -30190,6 +29981,21 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"bwc" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/quartermaster/office) "bwd" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -48366,6 +48172,16 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"coh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"coi" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, +/turf/open/floor/plasteel, +/area/security/brig) "cop" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ dir = 1 @@ -48524,6 +48340,10 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"coI" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hydroponics) "coJ" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -48754,6 +48574,15 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cpF" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/sign/poster/official/space_cops{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "cpG" = ( /obj/structure/table/optable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -49488,9 +49317,46 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"ctu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) "ctv" = ( /turf/closed/wall/r_wall, /area/space/nearstation) +"ctw" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) +"ctx" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) +"cty" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) "ctz" = ( /obj/machinery/door/poddoor/shutters{ id = "teledoor"; @@ -49535,6 +49401,41 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"ctG" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) +"ctH" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -31 + }, +/obj/machinery/computer/monitor{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) +"ctI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) "ctJ" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -49558,6 +49459,14 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"ctM" = ( +/obj/machinery/bluespace_beacon, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "ctN" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 @@ -49565,6 +49474,12 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"ctP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) "ctQ" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -49590,6 +49505,26 @@ /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall, /area/engine/engineering) +"ctS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) +"ctT" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat_interior) "ctU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -49612,6 +49547,12 @@ /obj/structure/chair, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"ctW" = ( +/obj/machinery/computer/teleporter{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/aisat_interior) "ctX" = ( /obj/machinery/camera{ c_tag = "MiniSat Teleporter"; @@ -49892,6 +49833,12 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) +"cuC" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/atmos) "cuD" = ( /obj/machinery/light/small{ dir = 8 @@ -49940,6 +49887,18 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"cuG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/landmark/start/cyborg, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat_interior) "cuH" = ( /obj/machinery/light/small{ dir = 8 @@ -50882,14 +50841,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"cwP" = ( -/obj/structure/fireplace, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 - }, -/turf/open/floor/plating, -/area/maintenance/port) "cwT" = ( /obj/machinery/camera{ c_tag = "Arrivals Escape Pod 2"; @@ -51199,14 +51150,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"czi" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "czk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -52077,6 +52020,15 @@ /obj/machinery/deepfryer, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) +"cCt" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 4; + name = "4maintenance loot spawner" + }, +/obj/item/poster/random_official, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "cCB" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -52238,6 +52190,36 @@ /obj/structure/closet/radiation, /turf/open/floor/plasteel, /area/engine/engineering) +"cEo" = ( +/obj/structure/closet/boxinggloves, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"cGz" = ( +/obj/structure/table/wood, +/obj/item/instrument/violin, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"cHf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -3; + pixel_y = 20 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + dir = 1; + pixel_x = 3; + pixel_y = 20 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/item/reagent_containers/food/drinks/britcup, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "cHD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52548,27 +52530,10 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"cJn" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/plasteel, -/area/engine/atmos) -"cMk" = ( -/obj/machinery/vr_sleeper{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) +"cIv" = ( +/obj/structure/sign/poster/official/cohiba_robusto_ad, +/turf/closed/wall, +/area/lawoffice) "cMC" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -52599,6 +52564,10 @@ }, /turf/open/floor/plasteel/airless/solarpanel, /area/solar/starboard/aft) +"cMS" = ( +/obj/item/chair/wood, +/turf/open/floor/plating, +/area/maintenance/port) "cNa" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -52752,6 +52721,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cPn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/toilet) "cPA" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4 @@ -52794,47 +52767,25 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cRz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +"cQF" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" }, -/obj/machinery/button/door{ - id = "holoprivacy"; - name = "Holodeck Privacy"; - pixel_y = 24 +/obj/item/radio/intercom{ + pixel_y = 25 }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"cRD" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/dresser, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/power/apc{ - areastring = "/area/crew_quarters/theatre"; - dir = 8; - name = "Theatre APC"; - pixel_x = -25 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/theatre) -"cSn" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"cQT" = ( +/obj/structure/filingcabinet, /obj/machinery/light{ - dir = 1 + dir = 8; + light_color = "#e8eaff" }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "cSA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -53196,6 +53147,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"cTT" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) "cTX" = ( /obj/structure/cable{ icon_state = "0-2" @@ -53218,952 +53175,31 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"cUx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge/meeting_room) "cVb" = ( /turf/closed/wall, /area/hallway/secondary/service) -"cVp" = ( -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/curtain, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) -"cVu" = ( -/obj/machinery/camera{ - c_tag = "Locker Room South"; - dir = 8 - }, -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) +"cVs" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/wood, +/area/bridge/meeting_room) "cVK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/science/circuit) -"cXx" = ( -/obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access_txt = "2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/processing) -"dbn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/engine/engine_smes) -"dbM" = ( -/turf/open/floor/plating, -/area/space/nearstation) -"dcG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/closet/wardrobe/pjs, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/janimaid, -/obj/item/clothing/under/janimaid, -/obj/item/clothing/accessory/maidapron, -/obj/item/clothing/accessory/maidapron, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"dfh" = ( -/obj/machinery/power/apc{ - areastring = "/area/science/circuit"; - name = "Circuitry Lab APC"; - pixel_x = 30 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel, -/area/science/circuit) -"dfI" = ( -/obj/machinery/door/firedoor, -/obj/structure/sign/departments/evac{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"dfL" = ( -/obj/structure/reagent_dispensers/keg/gargle, -/turf/open/floor/wood, -/area/maintenance/bar) -"dgh" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/camera{ - c_tag = "VR Sleepers"; - dir = 1 - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/fitness) -"dgz" = ( -/turf/closed/wall, -/area/crew_quarters/cryopod) -"dhx" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) -"dok" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"doP" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/theatre) -"dqu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) -"dtE" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"dvc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"dvO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/closed/wall, -/area/science/circuit) -"dwc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"dxB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/security/prison) -"dzi" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"dzy" = ( -/obj/machinery/door/airlock{ - name = "Shower Room" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/toilet) -"dHb" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"dKP" = ( -/turf/closed/wall, -/area/maintenance/bar) -"dKV" = ( -/obj/structure/chair/stool/bar, -/turf/open/floor/wood, -/area/maintenance/bar) -"dMu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"dMX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/chair/comfy/brown, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"dMZ" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"dRC" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/hydroponics) -"dSv" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - areastring = "/area/crew_quarters/abandoned_gambling_den"; - name = "Abandoned Gambling Den APC"; - pixel_y = -24 - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"dTe" = ( -/obj/structure/chair/comfy/beige{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/grimy, -/area/hallway/secondary/entry) -"dTJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/heads/captain) -"eaI" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom{ - pixel_x = -30 - }, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"edH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"ego" = ( -/obj/machinery/atmospherics/components/binary/valve, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"egQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "kitchen shutters" - }, -/obj/item/reagent_containers/food/snacks/bluecherrycupcake{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) -"egS" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/snacks/burger/plain, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"elw" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, +"cXU" = ( /obj/effect/turf_decal/tile/red, +/obj/machinery/light{ + light_color = "#c9d3e8" + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"epV" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm6"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/wood, -/area/crew_quarters/dorms) -"eqm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"est" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/computer/shuttle/mining/common{ - dir = 4 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) -"evR" = ( -/turf/open/floor/plating, -/area/maintenance/bar) -"ewZ" = ( -/obj/structure/chair/sofa/right, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"eyM" = ( -/obj/machinery/mineral/ore_redemption{ - input_dir = 2; - output_dir = 1 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) -"eHI" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) -"eLH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/fore) -"eMQ" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/machinery/vending/wardrobe/curator_wardrobe, -/turf/open/floor/carpet, -/area/library) -"eND" = ( -/obj/structure/filingcabinet, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"eNK" = ( -/obj/structure/table/wood, -/obj/item/instrument/guitar, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"eNW" = ( -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) -"eOv" = ( -/obj/effect/landmark/event_spawn, -/turf/closed/wall, -/area/crew_quarters/fitness) -"eOy" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"ePO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"eRk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"eRn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/closed/wall, -/area/quartermaster/warehouse) -"eRz" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"eUd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"eVC" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/crew_quarters/cryopod) -"eVL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) -"eXm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"fbm" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"fby" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"fcG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) -"fhP" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"fjy" = ( -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/crew_quarters/heads/captain) -"flc" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"fnC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/service) -"fnJ" = ( -/obj/structure/sign/mining{ - pixel_y = 7 - }, -/turf/closed/wall, -/area/quartermaster/miningdock) -"frE" = ( -/obj/machinery/vr_sleeper{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/crew_quarters/fitness) -"ftv" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 4; - name = "4maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"fuo" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/grass, -/area/security/prison) -"fvk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"fvW" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"fvY" = ( -/obj/machinery/computer/cryopod{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"fxa" = ( -/obj/structure/chair/wood/normal, -/turf/open/floor/wood{ - icon_state = "wood-broken4" - }, -/area/maintenance/bar) -"fyq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1; - pixel_x = 5 - }, -/obj/machinery/light/small, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/toilet) -"fyM" = ( -/obj/structure/closet/wardrobe/cargotech, -/obj/item/radio/headset/headset_cargo, -/turf/open/floor/plasteel, -/area/quartermaster/storage) -"fzd" = ( -/turf/closed/wall, -/area/crew_quarters/abandoned_gambling_den) -"fGf" = ( -/obj/machinery/smartfridge/disks{ - pixel_y = 2 - }, -/obj/structure/table, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/turf/open/floor/plasteel, -/area/hydroponics) -"fGl" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/security/brig) -"fGC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/vault, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"fHK" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"fIn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"fJa" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/chair/sofa{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"fKl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/science/circuit) -"fLd" = ( -/obj/structure/table/wood, -/obj/machinery/requests_console{ - department = "Theatre"; - name = "theatre RC"; - pixel_x = -32 - }, -/obj/item/reagent_containers/food/snacks/baguette, -/obj/item/toy/dummy, -/obj/item/lipstick/random{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/lipstick/random{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/open/floor/plasteel/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) -"fOc" = ( -/obj/structure/bed, -/obj/item/bedsheet/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"fPs" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "kitchen shutters" - }, -/obj/item/reagent_containers/food/snacks/cheesynachos{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) -"fQF" = ( -/obj/structure/sign/warning/fire{ - desc = "A sign that states the labeled room's number."; - dir = 5; - icon_state = "roomnum"; - name = "Room Number 7"; - pixel_y = 24 - }, -/obj/structure/chair/sofa/right, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"fSr" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"fTg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"fVU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) -"fZD" = ( -/obj/structure/filingcabinet, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"gbq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/plating, -/area/construction) -"gbT" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) -"gdu" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 - }, -/obj/machinery/button/door{ - id = "LockerShitter2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 14; - pixel_y = 38; - specialfunctions = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/toilet/locker) -"gfD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"ggg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/turf/open/space, -/area/solar/starboard/aft) -"ghs" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/light, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3; - pixel_y = 20 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - dir = 1; - pixel_x = 3; - pixel_y = 20 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"ghJ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/sign/warning/fire{ - desc = "A sign that states the labeled room's number."; - icon_state = "roomnum"; - name = "Room Number 1"; - pixel_x = -30; - pixel_y = -7 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"ghY" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"gjf" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/wood, -/area/bridge/meeting_room) -"gjl" = ( -/turf/closed/wall, -/area/quartermaster/warehouse) -"gjC" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"gtL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"gwd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/circuit) -"gwi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"gBo" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"gCe" = ( -/obj/effect/spawner/lootdrop/keg, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"gFD" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/item/crowbar/red, -/turf/open/floor/plating, -/area/maintenance/port) -"gIO" = ( -/obj/structure/bed, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/plating, -/area/security/prison) -"gJg" = ( -/turf/closed/wall/mineral/titanium, -/area/space/nearstation) -"gKk" = ( -/obj/machinery/vr_sleeper{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white/side{ - dir = 4 - }, -/area/crew_quarters/fitness) -"gLH" = ( -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port/fore) -"gMl" = ( -/obj/structure/chair/wood/normal{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"gOZ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness) -"gQn" = ( -/obj/machinery/light/small, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) -"gSH" = ( -/obj/structure/grille, -/turf/closed/wall/r_wall, -/area/space/nearstation) -"gVX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes) -"gVY" = ( +"daI" = ( /obj/structure/reagent_dispensers/foamtank, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -54178,488 +53214,20 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/plasteel, /area/engine/atmos) -"gWd" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/construction) -"gXs" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"gZG" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/synthflesh, -/turf/open/floor/plasteel/white/side{ - dir = 8 - }, -/area/medical/sleeper) -"haz" = ( -/obj/machinery/autolathe{ - name = "public autolathe" - }, -/turf/open/floor/plasteel, -/area/quartermaster/office) -"haX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness) -"hcd" = ( -/obj/machinery/smartfridge/organ/preloaded, -/turf/closed/wall, -/area/medical/sleeper) -"hdb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"hdp" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +"dbU" = ( /obj/structure/light_construct{ - dir = 8 + dir = 1 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"hfe" = ( -/obj/structure/sign/poster/contraband/smoke{ - desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. "; - pixel_y = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) -"hgX" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +"dce" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/machinery/light/small, -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/fitness) -"hik" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/space, -/area/solar/starboard/aft) -"hjw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"hkg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/crew_quarters/dorms) -"hlY" = ( -/obj/machinery/door/airlock{ - name = "Recharging Station" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"hoo" = ( -/obj/effect/landmark/carpspawn, -/turf/open/space/basic, -/area/space) -"htr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hydroponics) -"hvS" = ( -/obj/effect/landmark/stationroom/box/engine, -/turf/open/space/basic, -/area/space) -"hwu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) -"hzw" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/window{ - dir = 1 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"hzR" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"hKF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/storage/tech) -"hMx" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"hRa" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/cell_charger{ - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"hRz" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"hRT" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/department/electrical) -"hRX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"hSU" = ( -/obj/structure/chair/sofa/left, -/obj/structure/window{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"hVw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"hWn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"hYW" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"hZH" = ( -/obj/machinery/hydroponics/constructable, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 - }, -/turf/open/floor/plasteel/dark, -/area/hydroponics) -"idX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"iep" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 - }, -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) -"ier" = ( -/obj/machinery/button/door{ - id = "Room Two"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 7; - pixel_y = -24; - specialfunctions = 4 - }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"igT" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck{ - pixel_y = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"ihm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction/flip, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"ihC" = ( -/obj/item/chair/wood, -/turf/open/floor/plating, -/area/maintenance/port) -"iiW" = ( -/turf/open/floor/wood, -/area/maintenance/bar) -"ilJ" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/light{ - light_color = "#c9d3e8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"imH" = ( -/obj/structure/falsewall, -/turf/open/floor/plating, -/area/maintenance/bar) -"ioB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/landmark/start/mime, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) -"ioG" = ( -/obj/machinery/vending/cola/red, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"ioX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"ipc" = ( -/obj/machinery/door/airlock/engineering{ - name = "Gravity Generator"; - req_access_txt = "11" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engine/engine_smes) -"ipA" = ( -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) -"iqw" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/brig) -"isy" = ( -/obj/structure/urinal{ - pixel_y = 32 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/toilet) -"itG" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"itT" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"ium" = ( -/mob/living/simple_animal/bot/cleanbot{ - name = "C.L.E.A.N." - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"ivF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"iyC" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-06" - }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) -"izv" = ( -/obj/machinery/vending/clothing, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"iEx" = ( -/obj/structure/table/wood, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/instrument/trombone, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"iEI" = ( -/obj/machinery/vending/autodrobe/all_access, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"iEJ" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Pod One" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) -"iES" = ( -/obj/structure/fireplace, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"iFL" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"iMG" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-14" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"iNn" = ( -/obj/machinery/camera{ - c_tag = "Kitchen Cold Room" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/reagent_dispensers/cooking_oil, -/turf/open/floor/plasteel/showroomfloor, -/area/crew_quarters/kitchen) -"iOt" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/sign/poster/contraband/free_drone{ - pixel_y = 32 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"iOV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/light_construct{ - dir = 4 - }, +/obj/machinery/meter, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"iRJ" = ( +"dev" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -54680,150 +53248,67 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"iVU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/spawner/structure/window, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/crew_quarters/cryopod) -"iWa" = ( -/obj/structure/closet/crate, -/obj/item/book/manual/wiki/telescience, -/obj/item/book/manual/wiki/engineering_guide, -/obj/item/book/manual/wiki/engineering_construction, -/obj/item/book/manual/wiki/atmospherics, -/obj/item/book/manual/wiki/detective, -/obj/item/book/manual/wiki/tcomms, -/obj/item/book/manual/wiki/engineering_singulo_tesla, -/obj/item/book/manual/wiki/experimentor, -/obj/item/book/manual/wiki/research_and_development, -/obj/item/book/manual/wiki/robotics_cyborgs, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/book/manual/wiki/medicine, -/obj/item/book/manual/wiki/medical_cloning, -/obj/item/book/manual/wiki/infections, -/obj/item/book/manual/ripley_build_and_repair, -/obj/item/book/manual/hydroponics_pod_people, -/obj/item/book/manual/wiki/toxins, -/obj/item/book/manual/wiki/grenades, -/obj/item/book{ - desc = "An undeniably handy book."; - icon_state = "bookknock"; - name = "A Simpleton's Guide to Safe-cracking with Stethoscopes" - }, -/turf/open/floor/wood, -/area/library) -"iWk" = ( -/obj/structure/bookcase{ - name = "Forbidden Knowledge" - }, -/turf/open/floor/carpet, -/area/library) -"iYz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/theatre) -"jaa" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/hydroponics) -"jbf" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, +"dfh" = ( /obj/machinery/power/apc{ - areastring = "/area/hallway/secondary/service"; - dir = 1; - name = "Service Hall APC"; - pixel_y = 25 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/service) -"jdT" = ( -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"jeR" = ( -/obj/structure/chair/sofa/left, -/turf/open/floor/plasteel, -/area/security/prison) -"jeT" = ( -/obj/machinery/vending/clothing, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"jgm" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 + areastring = "/area/science/circuit"; + name = "Circuitry Lab APC"; + pixel_x = 30 }, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 4 }, -/obj/machinery/camera{ - c_tag = "Circuitry Lab"; - dir = 8; - network = list("ss13","rd") +/obj/structure/cable{ + icon_state = "0-8" }, /turf/open/floor/plasteel, /area/science/circuit) -"jgv" = ( -/obj/structure/chair/comfy/brown{ - color = "#596479"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"jhF" = ( -/obj/effect/turf_decal/stripes/line{ +"dfL" = ( +/obj/structure/reagent_dispensers/keg/gargle, +/turf/open/floor/wood, +/area/maintenance/bar) +"dgz" = ( +/turf/closed/wall, +/area/crew_quarters/cryopod) +"dgO" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, /area/engine/gravity_generator) -"jiR" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +"diq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"dly" = ( +/obj/machinery/door/window/southright{ + name = "Target Storage" + }, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/item/target/syndicate, +/turf/open/floor/plating, +/area/security/prison) +"dml" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"dqb" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/window, -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"jlm" = ( -/obj/machinery/rnd/production/techfab/department/cargo, -/turf/open/floor/plasteel, -/area/quartermaster/office) -"jly" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"dqu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) +"dsC" = ( /obj/structure/chair/stool{ pixel_y = 8 }, @@ -54834,65 +53319,273 @@ icon_state = "carpetsymbol" }, /area/crew_quarters/theatre) -"jmC" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) -"jnm" = ( -/obj/machinery/power/smes{ - charge = 5e+006 +"dtx" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 25 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/toilet) +"dvc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"dvO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/closed/wall, +/area/science/circuit) +"dyS" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"dzi" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"dBm" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"dCV" = ( +/obj/structure/table, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/recharger, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, +/turf/open/floor/plasteel, +/area/security/prison) +"dKP" = ( +/turf/closed/wall, +/area/maintenance/bar) +"dKV" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) +"dLG" = ( +/obj/machinery/door/airlock/security{ + name = "Firing Range"; + req_access_txt = "2" }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/engine/gravity_generator) -"jnX" = ( -/obj/machinery/door/airlock/external{ - name = "Common Mining Shuttle Bay" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) -"job" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/door/window/westright{ - name = "Red Corner" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"jqv" = ( -/obj/structure/chair/wood/normal{ - dir = 1 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"jrE" = ( +/area/security/prison) +"dMZ" = ( /obj/structure/sign/poster/official/random{ - pixel_x = 32 + pixel_y = 32 }, /turf/open/floor/plasteel/white, /area/science/circuit) -"jsy" = ( +"dPk" = ( +/obj/structure/closet{ + name = "Costume Closet" + }, +/obj/item/clothing/head/russobluecamohat, +/obj/item/clothing/head/russobluecamohat, +/obj/item/clothing/head/helmet/rus_ushanka, +/obj/item/clothing/head/helmet/rus_ushanka, +/obj/item/clothing/head/helmet/rus_ushanka, +/obj/item/clothing/head/helmet/rus_ushanka, +/obj/item/clothing/under/mw2_russian_para, +/obj/item/clothing/under/mw2_russian_para, +/obj/item/clothing/under/mw2_russian_para, +/obj/item/clothing/under/mw2_russian_para, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"dTI" = ( +/obj/structure/urinal{ + pixel_y = 32 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/toilet) +"dVU" = ( +/turf/open/floor/plating, +/area/space/nearstation) +"dXq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"eaI" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom{ + pixel_x = -30 + }, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"eaR" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/space, +/area/solar/starboard/fore) +"edA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-04" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"efO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/space/nearstation) +"egt" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Bar"; + departmentType = 2; + pixel_x = -30; + pixel_y = 45; + receive_ore_updates = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/bar) +"eih" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"elh" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"enB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/security/execution/transfer) +"epC" = ( +/obj/machinery/door/airlock{ + desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue."; + id_tag = "MaintDorm1"; + name = "Furniture Storage" + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/port) +"epD" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"eqd" = ( +/obj/item/electropack/shockcollar, +/obj/item/assembly/signaler, +/turf/open/floor/plating, +/area/security/prison) +"eqA" = ( +/obj/machinery/shower{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/security/prison) +"esZ" = ( +/obj/machinery/door/airlock{ + desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals."; + id_tag = "PrivateStudy"; + name = "Private Study" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, +/area/library) +"evR" = ( +/turf/open/floor/plating, +/area/maintenance/bar) +"ewu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"exP" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-14" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"eyM" = ( +/obj/machinery/mineral/ore_redemption{ + input_dir = 2; + output_dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) +"eAJ" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"eBX" = ( +/obj/machinery/vending/cola/space_up, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"eCr" = ( /obj/structure/closet{ name = "Suit Closet" }, @@ -54916,61 +53609,1168 @@ /obj/item/clothing/under/lawyer/really_black, /obj/item/clothing/under/lawyer/red, /turf/open/floor/plasteel, -/area/crew_quarters/locker) -"jtk" = ( -/obj/structure/chair/comfy/black{ +/area/crew_quarters/fitness) +"eCR" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/engine/gravity_generator) +"eEe" = ( +/obj/machinery/door/airlock{ + name = "Theatre Backstage"; + req_access_txt = "46" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"eFW" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"eHI" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/maintenance/disposal/incinerator) +"eHU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/security/prison) +"eJa" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"eQb" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"eRz" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"eSe" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; + name = "Personal ID-Locked Closet"; + pixel_y = 15 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"eVC" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/crew_quarters/cryopod) +"eVL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light_switch{ + pixel_y = 28 + }, +/obj/machinery/light{ dir = 1 }, /turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"jtU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/security/execution/transfer) -"jvN" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/area/quartermaster/miningdock) +"fcn" = ( +/obj/structure/lattice, +/turf/closed/wall/r_wall, +/area/ai_monitored/nuke_storage) +"fcG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) +"fde" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"jwi" = ( +/area/security/brig) +"feE" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/fore) +"feG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/heads/captain) -"jzi" = ( +/area/crew_quarters/bar) +"fgG" = ( +/obj/structure/table/wood, +/obj/machinery/requests_console{ + department = "Theatre"; + name = "theatre RC"; + pixel_x = -32 + }, +/obj/item/reagent_containers/food/snacks/baguette, +/obj/item/toy/dummy, +/obj/item/lipstick/random{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/lipstick/random{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/crew_quarters/theatre) +"fjS" = ( +/obj/structure/closet/radiation, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"flc" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"flE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"fne" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/landmark/start/mime, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/crew_quarters/theatre) +"fnC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"fpl" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"fpI" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-06" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) +"fsj" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/power/apc{ + areastring = "/area/security/main"; + dir = 4; + name = "Firing Range APC"; + pixel_x = 24 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"ftE" = ( +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"fup" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"fvY" = ( +/obj/machinery/computer/cryopod{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"fxa" = ( +/obj/structure/chair/wood/normal, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/maintenance/bar) +"fxe" = ( +/obj/structure/chair/sofa, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"fxV" = ( +/turf/closed/wall/r_wall, +/area/hallway/primary/central) +"fzd" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel, +/area/hydroponics) +"fAj" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/sign/poster/official/love_ian{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"fBy" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"fCx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "holoprivacy"; + name = "Holodeck Privacy"; + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"fFA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"fGf" = ( +/obj/machinery/smartfridge/disks{ + pixel_y = 2 + }, +/obj/structure/table, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"fHG" = ( +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"fIs" = ( /obj/structure/grille, /obj/structure/lattice, /turf/open/floor/plating, /area/space/nearstation) -"jzD" = ( -/obj/structure/piano{ - icon_state = "piano" +"fKl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/science/circuit) +"fMZ" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 27 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"fOA" = ( +/obj/machinery/door/airlock{ + name = "Theatre Backstage"; + req_access_txt = "46" }, /turf/open/floor/wood, -/area/crew_quarters/bar) -"jAD" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, +/area/crew_quarters/theatre) +"fOI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-18" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"fTg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"fTC" = ( +/obj/structure/filingcabinet, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"fZm" = ( +/obj/structure/chair/sofa/left, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"gbd" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"gbh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Door" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness) +"gbq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plating, +/area/construction) +"gbu" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/plating, +/area/security/prison) +"gbT" = ( +/obj/structure/table, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) +"gcF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/light_construct{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"gfr" = ( +/obj/structure/bed, +/turf/open/floor/plating, +/area/maintenance/port) +"gfC" = ( +/obj/effect/turf_decal/tile/red, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"gfD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"ghq" = ( +/obj/structure/lattice/catwalk, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 3; + name = "Docking Beacon"; + picked_color = "Burgundy" + }, +/turf/open/floor/plating, /area/space/nearstation) -"jBZ" = ( +"ghD" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"gjl" = ( +/turf/closed/wall, +/area/quartermaster/warehouse) +"gnf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/departments/custodian{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"gpD" = ( +/obj/machinery/light_switch{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) +"grA" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Door" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness) +"gwd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/circuit) +"gxc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"gzf" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/curtain, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"gBo" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"gCC" = ( +/obj/structure/sign/poster/contraband/tools, +/turf/closed/wall, +/area/storage/primary) +"gDl" = ( +/obj/effect/landmark/carpspawn, +/turf/open/space/basic, +/area/space) +"gIU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating, +/area/space/nearstation) +"gJi" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) +"gLH" = ( +/obj/machinery/door/airlock/external{ + name = "External Access"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) +"gMl" = ( +/obj/structure/chair/wood/normal{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"gNC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/wood, +/area/bridge/meeting_room) +"gOZ" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"gQX" = ( +/obj/machinery/button/door{ + desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot."; + id = "RIPFUN"; + name = "Powerful Gamer Toggle"; + normaldoorcontrol = 1; + pixel_x = -24; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/structure/table_frame/wood, +/turf/open/floor/plating, +/area/maintenance/port) +"gRZ" = ( +/obj/structure/bookcase{ + name = "Forbidden Knowledge" + }, +/turf/open/floor/carpet, +/area/library) +"gTx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/nuke_storage) +"gUu" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/engine/gravity_generator) +"gWd" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/construction) +"gXs" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"gZG" = ( +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/item/reagent_containers/glass/beaker/synthflesh, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/medical/sleeper) +"haL" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"haM" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -29 + }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"hcb" = ( +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"hcA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"hew" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/port) +"hgO" = ( +/obj/structure/table, +/obj/item/storage/pill_bottle/dice{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/snacks/cherrycupcake, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"hiV" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/maintenance/department/electrical) +"hlV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/crew_quarters/dorms) +"hnl" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/closed/wall, +/area/maintenance/port) +"hnU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating, +/area/security/prison) +"hrF" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space, +/area/solar/port/aft) +"hsb" = ( +/obj/structure/table/wood, +/obj/item/book/codex_gigas, +/obj/item/clothing/under/suit_jacket/red, +/obj/structure/destructible/cult/tome, +/turf/open/floor/carpet, +/area/library) +"hse" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating, +/area/space/nearstation) +"hBA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"hGH" = ( +/obj/machinery/door/airlock{ + desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals."; + id_tag = "PrivateStudy"; + name = "Private Study" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/library) +"hHQ" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"hIL" = ( +/obj/structure/sign/poster/contraband/space_up{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"hIM" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"hOv" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + pixel_y = 5 + }, +/obj/item/reagent_containers/food/snacks/burger/plain, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"hPs" = ( +/obj/structure/fireplace, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 + }, +/turf/open/floor/plating, +/area/maintenance/port) +"hPP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/closed/wall, +/area/quartermaster/warehouse) +"hRa" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/cell_charger{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"hRI" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"hSZ" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"hWd" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"idK" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"iiW" = ( +/turf/open/floor/wood, +/area/maintenance/bar) +"ijG" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/window, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"ikk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"ikm" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"imH" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/bar) +"inR" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/theatre) +"iou" = ( +/obj/machinery/light/small, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"ipA" = ( +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) +"itG" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"itK" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/obj/structure/light_construct{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"itQ" = ( +/obj/machinery/door/window/southleft{ + name = "Target Storage" + }, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/item/target, +/obj/item/target, +/turf/open/floor/plating, +/area/security/prison) +"ium" = ( +/mob/living/simple_animal/bot/cleanbot{ + name = "C.L.E.A.N." + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"iuR" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"iwB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/maintenance/port) +"izv" = ( +/obj/machinery/vending/clothing, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"iDo" = ( +/obj/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) +"iDS" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) +"iEJ" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod One" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"iHk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/engine/gravity_generator) +"iNn" = ( +/obj/machinery/camera{ + c_tag = "Kitchen Cold Room" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/reagent_dispensers/cooking_oil, +/turf/open/floor/plasteel/showroomfloor, +/area/crew_quarters/kitchen) +"iTq" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/theatre) +"iTU" = ( +/obj/structure/piano{ + icon_state = "piano" + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"iVU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/crew_quarters/cryopod) +"iWx" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/coin/silver, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"jaF" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"jaH" = ( +/obj/structure/door_assembly/door_assembly_mai, +/obj/item/electronics/airlock, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"jbf" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + areastring = "/area/hallway/secondary/service"; + dir = 1; + name = "Service Hall APC"; + pixel_y = 25 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"jex" = ( +/obj/machinery/smartfridge/organ/preloaded, +/turf/closed/wall, +/area/medical/sleeper) +"jez" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"jgm" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/camera{ + c_tag = "Circuitry Lab"; + dir = 8; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel, +/area/science/circuit) +"jgA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"jjC" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck, +/turf/open/floor/plasteel, +/area/security/prison) +"jkx" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/computer/slot_machine, +/obj/item/coin/iron, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"jkz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/engine/gravity_generator) +"jlm" = ( +/obj/machinery/rnd/production/techfab/department/cargo, +/turf/open/floor/plasteel, +/area/quartermaster/office) +"jls" = ( +/obj/machinery/door/airlock/security{ + name = "Labor Shuttle"; + req_access_txt = "2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/processing) +"jmV" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/reagent_containers/food/drinks/britcup{ + desc = "Kingston's personal cup."; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"jqv" = ( +/obj/structure/chair/wood/normal{ + dir = 1 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/bar) +"jrE" = ( +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"juG" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "kitchen shutters" + }, +/obj/item/reagent_containers/food/snacks/bluecherrycupcake{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"jvd" = ( +/obj/structure/closet/athletic_mixed, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"jxF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/maintenance/port) +"jAD" = ( +/obj/structure/grille, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"jAN" = ( +/obj/machinery/vr_sleeper{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/crew_quarters/fitness) +"jBi" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Door" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness) +"jBA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/engine/gravity_generator) "jCq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -54983,22 +54783,46 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jDY" = ( -/obj/structure/chair{ +"jEc" = ( +/obj/machinery/vr_sleeper{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"jFy" = ( -/obj/machinery/door/airlock{ - desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals."; - id_tag = "PrivateStudy"; - name = "Private Study" +/turf/open/floor/plasteel/white/corner{ + dir = 1 }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood, -/area/library) +/area/crew_quarters/fitness) +"jFH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"jGW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"jHh" = ( +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "jHt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -55012,10 +54836,23 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jHM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/security/prison) +"jIs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/space, +/area/solar/starboard/fore) +"jJg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/chair/sofa{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jJF" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -55023,53 +54860,42 @@ }, /turf/open/floor/wood, /area/maintenance/port/aft) -"jLM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +"jKP" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fore) -"jMK" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"jNo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating, -/area/space/nearstation) -"jRy" = ( -/obj/machinery/door/airlock{ - name = "Instrument Storage" - }, -/turf/open/floor/plasteel/dark, -/area/maintenance/starboard/fore) -"jSa" = ( -/obj/item/electropack/shockcollar, -/obj/item/assembly/signaler, -/turf/open/floor/plating, -/area/security/prison) -"jSD" = ( -/obj/machinery/door/airlock/security{ - name = "Firing Range"; - req_access_txt = "2" +/area/maintenance/fore/secondary) +"jLn" = ( +/obj/machinery/door/airlock/engineering{ + name = "Gravity Generator"; + req_access_txt = "11" }, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plasteel, +/area/engine/engine_smes) +"jLT" = ( +/obj/machinery/button/door{ + id = "Room Two"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 7; + pixel_y = -24; + specialfunctions = 4 + }, +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"jRw" = ( +/obj/machinery/computer/arcade/minesweeper{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/security/prison) "jSO" = ( /obj/machinery/light{ @@ -55089,65 +54915,71 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jXg" = ( -/obj/machinery/power/apc{ - areastring = "/area/ai_monitored/nuke_storage"; - dir = 1; - name = "Vault APC"; - pixel_y = 25 - }, +"jZT" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/poddoor/preopen{ + id = "maint2" }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"kaq" = ( +/turf/closed/wall/mineral/titanium, +/area/space/nearstation) +"kdP" = ( /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) -"jYI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/prison) +"ker" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"keM" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/washing_machine, +/turf/open/floor/plasteel/freezer, +/area/security/prison) +"kfv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/storage/tech) +"kfX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"kay" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/bluecherrycupcake{ - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"kcj" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ +/turf/closed/wall/r_wall, +/area/engine/engine_smes) +"kgr" = ( +/obj/machinery/light/small{ + brightness = 3; dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"kdm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/plating, /area/security/prison) -"kel" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"kfE" = ( -/obj/machinery/computer/libraryconsole/bookmanagement, -/obj/structure/table, -/turf/open/floor/plasteel, -/area/security/prison) "khb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -55158,22 +54990,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"khA" = ( -/obj/structure/table, -/obj/item/instrument/guitar{ - pixel_x = -7 - }, -/obj/item/instrument/eguitar{ - pixel_x = 5 - }, -/obj/item/instrument/violin, -/obj/item/instrument/trombone, -/obj/item/instrument/saxophone, -/obj/item/instrument/piano_synth, -/obj/item/instrument/recorder, -/obj/item/instrument/accordion, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "khB" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -55183,10 +54999,37 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"klu" = ( +"khV" = ( +/obj/machinery/vending/cola/red, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"kls" = ( /obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) +"kmw" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"kmS" = ( +/obj/item/flashlight/lamp/green{ + pixel_x = -3; + pixel_y = 22 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/dresser{ + desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; + name = "Dresser"; + pixel_y = 7 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "knx" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -55215,75 +55058,57 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ksn" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +"kqI" = ( /obj/structure/window, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/turf/open/floor/wood, +/area/crew_quarters/bar) +"ktP" = ( +/obj/machinery/power/smes{ + charge = 5e+006 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"ktS" = ( +/turf/open/space/basic, +/area/space/nearstation) +"kvl" = ( +/obj/structure/grille, +/turf/closed/wall/r_wall, +/area/space/nearstation) +"kvL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"kuY" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "maint2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"kvb" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1 - }, -/turf/closed/wall/mineral/titanium, -/area/space/nearstation) -"kvZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"kwy" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; - pixel_x = -30; - pixel_y = 45; - receive_ore_updates = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/bar) -"kxc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"kyi" = ( -/obj/structure/bed, -/obj/machinery/button/door{ - id = "Dorm5"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/wood, -/area/crew_quarters/dorms) +/area/bridge/meeting_room) +"kxf" = ( +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/crew_quarters/fitness) "kyF" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/wood, @@ -55292,91 +55117,83 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/science/mixing) -"kCk" = ( -/obj/structure/mirror{ - pixel_y = 32 +"kAH" = ( +/obj/machinery/camera{ + c_tag = "Bar West"; + dir = 4 }, -/obj/structure/sink{ - dir = 1; - pixel_y = 25 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/toilet) -"kCW" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"kDD" = ( -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) -"kHJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness) -"kHK" = ( -/obj/machinery/button/door{ - desc = "Bolts the doors to the Private Study."; - id = "PrivateStudy"; - name = "Private Study Lock"; - pixel_x = 25; - pixel_y = 25; - req_access_txt = ""; - req_one_access_txt = "28;63" +/obj/machinery/computer/arcade/orion_trail, +/obj/structure/sign/poster/official/foam_force_ad{ + pixel_x = -32 }, /turf/open/floor/wood, -/area/library) -"kJr" = ( -/obj/effect/turf_decal/stripes/line{ +/area/crew_quarters/bar) +"kAJ" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"kAO" = ( +/obj/structure/chair/sofa{ + dir = 1 + }, +/obj/structure/window, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"kCo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plating, -/area/security/prison) -"kJY" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 - }, -/obj/structure/dresser{ - desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; - name = "Dresser"; - pixel_y = 7 - }, -/turf/open/floor/plating, -/area/maintenance/port) -"kKw" = ( -/obj/structure/lattice/catwalk, +/turf/open/floor/plasteel, +/area/crew_quarters/theatre) +"kEY" = ( +/obj/effect/landmark/stationroom/box/engine, +/turf/open/space/basic, +/area/space) +"kGJ" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/space, -/area/solar/port/aft) -"kLR" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - desc = "Privacy shutters for the Private Study. Stops people spying in on your game."; - id = "PrivateStudy1"; - name = "Private Study Privacy Shutters" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/wood, -/area/library) -"kOf" = ( -/obj/structure/chair{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/light/small{ - dir = 4; - light_color = "#d8b1b1" +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"kMt" = ( +/obj/structure/lattice, +/turf/closed/wall, +/area/security/prison) +"kNv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/free_drone{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "kPd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable{ @@ -55384,6 +55201,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"kPj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction/flip, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "kQk" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -55393,254 +55217,32 @@ /obj/item/storage/toolbox/electrical, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"kQZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, +"kQO" = ( +/obj/structure/reagent_dispensers/keg/semen, /turf/open/floor/plating, -/area/crew_quarters/fitness) -"kRk" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/obj/structure/chair/sofa/right{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"kRw" = ( -/obj/effect/landmark/start/roboticist, -/turf/open/floor/plasteel/white, -/area/science/robotics/lab) +/area/maintenance/bar) "kSb" = ( /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"kSh" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"kSB" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"kTz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/bridge/meeting_room) -"kWI" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/window{ +"kWp" = ( +/obj/structure/shuttle/engine/heater{ dir = 1 }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/locker) -"lhg" = ( -/obj/machinery/vending/clothing, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/closed/wall/mineral/titanium, +/area/space/nearstation) +"kYk" = ( +/obj/machinery/door/firedoor, +/obj/structure/sign/departments/evac{ + pixel_y = 32 }, /turf/open/floor/plasteel, -/area/crew_quarters/locker) -"lmi" = ( -/obj/structure/door_assembly/door_assembly_mai, -/obj/item/electronics/airlock, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"lnu" = ( -/obj/structure/chair/wood/normal{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar) -"lwj" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ - pixel_x = -3; - pixel_y = 2 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"lwp" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/theatre) -"lwY" = ( -/obj/machinery/door/window/westleft{ - base_state = "right"; - icon_state = "right"; - name = "Unisex Showers" - }, -/turf/open/floor/plasteel/freezer, +/area/hallway/primary/starboard) +"laq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plasteel, /area/security/prison) -"lxx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/crew_quarters/bar) -"lAB" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall, -/area/science/circuit) -"lBE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"lCi" = ( -/obj/docking_port/stationary/public_mining_dock{ - dir = 8 - }, -/turf/open/floor/plating, -/area/construction/mining/aux_base) -"lCB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating, -/area/space/nearstation) -"lCL" = ( -/turf/open/space/basic, -/area/space/nearstation) -"lFl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness) -"lLt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/space/nearstation) -"lLI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"lMg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/circuit) -"lMx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/crew_quarters/dorms) -"lMY" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/spawner/structure/window, -/turf/open/floor/grass, -/area/crew_quarters/bar) -"lNB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/space/nearstation) -"lQG" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/science/circuit) -"lTq" = ( -/obj/structure/table, -/obj/item/folder/blue, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"lYU" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/sign/departments/security{ - pixel_x = -32; - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"lYZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/junction, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"maC" = ( -/obj/structure/table, -/obj/item/storage/pill_bottle/dice{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/snacks/cherrycupcake, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"mbD" = ( +"lip" = ( /obj/structure/closet{ name = "Suit Closet" }, @@ -55664,108 +55266,142 @@ /obj/item/clothing/under/lawyer/really_black, /obj/item/clothing/under/lawyer/red, /turf/open/floor/plasteel, +/area/crew_quarters/locker) +"lnu" = ( +/obj/structure/chair/wood/normal{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/bar) +"lsk" = ( +/obj/machinery/vending/autodrobe/all_access, +/turf/open/floor/plasteel, /area/crew_quarters/fitness) -"mfb" = ( -/obj/structure/toilet{ +"ltK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"lva" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"lyR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/security/prison) +"lAB" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/science/circuit) +"lCi" = ( +/obj/docking_port/stationary/public_mining_dock{ + dir = 8 + }, +/turf/open/floor/plating, +/area/construction/mining/aux_base) +"lGV" = ( +/obj/machinery/button/door{ + id = "maintdiy"; + name = "Shutters Control Button"; + pixel_x = -6; + pixel_y = 24 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"lMg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/circuit) +"lOe" = ( +/obj/machinery/shower{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/dorms) +"lPr" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "applebush" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"lQG" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/science/circuit) +"lSa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"lUS" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"lXE" = ( +/obj/structure/sign/warning/fire{ + desc = "A sign that states the labeled room's number."; + dir = 5; + icon_state = "roomnum"; + name = "Room Number 7"; + pixel_y = 24 + }, +/obj/structure/chair/sofa/right, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"lZl" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"mbU" = ( +/obj/machinery/vr_sleeper{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/crew_quarters/fitness) +"mcp" = ( +/obj/structure/target_stake, +/obj/item/target/syndicate, +/turf/open/floor/plating, +/area/security/prison) "mjr" = ( /obj/structure/reagent_dispensers/keg/milk, /turf/open/floor/wood, /area/crew_quarters/bar) -"mlr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/light_construct{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"moq" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"mpI" = ( -/obj/structure/table/wood, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar) -"mqa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"mqZ" = ( -/obj/structure/reagent_dispensers/keg/aphro/strong, -/obj/item/reagent_containers/glass/beaker, -/turf/open/floor/plating, -/area/maintenance/bar) -"mrR" = ( -/obj/effect/spawner/lootdrop/keg, -/turf/open/floor/wood, -/area/maintenance/bar) -"mte" = ( -/obj/structure/extinguisher_cabinet, -/turf/closed/wall/r_wall, -/area/hallway/primary/central) -"mwO" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"myt" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"mCq" = ( -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"mEN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/toilet) -"mHC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"mIS" = ( -/obj/structure/table, -/obj/item/clothing/gloves/boxing/yellow, -/obj/item/clothing/gloves/boxing/green, -/obj/item/clothing/gloves/boxing/blue, -/obj/item/clothing/gloves/boxing/blue, -/obj/item/clothing/gloves/boxing, -/obj/item/clothing/gloves/boxing, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"mNi" = ( -/obj/machinery/light_switch{ - pixel_x = -20 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"mPE" = ( -/obj/machinery/chem_dispenser/drinks, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar) -"mQR" = ( +"mkv" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Room"; dir = 8 @@ -55776,6 +55412,211 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"mkO" = ( +/obj/machinery/door/airlock{ + name = "Shower Room" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/toilet) +"mnC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/security/prison) +"moD" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/snacks/bluecherrycupcake{ + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"mps" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"mpI" = ( +/obj/structure/table/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken5" + }, +/area/maintenance/bar) +"mqZ" = ( +/obj/structure/reagent_dispensers/keg/aphro/strong, +/obj/item/reagent_containers/glass/beaker, +/turf/open/floor/plating, +/area/maintenance/bar) +"mrR" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/wood, +/area/maintenance/bar) +"mse" = ( +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/chair/sofa/left, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"mvt" = ( +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"myh" = ( +/obj/structure/piano, +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"mzB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/window, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"mAH" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"mGw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/prison) +"mHU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/light_construct{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"mIZ" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/security/prison) +"mJo" = ( +/obj/structure/door_assembly/door_assembly_mai, +/obj/item/electronics/airlock, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"mJG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"mNi" = ( +/obj/machinery/light_switch{ + pixel_x = -20 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"mNW" = ( +/obj/structure/sign/poster/official/fruit_bowl{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/primary/starboard) +"mOB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator"; + req_access_txt = "11" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/engine/gravity_generator) +"mOO" = ( +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"mPk" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm5"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms) +"mPr" = ( +/obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/effect/decal/cleanable/cobweb, +/obj/item/clothing/under/color/grey, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"mPt" = ( +/obj/structure/table, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"mPE" = ( +/obj/machinery/chem_dispenser/drinks, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/bar) +"mQS" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "mRe" = ( /obj/machinery/light{ dir = 8 @@ -55783,134 +55624,109 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/science/circuit) -"mTp" = ( -/obj/structure/chair/sofa/left, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +"mRQ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"mXB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"ncj" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/sign/poster/contraband/fun_police{ - pixel_x = 32 +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) +"mTG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"ndC" = ( /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"nea" = ( -/obj/machinery/recharge_station, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"neb" = ( -/obj/item/radio/intercom{ - pixel_y = 25 +/area/crew_quarters/locker) +"nbT" = ( +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plasteel, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "bridge blast"; + name = "bridge blast door" + }, +/turf/open/floor/plating, /area/hallway/primary/central) -"nel" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, +"ndq" = ( /turf/open/floor/plating, -/area/crew_quarters/fitness) -"new" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/security/prison) -"neC" = ( +/area/crew_quarters/abandoned_gambling_den) +"nez" = ( /obj/structure/table/wood, -/obj/item/toy/cards/deck, -/turf/open/floor/plasteel, -/area/security/prison) +/obj/item/instrument/piano_synth, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "nfm" = ( /obj/machinery/vending/autodrobe, /turf/open/floor/wood, /area/maintenance/bar) -"nie" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" +"ngs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) -"nlt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"nmx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"nmS" = ( -/obj/structure/closet/athletic_mixed, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"nrR" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"nsJ" = ( -/obj/machinery/door/airlock{ - desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals."; - id_tag = "PrivateStudy"; - name = "Private Study" - }, -/obj/machinery/door/firedoor, /turf/open/floor/wood, -/area/library) -"ntf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/area/crew_quarters/theatre) +"ngV" = ( +/obj/structure/table/wood, +/obj/item/instrument/guitar, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"nhY" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 4; + name = "4maintenance loot spawner" }, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"nuV" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"nkP" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"noy" = ( +/obj/structure/sign/poster/contraband/smoke{ + desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. "; + pixel_y = -32 + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"noF" = ( +/obj/machinery/door/airlock{ + name = "Instrument Storage" + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/fore) +"nsA" = ( +/turf/closed/wall, +/area/crew_quarters/abandoned_gambling_den) +"nuw" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 4; + name = "4maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"nwX" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating/airless, +/area/space/nearstation) "nxv" = ( /obj/machinery/power/apc{ areastring = "/area/construction"; @@ -55922,13 +55738,13 @@ }, /turf/open/floor/plating, /area/construction) -"nyH" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 +"nGf" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) +/turf/open/floor/plasteel/dark, +/area/hydroponics) "nGt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -55940,51 +55756,74 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"nGS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +"nGI" = ( +/obj/machinery/door/airlock/external{ + name = "Common Mining Shuttle Bay" }, -/obj/effect/turf_decal/tile/blue{ - alpha = 255; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"nIE" = ( -/obj/structure/sign/poster/contraband/tools, -/turf/closed/wall, -/area/storage/primary) -"nLf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/turf/open/floor/wood, -/area/bridge/meeting_room) -"nMx" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault, -/obj/structure/cable{ - icon_state = "1-2" +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"nLu" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"nLw" = ( +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/window{ + dir = 1 + }, +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"nQi" = ( +/obj/machinery/recharge_station, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"nRG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"nSt" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"nUV" = ( +/obj/effect/turf_decal/stripes/line{ dir = 8 }, +/turf/open/floor/plasteel, +/area/hydroponics) +"nXE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"nOS" = ( +/area/hallway/primary/central) +"nYe" = ( /obj/structure/safe, /obj/item/clothing/head/bearpelt, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, @@ -56004,266 +55843,228 @@ /obj/item/gun/ballistic/revolver/nagant, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) -"nQr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/maintenance/port) -"nRG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"nTE" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"nWq" = ( -/obj/machinery/door/airlock/engineering{ - name = "Gravity Generator"; - req_access_txt = "11" - }, +"nZE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/neutral, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/open/floor/plasteel, -/area/engine/gravity_generator) -"nXa" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" +/area/crew_quarters/dorms) +"oax" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/light, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -3; + pixel_y = 20 }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) +/obj/item/reagent_containers/food/condiment/peppermill{ + dir = 1; + pixel_x = 3; + pixel_y = 20 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"obc" = ( +/obj/structure/chair/sofa/right, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "oce" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plasteel/white, /area/science/mixing) +"ocv" = ( +/obj/structure/table, +/obj/item/clothing/gloves/boxing/yellow, +/obj/item/clothing/gloves/boxing/green, +/obj/item/clothing/gloves/boxing/blue, +/obj/item/clothing/gloves/boxing/blue, +/obj/item/clothing/gloves/boxing, +/obj/item/clothing/gloves/boxing, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) "odx" = ( /obj/machinery/vending/kink, /turf/open/floor/plating, /area/maintenance/bar) -"oeJ" = ( -/obj/structure/table/wood, -/obj/item/instrument/violin, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"oeQ" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"ohX" = ( -/obj/structure/table/wood, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/wood, -/area/security/vacantoffice) -"olr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"olv" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, -/turf/open/floor/plasteel, -/area/security/brig) -"olw" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 4; - name = "4maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"oma" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"ofU" = ( +/obj/structure/chair/comfy/black{ dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"orw" = ( -/obj/structure/table, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, +"old" = ( /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/recharger, -/obj/item/gun/energy/laser/practice, -/obj/item/gun/energy/laser/practice, -/turf/open/floor/plasteel, -/area/security/prison) -"ory" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"otF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; +/obj/structure/sign/departments/security{ + pixel_x = -32; pixel_y = -32 }, /turf/open/floor/plasteel, -/area/hallway/primary/central) -"ouD" = ( -/obj/structure/reagent_dispensers/keg/semen, -/turf/open/floor/plating, -/area/maintenance/bar) -"oBp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/maintenance/port) -"oDy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-04" - }, +/area/hallway/primary/fore) +"olr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"oFk" = ( -/obj/structure/closet/boxinggloves, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"oHU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, /area/science/circuit) -"oKh" = ( -/obj/structure/chair/wood/normal{ - dir = 8 +"omY" = ( +/obj/item/flashlight/lamp/green{ + pixel_x = -3; + pixel_y = 22 }, -/turf/open/floor/wood, -/area/maintenance/bar) -"oMY" = ( -/obj/machinery/button/door{ - desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot."; - id = "RIPFUN"; - name = "Powerful Gamer Toggle"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = 7; - specialfunctions = 4 +/obj/structure/dresser{ + desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; + name = "Dresser"; + pixel_y = 7 }, -/obj/structure/table_frame/wood, /turf/open/floor/plating, /area/maintenance/port) -"oNb" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 +"oqj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"oqO" = ( /obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/bar) -"oNQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/light{ dir = 4; light_color = "#c1caff" }, /turf/open/floor/plasteel, /area/engine/gravity_generator) -"oOb" = ( -/obj/structure/sign/poster/official/cohiba_robusto_ad, -/turf/closed/wall, -/area/lawoffice) -"oSO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +"ouQ" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 6 + }, +/obj/item/pen/fountain, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"oxm" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/spawner/structure/window, +/turf/open/floor/grass, +/area/crew_quarters/bar) +"oyl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/chair/sofa, -/obj/item/radio/intercom{ - pixel_y = 25 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"oUh" = ( -/obj/structure/disposalpipe/trunk{ +/obj/effect/turf_decal/tile/blue, +/obj/machinery/door/window/eastleft{ + name = "Blue Corner" + }, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"oXL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/prison) -"oYc" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "#d8b1b1" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"phu" = ( +/area/crew_quarters/locker) +"oyz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; pixel_y = 5 }, /turf/open/floor/wood, /area/crew_quarters/theatre) -"phH" = ( -/turf/open/floor/grass, -/area/security/prison) -"phY" = ( +"oyN" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/space/nearstation) +"oyX" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Air In" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"oAb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/turf/closed/wall, +/area/crew_quarters/bar) +"oAB" = ( +/obj/structure/fireplace, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"oDN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"oEZ" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"oHB" = ( +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms) +"oHU" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/crew_quarters/locker) -"pjh" = ( +/area/science/circuit) +"oIJ" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"oIW" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"oKh" = ( +/obj/structure/chair/wood/normal{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"oLl" = ( /obj/structure/cable{ icon_state = "4-8" }, @@ -56272,10 +56073,96 @@ }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) -"poa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +"oLn" = ( +/obj/machinery/light/small{ dir = 4 }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"oTW" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/theatre) +"oUh" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"oZl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/wardrobe/pjs, +/obj/item/clothing/under/maid, +/obj/item/clothing/under/maid, +/obj/item/clothing/under/janimaid, +/obj/item/clothing/under/janimaid, +/obj/item/clothing/accessory/maidapron, +/obj/item/clothing/accessory/maidapron, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"pem" = ( +/obj/machinery/button/door{ + desc = "Bolts the doors to the Private Study."; + id = "PrivateStudy"; + name = "Private Study Lock"; + pixel_x = 25; + pixel_y = 25; + req_access_txt = ""; + req_one_access_txt = "28;63" + }, +/turf/open/floor/wood, +/area/library) +"pfm" = ( +/obj/structure/sign/poster/official/twelve_gauge, +/turf/closed/wall/r_wall, +/area/ai_monitored/security/armory) +"pgf" = ( +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"pgn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/security/prison) +"plm" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plasteel, +/area/engine/atmos) +"plC" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, /turf/open/floor/wood, /area/crew_quarters/bar) "poc" = ( @@ -56287,85 +56174,71 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"ppY" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/sign/poster/official/love_ian{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"pqR" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"prP" = ( -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"prU" = ( -/obj/item/radio/intercom{ +"pou" = ( +/obj/machinery/light{ dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + light_color = "#e8eaff" }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"ptV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) -"puG" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/effect/decal/cleanable/cobweb, -/obj/item/clothing/under/color/grey, /turf/open/floor/plating, -/area/maintenance/port/aft) -"pxD" = ( +/area/crew_quarters/abandoned_gambling_den) +"pqe" = ( /obj/structure/chair/sofa, /obj/structure/window{ dir = 1 }, +/obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/crew_quarters/bar) -"pzk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +"pqs" = ( +/obj/machinery/vending/clothing, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/table, -/obj/item/coin/gold, /turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"pAl" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/components/unary/tank/air{ +/area/crew_quarters/locker) +"psk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge/meeting_room) +"pst" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/vault, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/nuke_storage) +"puh" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"pFt" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/light/small, +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 }, -/turf/open/space, -/area/solar/starboard/aft) +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/crew_quarters/fitness) +"pBp" = ( +/obj/effect/landmark/event_spawn, +/turf/closed/wall, +/area/crew_quarters/fitness) +"pFX" = ( +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -56392,12 +56265,31 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"pHo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"pHO" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/sign/poster/contraband/fun_police{ + pixel_x = 32 }, /turf/open/floor/plasteel, -/area/hydroponics) +/area/hallway/primary/fore) +"pIf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/crew_quarters/theatre) +"pJR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood, +/area/library) "pLn" = ( /obj/machinery/conveyor/inverted{ dir = 5; @@ -56405,88 +56297,7 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"pLt" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/power/apc{ - areastring = "/area/security/main"; - dir = 4; - name = "Firing Range APC"; - pixel_x = 24 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"pNH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/window, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"pNI" = ( -/obj/effect/turf_decal/bot, -/obj/structure/sign/poster/official/pda_ad{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"pPE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/door/window/eastleft{ - name = "Blue Corner" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"pQr" = ( -/obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -3; - pixel_y = -2 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -3; - pixel_y = -2 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"pQD" = ( -/obj/structure/sign/poster/official/ion_rifle, -/turf/closed/wall/r_wall, -/area/ai_monitored/security/armory) -"pSf" = ( +"pPi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -56498,361 +56309,13 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"pTn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/terminal, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"pTR" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"pUl" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/command{ - name = "Command Access To Vault"; - req_access = "19" - }, -/turf/open/floor/plasteel/dark, -/area/bridge/meeting_room) -"pZv" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) -"qbx" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"qeQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/circuit) -"qje" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"qkC" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/starboard/fore"; - dir = 1; - name = "Starboard Bow Maintenance APC"; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"qlr" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/window{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"qlF" = ( -/obj/structure/lattice, -/turf/closed/wall, -/area/security/prison) -"qmM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"qoP" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/structure/chair/sofa/left, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"qpA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/sign/poster/official/cohiba_robusto_ad{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) -"qux" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"quT" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"qvM" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) -"qwe" = ( -/turf/open/floor/plasteel/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) -"qwB" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Gravity Generator"; - req_access_txt = "11" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"qxc" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/computer/slot_machine, -/obj/item/coin/iron, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"qAQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"qBc" = ( -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"qBe" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, +"pPI" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/bridge/meeting_room) -"qEv" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/reagent_containers/food/drinks/britcup{ - desc = "Kingston's personal cup."; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"qHB" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/theatre) -"qIf" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/bar) -"qIw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"qJZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"qMu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/security/prison) -"qNs" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - on = 0; - pixel_x = -7; - pixel_y = 12 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"qOf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"qQJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) -"qUm" = ( -/obj/structure/filingcabinet/employment, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) -"qXH" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"rcD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/science/circuit) -"reZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, -/area/engine/engine_smes) -"rfW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) -"rgF" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/coin/silver, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"rhb" = ( -/obj/machinery/vending/cola/space_up, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"riA" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Firing Range"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"riB" = ( -/obj/machinery/door/firedoor, -/obj/structure/sign/departments/evac{ - pixel_y = 32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"rmX" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"rsv" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/space, -/area/solar/starboard/fore) -"rsX" = ( -/obj/effect/turf_decal/tile/red, -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"rtT" = ( -/obj/structure/chair/comfy/brown{ - color = "#66b266"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"rvZ" = ( -/obj/structure/target_stake, -/obj/item/target/syndicate, -/turf/open/floor/plating, -/area/security/prison) -"rzg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) -"rBq" = ( -/obj/item/clothing/head/kitty, -/obj/item/clothing/under/maid, -/obj/item/clothing/mask/muzzle, -/turf/open/floor/plating, -/area/maintenance/bar) -"rEV" = ( +/area/engine/gravity_generator) +"pQp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -56861,56 +56324,410 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness) -"rFc" = ( -/obj/machinery/door/airlock{ - desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue."; - id_tag = "MaintDorm1"; - name = "Furniture Storage" +"pRs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, -/turf/open/floor/plasteel/dark, -/area/maintenance/port) -"rHa" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/meta; - width = 7 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" }, -/turf/open/space/basic, -/area/space) -"rKc" = ( +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"pTB" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "0-2" }, /turf/open/space, -/area/solar/port/fore) +/area/solar/starboard/aft) +"qaY" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/crew_quarters/bar) +"qcm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) +"qeb" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + areastring = "/area/crew_quarters/abandoned_gambling_den"; + name = "Abandoned Gambling Den APC"; + pixel_y = -24 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"qeQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/circuit) +"qfk" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/window, +/obj/structure/window{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"qfD" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + desc = "Privacy shutters for the Private Study. Stops people spying in on your game."; + id = "PrivateStudy1"; + name = "Private Study Privacy Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/wood, +/area/library) +"qje" = ( +/obj/structure/sign/mining{ + pixel_y = 7 + }, +/turf/closed/wall, +/area/quartermaster/miningdock) +"qmn" = ( +/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/structure/table, +/turf/open/floor/plasteel, +/area/security/prison) +"qqs" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 25 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/toilet) +"qus" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "kitchen shutters" + }, +/obj/item/reagent_containers/food/snacks/cheesynachos{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"quT" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/open/space/basic, +/area/space/nearstation) +"qAm" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"qBi" = ( +/obj/structure/lattice, +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/captain) +"qIw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"qJr" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/space, +/area/solar/port/aft) +"qLR" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 25 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"qOc" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/camera{ + c_tag = "VR Sleepers"; + dir = 1 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/crew_quarters/fitness) +"qOB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) +"qTG" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"qTV" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"qVP" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"qXg" = ( +/obj/structure/chair/sofa/left, +/turf/open/floor/plasteel, +/area/security/prison) +"rcD" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/science/circuit) +"rdG" = ( +/obj/machinery/hydroponics/constructable, +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = 29 + }, +/turf/open/floor/plasteel/dark, +/area/hydroponics) +"reA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/vending/kink, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"rfW" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/maintenance/disposal/incinerator) +"rjQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"rmN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/chair/comfy/brown, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"rmX" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"rnt" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/bridge/meeting_room) +"rnK" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) +"rqf" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"rqk" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"rqE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"rqW" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/dresser, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/power/apc{ + areastring = "/area/crew_quarters/theatre"; + dir = 8; + name = "Theatre APC"; + pixel_x = -25 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/theatre) +"rrM" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/structure/closet/wardrobe/black, +/obj/item/clothing/under/skirt/black, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/under/trendy_fit, +/obj/item/clothing/under/trendy_fit, +/obj/item/clothing/under/sundress, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"rtl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/camera{ + c_tag = "Bar Backroom" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"ruo" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"rvr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"rvS" = ( +/obj/structure/chair/comfy/brown{ + color = "#66b266"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"ryr" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"rBq" = ( +/obj/item/clothing/head/kitty, +/obj/item/clothing/under/maid, +/obj/item/clothing/mask/muzzle, +/turf/open/floor/plating, +/area/maintenance/bar) +"rGq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"rIA" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) "rKP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, /area/construction) -"rLr" = ( -/obj/structure/window, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"rLR" = ( -/obj/structure/sign/poster/contraband/space_up{ - pixel_x = -32; - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"rMc" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/light/small, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "rMN" = ( /obj/structure/bed, /obj/item/tank/internals/anesthetic, @@ -56933,38 +56750,32 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"rOm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/toilet) -"rTQ" = ( -/obj/machinery/vr_sleeper{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +"rPU" = ( +/turf/open/floor/plasteel/white/side{ dir = 4 }, +/area/crew_quarters/theatre) +"rTu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/command{ + name = "Command Access To Vault"; + req_access = "19" + }, +/turf/open/floor/plasteel/dark, +/area/bridge/meeting_room) +"rXl" = ( +/obj/structure/chair/office/light, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 9 }, -/turf/open/floor/plasteel/white/side{ - dir = 8 - }, -/area/crew_quarters/fitness) -"rUQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "saK" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -56977,60 +56788,54 @@ /obj/item/gun/energy/laser/practice, /turf/open/floor/plasteel/white, /area/science/circuit) -"sdL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +"saU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall, +/area/engine/engine_smes) +"saX" = ( +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/grass, +/area/security/prison) +"sci" = ( +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/crew_quarters/fitness) +"seP" = ( +/obj/structure/cable{ + icon_state = "0-4" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/turf/open/floor/plasteel/dark, -/area/bridge/meeting_room) -"sfa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/poddoor/preopen{ + id = "Secure Gate"; + name = "brig shutters" + }, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"sgV" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Air In" + icon_state = "1-8" }, +/turf/open/floor/plating, +/area/security/brig) +"shR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fore/secondary) -"sjm" = ( -/obj/structure/table/wood, -/obj/item/instrument/piano_synth, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"sjw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/structure/closet/wardrobe/black, -/obj/item/clothing/under/skirt/black, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/under/trendy_fit, -/obj/item/clothing/under/trendy_fit, -/obj/item/clothing/under/sundress, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"sjT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel, -/area/security/prison) +/area/space/nearstation) "slk" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -57043,86 +56848,45 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"slp" = ( -/obj/effect/turf_decal/tile/blue{ - alpha = 255 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - alpha = 255; +"spu" = ( +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"smn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"sqp" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"snG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/space, -/area/solar/port/aft) -"spX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/airlock/command{ + name = "Captain's Vault Access"; + req_access_txt = "20" }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) -"sqa" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush" +"srG" = ( +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"srq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/bridge/meeting_room) -"ssL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/space, -/area/solar/starboard/fore) -"suI" = ( -/obj/machinery/door/window/southleft{ - name = "Target Storage" - }, -/obj/item/target/clown, -/obj/item/target/clown, -/obj/item/target, -/obj/item/target, /turf/open/floor/plating, -/area/security/prison) -"svw" = ( -/obj/structure/chair{ +/area/crew_quarters/abandoned_gambling_den) +"ssB" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness) +/area/hallway/primary/starboard) "sxs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, @@ -57136,16 +56900,88 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"sxX" = ( +"syJ" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"szG" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - icon_state = "panelscorched" +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"sAM" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" }, -/area/maintenance/starboard/fore) -"sAI" = ( +/area/maintenance/bar) +"sEi" = ( +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 4 + }, +/area/crew_quarters/fitness) +"sEt" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/bar) +"sEM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"sFW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/sign/departments/restroom{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"sHx" = ( +/obj/structure/table, +/obj/item/book/manual/hydroponics_pod_people{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/paper/guides/jobs/hydroponics{ + pixel_x = -5; + pixel_y = 3 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"sJx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"sJI" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3; @@ -57158,30 +56994,31 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"sAM" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken6" +"sLa" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/area/maintenance/bar) -"sEt" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken7" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/area/maintenance/bar) -"sIe" = ( -/obj/structure/sign/poster/official/fruit_bowl{ - pixel_y = 32 +/obj/structure/window{ + dir = 4 }, -/turf/open/floor/plasteel/white/corner{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/area/hallway/primary/starboard) -"sLr" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/coin/silver, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"sLj" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) "sLv" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -57190,17 +57027,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"sMa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +"sNK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/vending/kink, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) +/turf/open/floor/wood, +/area/crew_quarters/theatre) "sOs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -57208,9 +57041,38 @@ /obj/machinery/door/airlock/maintenance/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sOA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"sPT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"sPY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/engine/engine_smes) "sQX" = ( /turf/open/floor/plating, /area/space) +"sRH" = ( +/obj/machinery/autolathe{ + name = "public autolathe" + }, +/turf/open/floor/plasteel, +/area/quartermaster/office) "sRT" = ( /obj/machinery/vending/cola/random, /turf/open/floor/wood, @@ -57242,52 +57104,56 @@ /obj/machinery/vending/boozeomat/all_access, /turf/closed/wall, /area/maintenance/bar) -"sYv" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +"sYR" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"sZa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/camera{ - c_tag = "Bar Backroom" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"sZR" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/bar) "tal" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/hallway/secondary/service) -"tdF" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light{ +"tgH" = ( +/obj/structure/filingcabinet/employment, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) +"tif" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"tkq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"tkB" = ( +/obj/structure/sign/poster/official/help_others{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) "tkU" = ( /turf/open/floor/wood{ icon_state = "wood-broken5" }, /area/maintenance/bar) +"tmO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/security/prison) "tqg" = ( /obj/machinery/cryopod{ dir = 4 @@ -57297,20 +57163,98 @@ }, /turf/open/floor/carpet, /area/crew_quarters/cryopod) -"tqt" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/chair/comfy/brown{ - dir = 1 +"tqB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/turf/open/floor/wood, -/area/library) +/turf/open/floor/plating, +/area/space/nearstation) "trb" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel, /area/security/courtroom) -"tru" = ( +"ttL" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"ttX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Firing Range"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"tur" = ( +/obj/item/restraints/handcuffs/fake, +/turf/open/floor/plating, +/area/maintenance/bar) +"tvi" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"txm" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/item/crowbar/red, +/turf/open/floor/plating, +/area/maintenance/port) +"tyX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/nuke_storage) +"tzQ" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/item/soap, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"tCa" = ( +/obj/structure/table/wood, +/obj/item/instrument/guitar{ + pixel_x = -7 + }, +/obj/item/instrument/eguitar{ + pixel_x = 5 + }, +/obj/item/instrument/violin, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"tCd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + alpha = 255; + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"tJi" = ( /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -57332,248 +57276,106 @@ /obj/item/megaphone/clown, /turf/open/floor/plasteel, /area/crew_quarters/theatre) -"trY" = ( -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 +"tJK" = ( +/obj/machinery/door/airlock/engineering{ + name = "Gravity Generator"; + req_access_txt = "11" }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"tsr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel, -/area/hydroponics) -"tuj" = ( -/obj/structure/light_construct{ - dir = 1 - }, +/area/engine/gravity_generator) +"tJS" = ( +/obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"tur" = ( -/obj/item/restraints/handcuffs/fake, -/turf/open/floor/plating, -/area/maintenance/bar) -"tuN" = ( -/obj/structure/chair/sofa, -/obj/structure/window{ +"tKk" = ( +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"tAb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/command{ - name = "Captain's Vault Access"; - req_access_txt = "20" - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) -"tAE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3; - pixel_y = 20 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - dir = 1; - pixel_x = 3; - pixel_y = 20 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/structure/sign/warning/fire{ + desc = "A sign that states the labeled room's number."; + icon_state = "roomnum"; + name = "Room Number 1"; + pixel_x = -30; + pixel_y = -7 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"tAV" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"tCi" = ( -/obj/machinery/vr_sleeper{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 4 - }, -/area/crew_quarters/fitness) -"tFt" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hydroponics) -"tGG" = ( -/obj/structure/table/wood, -/obj/item/book/codex_gigas, -/obj/item/clothing/under/suit_jacket/red, -/obj/structure/destructible/cult/tome, -/turf/open/floor/carpet, -/area/library) -"tHx" = ( -/obj/machinery/computer/arcade/minesweeper{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"tIk" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "maintdiy"; - name = "Security Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"tIC" = ( -/obj/structure/table/wood, -/obj/item/instrument/guitar{ - pixel_x = -7 - }, -/obj/item/instrument/eguitar{ - pixel_x = 5 - }, -/obj/item/instrument/violin, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"tLl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plating, -/area/security/prison) "tMl" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) -"tMS" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 6 +"tNF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/obj/item/pen/fountain, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/central) -"tNJ" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"tOd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plating, -/area/security/prison) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "tOq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /turf/open/floor/plasteel/white, /area/science/mixing) -"tOU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light/small, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "tPT" = ( /obj/machinery/chem_dispenser/drinks/beer, /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/bar) -"tQk" = ( -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) "tRe" = ( /obj/machinery/chem_master, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"tRB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "tRF" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/wood, /area/maintenance/bar) -"tTW" = ( -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"tUm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"tWj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + pixel_y = 5 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plating, -/area/maintenance/port) -"tUw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/crew_quarters/theatre) -"tWs" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"tWR" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "tXL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"tZe" = ( +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/pda_ad{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"uaj" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "uaw" = ( /obj/machinery/power/apc{ areastring = "/area/storage/art"; @@ -57586,37 +57388,380 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"udi" = ( +"ubj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/door/window/westright{ + name = "Red Corner" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"ucq" = ( +/obj/structure/sign/poster/contraband/red_rum{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"ufD" = ( +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 4 + }, +/area/crew_quarters/fitness) +"ugu" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"uhm" = ( +/obj/machinery/door/airlock{ + name = "Recharging Station" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"ujv" = ( +/obj/structure/sign/departments/restroom, +/turf/closed/wall, +/area/crew_quarters/toilet) +"ujF" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"ujS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"unA" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"unW" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/security/brig) +"uoB" = ( +/obj/structure/table/reinforced, +/obj/item/multitool, +/obj/item/screwdriver, +/obj/machinery/camera{ + c_tag = "Circuitry Lab North"; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"uoG" = ( +/obj/machinery/power/apc{ + areastring = "/area/security/detectives_office"; + dir = 4; + name = "Detective's Office APC"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"usO" = ( +/obj/machinery/vending/snack/random, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"uua" = ( +/obj/machinery/atmospherics/components/binary/valve, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"uuG" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"uve" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/coin/silver, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"uvZ" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/maintenance/bar) +"uxY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/junction, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"uBa" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{ + pixel_x = -3; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"uDO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/space, +/area/solar/port/fore) +"uEI" = ( /obj/structure/chair/comfy/brown{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"uFp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/sign/poster/official/cohiba_robusto_ad{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"uGI" = ( +/turf/open/floor/grass, +/area/security/prison) +"uIO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"uJx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"uNu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/science/circuit) +"uOJ" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/nuke_storage) +"uPT" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) +"uQS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + pixel_x = 5 + }, +/obj/machinery/light/small, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/toilet) +"uRd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal, +/turf/closed/wall/r_wall, +/area/engine/gravity_generator) +"uRS" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/theatre) +"uVS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"vae" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) +"vbi" = ( +/obj/structure/table, +/obj/item/instrument/guitar{ + pixel_x = -7 + }, +/obj/item/instrument/eguitar{ + pixel_x = 5 + }, +/obj/item/instrument/violin, +/obj/item/instrument/trombone, +/obj/item/instrument/saxophone, +/obj/item/instrument/piano_synth, +/obj/item/instrument/recorder, +/obj/item/instrument/accordion, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"vbD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "EVA Storage"; + req_access_txt = "18" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/storage/eva) +"vcN" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"vda" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/window/westleft{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Shooting Range" + }, +/turf/open/floor/plating, +/area/security/prison) +"vdu" = ( +/obj/structure/table/wood, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"ued" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/turf/open/floor/wood, +/area/security/vacantoffice) +"vhb" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 +/obj/structure/window{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"uhm" = ( +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/locker) +"viF" = ( +/obj/structure/table/wood, +/obj/item/instrument/trumpet, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"vjm" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/rag, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"vmQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"vnI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -57633,305 +57778,50 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"ujF" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"uko" = ( +"vob" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/open/floor/plasteel, -/area/security/brig) -"ukP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"ukS" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/item/soap, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/dorms) -"unl" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/dresser{ - desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; - name = "Dresser"; - pixel_y = 7 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"unu" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/washing_machine, -/turf/open/floor/plasteel/freezer, -/area/security/prison) -"unE" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/space/basic, -/area/space) -"unY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/departments/custodian{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"uoB" = ( -/obj/structure/table/reinforced, -/obj/item/multitool, -/obj/item/screwdriver, -/obj/machinery/camera{ - c_tag = "Circuitry Lab North"; - network = list("ss13","rd") - }, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"upX" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/theatre) -"usO" = ( -/obj/machinery/vending/snack/random, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"uuG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"uvZ" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/wood, -/area/maintenance/bar) -"uya" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/sign/departments/restroom{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"uzk" = ( -/obj/structure/sign/departments/restroom, -/turf/closed/wall, -/area/crew_quarters/toilet) -"uDW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"uNu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/science/circuit) -"uPT" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) -"uTq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"uVq" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#d1dfff" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"uVt" = ( -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/turf/open/floor/plating, -/area/security/prison) -"uVS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"uYE" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"uZM" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/sign/poster/official/space_cops{ - pixel_x = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"vbD" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "EVA Storage"; - req_access_txt = "18" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/storage/eva) -"vbY" = ( -/obj/machinery/vr_sleeper{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 4 - }, -/area/crew_quarters/fitness) -"vdz" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/open/floor/plasteel/freezer, -/area/security/prison) -"vdH" = ( -/obj/structure/bed, -/turf/open/floor/plating, -/area/maintenance/port) -"vgp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, /area/engine/gravity_generator) -"vjm" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/rag, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"vjq" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/crew_quarters/bar) -"vpm" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness) -"vpz" = ( -/obj/structure/sign/poster/official/twelve_gauge, -/turf/closed/wall/r_wall, -/area/ai_monitored/security/armory) "vpY" = ( /obj/structure/closet/lasertag/blue, /obj/item/clothing/under/pj/blue, /obj/item/clothing/under/pj/blue, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"vrM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-18" - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "vsM" = ( /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, /turf/open/floor/carpet, /area/crew_quarters/cryopod) +"vsT" = ( +/obj/structure/closet/crate, +/obj/item/book/manual/wiki/telescience, +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/atmospherics, +/obj/item/book/manual/wiki/detective, +/obj/item/book/manual/wiki/tcomms, +/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/experimentor, +/obj/item/book/manual/wiki/research_and_development, +/obj/item/book/manual/wiki/robotics_cyborgs, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/medicine, +/obj/item/book/manual/wiki/medical_cloning, +/obj/item/book/manual/wiki/infections, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/book/manual/wiki/toxins, +/obj/item/book/manual/wiki/grenades, +/obj/item/book{ + desc = "An undeniably handy book."; + icon_state = "bookknock"; + name = "A Simpleton's Guide to Safe-cracking with Stethoscopes" + }, +/turf/open/floor/wood, +/area/library) "vxh" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance{ @@ -57940,23 +57830,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"vys" = ( -/obj/machinery/vr_sleeper{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white/side{ - dir = 4 - }, -/area/crew_quarters/fitness) +"vyp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) "vzp" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm{ @@ -57973,35 +57850,42 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"vzS" = ( -/obj/structure/table, -/obj/item/book/manual/hydroponics_pod_people{ - pixel_x = -4; - pixel_y = 5 +"vBa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, -/obj/item/paper/guides/jobs/hydroponics{ - pixel_x = -5; - pixel_y = 3 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/hydroponics) +/turf/open/floor/plasteel/dark, +/area/bridge/meeting_room) "vCb" = ( /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"vCn" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "vCt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/science/circuit) -"vDq" = ( -/obj/effect/turf_decal/stripes/line, +"vCy" = ( +/obj/machinery/power/apc{ + areastring = "/area/maintenance/starboard/fore"; + dir = 1; + name = "Starboard Bow Maintenance APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/space/nearstation) -"vFt" = ( -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"vGX" = ( +/area/maintenance/starboard/fore) +"vDR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/closet/secure_closet/personal/cabinet{ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; @@ -58010,6 +57894,38 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"vEi" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"vEp" = ( +/obj/structure/sign/poster/contraband/lizard{ + pixel_x = -32 + }, +/obj/structure/sign/poster/contraband/lizard{ + pixel_x = -32 + }, +/obj/structure/sign/poster/contraband/lizard{ + pixel_x = -32 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"vFr" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "vHj" = ( /obj/machinery/door/airlock/public/glass{ name = "Cryogenics " @@ -58020,108 +57936,311 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/crew_quarters/cryopod) -"vHv" = ( -/obj/structure/closet{ - name = "Costume Closet" - }, -/obj/item/clothing/head/russobluecamohat, -/obj/item/clothing/head/russobluecamohat, -/obj/item/clothing/head/helmet/rus_ushanka, -/obj/item/clothing/head/helmet/rus_ushanka, -/obj/item/clothing/head/helmet/rus_ushanka, -/obj/item/clothing/head/helmet/rus_ushanka, -/obj/item/clothing/under/mw2_russian_para, -/obj/item/clothing/under/mw2_russian_para, -/obj/item/clothing/under/mw2_russian_para, -/obj/item/clothing/under/mw2_russian_para, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"vHM" = ( -/obj/machinery/vr_sleeper{ +"vHz" = ( +/obj/structure/chair{ dir = 8 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" }, +/turf/open/floor/plasteel, /area/crew_quarters/fitness) +"vHT" = ( +/obj/machinery/door/firedoor, +/obj/structure/sign/departments/evac{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) "vHY" = ( /turf/open/floor/plating, /area/science/mixing) -"vLD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, +"vIi" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/light, -/obj/machinery/camera/motion{ - c_tag = "Vault"; - dir = 1; - network = list("vault") +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"vNh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/turf/open/floor/plasteel, +/area/security/prison) +"vJu" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"vOq" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/coin/gold, -/obj/item/coin/gold, -/obj/item/coin/gold, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"vPs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/space, +/area/solar/starboard/aft) "vPE" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel/white, /area/science/circuit) -"vRr" = ( -/obj/effect/turf_decal/stripes/line{ +"vZA" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space, +/area/solar/starboard/aft) +"vZR" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood, +/area/library) +"wbE" = ( +/obj/effect/turf_decal/tile/blue{ + alpha = 255 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Shooting Range" +/obj/effect/turf_decal/tile/blue{ + alpha = 255; + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"wcB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/captain) +"wdv" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/space/basic, +/area/space) +"weM" = ( +/obj/structure/girder, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"wfR" = ( +/obj/item/electropack/shockcollar, +/obj/item/assembly/signaler, +/turf/open/floor/plating, +/area/maintenance/bar) +"wig" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + on = 0; + pixel_x = -7; + pixel_y = 12 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"wkN" = ( +/turf/closed/wall, +/area/science/circuit) +"woR" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/cryopod) +"wph" = ( +/obj/docking_port/stationary{ + area_type = /area/construction/mining/aux_base; + dheight = 4; + dir = 8; + dwidth = 4; + height = 9; + id = "aux_base_zone"; + name = "aux base zone"; + roundstart_template = /datum/map_template/shuttle/aux_base/default; + width = 9 }, /turf/open/floor/plating, -/area/security/prison) -"vRX" = ( -/obj/machinery/power/apc{ - areastring = "/area/security/detectives_office"; - dir = 4; - name = "Detective's Office APC"; - pixel_x = 24 +/area/construction/mining/aux_base) +"wql" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/r_wall, +/area/hallway/primary/central) +"wqF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"wrp" = ( +/obj/machinery/light{ + dir = 8 }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"wvX" = ( +/obj/structure/table/reinforced, +/obj/machinery/light, +/obj/item/stack/sheet/metal/ten, +/turf/open/floor/plasteel/white, +/area/science/circuit) +"wxT" = ( +/obj/structure/chair/sofa/left, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"wBd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/closed/wall, +/area/hallway/secondary/service) +"wHz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) +"wIG" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/security/brig) +"wKe" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "maintdiy"; + name = "Security Shutters" }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) -"vUR" = ( -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"wTf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"wUg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"wUr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"wUY" = ( +/obj/structure/table, +/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap, +/obj/item/hand_labeler, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"wWT" = ( +/obj/effect/landmark/start/roboticist, +/turf/open/floor/plasteel/white, +/area/science/robotics/lab) +"wXl" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 25 + }, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/dorms) +"wYc" = ( +/obj/machinery/vr_sleeper{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/security/prison) -"vVP" = ( +"wZI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) +"xbn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/structure/table, +/obj/item/coin/gold, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"xfS" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) +"xgk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"xgC" = ( /obj/structure/cable{ icon_state = "0-4" }, @@ -58147,325 +58266,22 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) -"vWw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel, -/area/security/prison) -"vYa" = ( -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"vZs" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) -"wcy" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"wfR" = ( -/obj/item/electropack/shockcollar, -/obj/item/assembly/signaler, -/turf/open/floor/plating, -/area/maintenance/bar) -"wgb" = ( -/obj/structure/falsewall, -/turf/open/floor/plating, -/area/security/prison) -"wkN" = ( -/turf/closed/wall, -/area/science/circuit) -"woR" = ( -/obj/machinery/cryopod{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopod) -"woX" = ( -/obj/machinery/door/window/southright{ - name = "Target Storage" - }, -/obj/item/target/alien, -/obj/item/target/alien, -/obj/item/target/syndicate, -/turf/open/floor/plating, -/area/security/prison) -"wph" = ( -/obj/docking_port/stationary{ - area_type = /area/construction/mining/aux_base; - dheight = 4; - dir = 8; - dwidth = 4; - height = 9; - id = "aux_base_zone"; - name = "aux base zone"; - roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 - }, -/turf/open/floor/plating, -/area/construction/mining/aux_base) -"wpo" = ( -/obj/machinery/camera{ - c_tag = "Bar West"; - dir = 4 - }, -/obj/machinery/computer/arcade/orion_trail, -/obj/structure/sign/poster/official/foam_force_ad{ - pixel_x = -32 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"wrp" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/service) -"wuB" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/open/floor/wood, -/area/library) -"wvX" = ( -/obj/structure/table/reinforced, -/obj/machinery/light, -/obj/item/stack/sheet/metal/ten, -/turf/open/floor/plasteel/white, -/area/science/circuit) -"wwn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"wwB" = ( -/turf/closed/wall/r_wall, -/area/hallway/primary/central) -"wwC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 25 - }, -/turf/open/floor/mineral/titanium/blue, -/area/crew_quarters/toilet) -"wyM" = ( -/obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"wAB" = ( -/obj/structure/chair/office/light, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"wBd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/closed/wall, -/area/hallway/secondary/service) -"wCa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "holoprivacy"; - name = "Holodeck Shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness) -"wDR" = ( -/obj/structure/sign/poster/official/help_others{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"wEp" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "bridge blast"; - name = "bridge blast door" - }, -/turf/open/floor/plating, -/area/hallway/primary/central) -"wFk" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/security/prison) -"wFX" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) -"wGP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) -"wHz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) -"wJz" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"wLT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/port) -"wNM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"wOT" = ( -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel, -/area/hydroponics) -"wUY" = ( -/obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/hand_labeler, -/turf/open/floor/plasteel, -/area/hallway/secondary/service) -"wVs" = ( -/obj/structure/table/wood, -/obj/item/instrument/trumpet, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"wXP" = ( -/obj/machinery/button/door{ - id = "maintdiy"; - name = "Shutters Control Button"; - pixel_x = -6; - pixel_y = 24 - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"wZB" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"xbu" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"xcg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating, -/area/space/nearstation) -"xdb" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" - }, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) -"xdV" = ( -/obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "xgF" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood{ icon_state = "wood-broken5" }, /area/maintenance/bar) -"xhx" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +"xhS" = ( /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/wood, -/area/bridge/meeting_room) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "xhV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -58475,6 +58291,14 @@ }, /turf/open/floor/plating, /area/construction) +"xib" = ( +/obj/machinery/door/window/westleft{ + base_state = "right"; + icon_state = "right"; + name = "Unisex Showers" + }, +/turf/open/floor/plasteel/freezer, +/area/security/prison) "xiw" = ( /obj/machinery/door/airlock{ name = "Service Hall"; @@ -58486,142 +58310,310 @@ }, /turf/open/floor/plating, /area/hallway/secondary/service) -"xkk" = ( -/obj/structure/piano, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"xlN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"xkd" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"xls" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/security/prison) +"xmo" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"xmS" = ( +/obj/structure/chair/comfy/beige{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel/grimy, +/area/hallway/secondary/entry) +"xqG" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/bar) +"xrN" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) +"xtP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore) +"xxi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/port/aft) -"xpx" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ +/area/maintenance/fore) +"xzd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/chair/sofa, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"xqW" = ( -/obj/structure/cable{ - icon_state = "0-4" +"xzj" = ( +/obj/machinery/light{ + dir = 1; + light_color = "#d1dfff" }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "Secure Gate"; - name = "brig shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "1-8" +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"xAk" = ( +/obj/structure/chair/stool{ + pixel_y = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/security/brig) -"xzh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/space/nearstation) -"xzy" = ( -/obj/effect/turf_decal/stripes/corner{ +/area/maintenance/starboard/fore) +"xAv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel, -/area/hydroponics) +/area/crew_quarters/dorms) +"xBk" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/toilet) +"xBw" = ( +/obj/structure/closet/wardrobe/cargotech, +/obj/item/radio/headset/headset_cargo, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"xDM" = ( +/obj/machinery/camera{ + c_tag = "Locker Room South"; + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) "xEu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"xEB" = ( +/obj/machinery/power/apc{ + areastring = "/area/ai_monitored/nuke_storage"; + dir = 1; + name = "Vault APC"; + pixel_y = 25 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) +"xEE" = ( +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/machinery/vending/wardrobe/curator_wardrobe, +/turf/open/floor/carpet, +/area/library) "xIa" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xIn" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"xLZ" = ( -/obj/structure/closet/radiation, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"xMl" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, -/obj/structure/window, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"xNY" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1 +"xLX" = ( +/obj/structure/lattice/catwalk, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 3; + name = "Docking Beacon"; + picked_color = "Burgundy" }, /turf/open/space/basic, /area/space/nearstation) -"xXY" = ( +"xOx" = ( +/obj/structure/chair/comfy/brown{ + color = "#596479"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"xPk" = ( +/obj/structure/bed, +/obj/machinery/button/door{ + id = "Dorm6"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/crew_quarters/dorms) +"xPY" = ( +/obj/structure/table/wood, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/instrument/trombone, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"xQG" = ( +/obj/machinery/door/airlock/external{ + name = "Common Mining Shuttle Bay" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"xTy" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"xUe" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/prison) +"xUL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light, +/obj/machinery/camera/motion{ + c_tag = "Vault"; + dir = 1; + network = list("vault") + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/nuke_storage) +"xXi" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"xZD" = ( /obj/structure/closet/lasertag/red, /obj/item/clothing/under/pj/red, /obj/item/clothing/under/pj/red, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"xYO" = ( -/obj/structure/sign/poster/contraband/red_rum{ +"ybj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating, +/area/security/prison) +"ycd" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/mirror{ pixel_y = 32 }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) +/obj/structure/sink{ + dir = 1; + pixel_y = 25 + }, +/obj/machinery/button/door{ + id = "LockerShitter2"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 14; + pixel_y = 38; + specialfunctions = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/blue, +/area/crew_quarters/toilet/locker) "ycu" = ( /obj/structure/cable{ icon_state = "2-4" }, /turf/open/floor/plasteel, /area/science/circuit) -"ycF" = ( -/obj/machinery/door/airlock/external{ - name = "Common Mining Shuttle Bay" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "ydD" = ( /obj/effect/turf_decal/bot, /obj/machinery/suit_storage_unit/rd, /turf/open/floor/plasteel, /area/science/mixing) -"yiN" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) +"yhz" = ( +/obj/structure/table, +/obj/item/folder/blue, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) +"yiY" = ( +/obj/structure/sign/poster/official/ion_rifle, +/turf/closed/wall/r_wall, +/area/ai_monitored/security/armory) (1,1,1) = {" aaa @@ -64643,11 +64635,11 @@ aaa aaa aaa aaa -aaK +ghq aaa aaa aaa -aaK +ghq aaa aaa aaa @@ -64660,7 +64652,7 @@ aaa aaa aaa aaa -hoo +gDl aaa aaa aaa @@ -64894,9 +64886,9 @@ aaa aaa aaa aaa -aaK +ghq aaa -aaK +ghq aaa aaa aaa @@ -64908,9 +64900,9 @@ gXs aaa aaa aaa -aaK +ghq aaa -aaK +ghq aaa aaa aaa @@ -65157,11 +65149,11 @@ gXs aaa aaa gXs -jmC +gJi gXs gXs gXs -jmC +gJi gXs aaa aaa @@ -65407,11 +65399,11 @@ aaa aaa aaa aaa -jmC -jmC +gJi +gJi gXs aag -jmC +gJi gXs gXs aaa @@ -65421,11 +65413,11 @@ aaa aaa gXs gXs -jmC -jmC -klu +gJi +gJi +haL aag -jmC +gJi aaa aaa aaa @@ -65664,11 +65656,11 @@ aaa aaa aaa aaa -xcg -lLt +gIU +shR aaa -lLt -jNo +shR +hse gXs aoV aaa @@ -65678,11 +65670,11 @@ aaa aaa aaa gXs -xcg -lLt +gIU +shR aaa -lLt -jNo +shR +hse aaa aaa aaa @@ -65921,11 +65913,11 @@ aaa aaa aaa aaa -xzh +bvG aaa cpe aaa -vDq +oyN aaa aaa aaa @@ -65935,11 +65927,11 @@ aaa aaa aaa aaa -xzh +bvG aaa cwV aaa -vDq +oyN aaa aaa aaa @@ -66177,7 +66169,7 @@ aaa aaa aaa aae -lCL +ktS gXs aaa aaa @@ -66434,7 +66426,7 @@ aaa aaa aaa aaa -lCL +ktS gXs aaa aaa @@ -66691,7 +66683,7 @@ aaa aaa aaa aaa -lCL +ktS gXs aaa aaa @@ -66948,7 +66940,7 @@ aaa aaa aaa aaa -lCL +ktS gXs aaa cqq @@ -66975,7 +66967,7 @@ aaa aaa aoV aaa -rHa +iDS aaa aaa aoV @@ -67205,7 +67197,7 @@ aaf aaf aaf aaa -lCL +ktS arB asE cyb @@ -67232,7 +67224,7 @@ aaa aaa asE asE -ycF +nGI asE asE aoV @@ -67492,7 +67484,7 @@ awW auP awW aaf -vZs +kls aaa aaa aaa @@ -67746,7 +67738,7 @@ aaa aaa arB arB -jnX +xQG asE aAC aaf @@ -67978,7 +67970,7 @@ apN apN apN apJ -iyC +fpI ayk awW aAD @@ -68002,7 +67994,7 @@ aaa aaa aaa arB -est +xfS ayk awW aAD @@ -69278,7 +69270,7 @@ aaa awW aOh ayl -tTW +jHh aRY awW aaa @@ -70574,7 +70566,7 @@ awW arB awZ aym -vrM +fOI awW aaf aaa @@ -71855,7 +71847,7 @@ aUO aUy aWm aWf -ohX +vdu czK bhN bcl @@ -72873,7 +72865,7 @@ aHy ayl aKk aLA -dTe +xmS aNf aLA aQD @@ -74899,7 +74891,7 @@ ady ady ady ady -rKc +uDO ajq ajW akB @@ -74943,7 +74935,7 @@ aXQ aXQ aPz aPz -rFc +epC aPz bhQ bjj @@ -75197,11 +75189,11 @@ aPA aXQ aZt aXQ -gdu +ycd aPz -kJY -ihC -oMY +omY +cMS +gQX bhQ bjj bkF @@ -75457,10 +75449,10 @@ aXQ bbL aPz bdJ -gFD +txm bgr -nQr -tUm +iwB +hew bkF aaa aaa @@ -75715,7 +75707,7 @@ aZw aPz bct bfa -vdH +gfr bhQ bjk bkE @@ -75970,10 +75962,10 @@ baO aZo baw aPz -cwP +hPs cBn bgs -wLT +hnl bjk bkF aaa @@ -76274,7 +76266,7 @@ ccb ccb ccb aaa -snG +qJr aaa ccb ccb @@ -76469,7 +76461,7 @@ bxk aDo aDo aIX -nIE +gCC aLE aLE aOp @@ -76483,7 +76475,7 @@ aQN aQN aQN aQN -kWI +vhb bbO aPA bgt @@ -76531,7 +76523,7 @@ aaa aaf aaa aaa -kKw +hrF aaa aaa aaf @@ -76546,7 +76538,7 @@ aaa aaa aaa aaa -hoo +gDl aaa aaa aaa @@ -76735,7 +76727,7 @@ aQN aQN aTz aUp -job +ubj aXr aZx aQN @@ -76788,7 +76780,7 @@ aaf aaf aaf aaf -kKw +hrF aaf aaf aaf @@ -76997,7 +76989,7 @@ aXv aYS aQN aQN -kWI +vhb bbO aPA aSg @@ -77240,18 +77232,18 @@ aDo aDo aDo aIY -nIE +gCC aLE aLE aOl aPA -lhg +pqs aQN aTC aUs -phY +mTG aXt -ksn +ijG aQN aQN aPA @@ -77506,9 +77498,9 @@ aQV aQN aTC aUu -eRk +gxc aXt -ksn +ijG aQN aQN aZB @@ -77761,11 +77753,11 @@ aOl aPA aQU aQN -hzw -qlr -pPE +nLw +sLa +oyl aXw -jiR +qfk aQN aQN aZA @@ -78273,10 +78265,10 @@ aLm aLE aOl aPA -xIn +vJu aQN aTD -mIS +ocv aUZ aYU aYU @@ -78517,14 +78509,14 @@ aaf avY axo arP -fLd -cRD +fgG +rqW aGD -tru +tJi aCr -qBc -iFL -qBc +hcb +qTG +hcb aKu aLM aLF @@ -78534,14 +78526,14 @@ aPG aPG aPG aPG -jsy +lip aQW aQW aQW aQW -cVu +xDM aPA -oBp +jxF aYb aZE bjp @@ -78774,14 +78766,14 @@ aaa avY axo arP -qwe -ioB +rPU +fne aGr aHI -xdV -ePO -phu -qBc +fOA +tWj +oyz +hcb aKu aLL bDe @@ -79032,13 +79024,13 @@ avY axo arP aCh -qQJ -iYz +pIf +kCo aHK aCr -tUw -mqa -qBc +uJx +ikk +hcb aKu aLN aLE @@ -79052,13 +79044,13 @@ aWu aYc aZD aZD -uhm +vnI aZD aZD bff -iRJ +dev aZE -fyM +xBw bjr ama bmh @@ -79117,18 +79109,18 @@ bLv bLv bLv aaa -prP -prP -prP -prP -prP -prP -prP -prP -prP +iDo +iDo +iDo +iDo +iDo +iDo +iDo +iDo +iDo aaa aaa -hoo +gDl aaa aaa aaa @@ -79289,13 +79281,13 @@ avZ axp ayC azH -wyM +eEe aGv aCr aCr -tUw -mqa -qBc +uJx +ikk +hcb aKu aLN aLE @@ -79306,7 +79298,7 @@ aRa aTF aPG aSX -eRn +hPP aZF aZF aZF @@ -79374,7 +79366,7 @@ cqK crl bLv aaa -prP +iDo ctv ctv ctv @@ -79382,7 +79374,7 @@ ctv ctv ctv ctv -prP +iDo aaa aaa aaa @@ -79543,14 +79535,14 @@ aGh aqR aqR awb -eLH +xtP ayA -fHK -hRX +sNK +xmo aBV -pNH -sfa -ioX +mzB +mJG +szG aHG aJe aKw @@ -79631,15 +79623,15 @@ cAQ crm bLv aaa -prP -prP -prP -prP -prP -prP -prP -prP -prP +iDo +iDo +iDo +iDo +iDo +iDo +iDo +iDo +iDo aaa aaa aaa @@ -79803,13 +79795,13 @@ awa axq ayD azI -gwi +rjQ aBU -xkk -upX -qJZ -doP -qBc +myh +inR +wUr +iTq +hcb aKu aLN aMQ @@ -79856,7 +79848,7 @@ aoV bCq bHE bHE -puG +mPr cdb bCq bVE @@ -79898,9 +79890,9 @@ gXs aaa aaa aaa -prP -prP -prP +iDo +iDo +iDo aaa aaa aaa @@ -80057,16 +80049,16 @@ aaa aaa aag avY -jLM +xxi ayD -oeJ +cGz aMr -qOf +ngs aDv -lwp -tUw -jly -qBc +uRS +uJx +dsC +hcb aKu aLN aMS @@ -80155,9 +80147,9 @@ gXs aaa aaa aaa -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -80314,21 +80306,21 @@ aaa aaa aag avY -jLM +xxi ayD -wVs +viF aMr aMr aOH -lwp -vNh -qHB -qBc +uRS +lSa +oTW +hcb aKu aLN aMS aOi -sqa +lPr aPK aSl aTH @@ -80383,7 +80375,7 @@ mrR dKP odx rBq -ouD +kQO bCq bUs bLv @@ -80402,19 +80394,19 @@ aaf aaa aaf gXs -sYv +gUu crn bij bij bij bij bij -hWn +jkz btG aaa -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -80573,14 +80565,14 @@ aag avY axs ayD -sjm -eNK -iEx +nez +ngV +xPY aOH -qBc -qBc -tAV -qBc +hcb +hcb +syJ +hcb aKu aLN aMS @@ -80610,7 +80602,7 @@ bbR btu bbR bOL -fnJ +qje byF bwW bGm @@ -80652,26 +80644,26 @@ cjJ cjJ cjJ cjJ -gVX -reZ -reZ +kfX +saU +saU bij crn bij bij -sZR -ued +eCR +wUg bnT bph bsc -fhP +mQS bsc -eXm +tNF btG gXs -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -80912,12 +80904,12 @@ cov cpj cpS cjJ -xLZ -ivF +fjS +sPT btG -wAB -vVP -mwO +rXl +xgC +ugu bnV bph bih @@ -80926,9 +80918,9 @@ bii bsc btG aaa -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -81104,8 +81096,8 @@ aPK aSn aTK aPK -vRX -hwu +uoG +sOA asW baW bLE @@ -81123,7 +81115,7 @@ bpB bpB brR bsV -aaM +bwc bxA bvI bwX @@ -81168,14 +81160,14 @@ cnN cox cpl cpU -ipc -edH -edH -nWq -edH -wZB -fby -qwB +jLn +xTy +xTy +tJK +xTy +vob +xhS +mOB bph big bgN @@ -81183,9 +81175,9 @@ bkZ bsc btG aaa -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -81322,7 +81314,7 @@ aaa acd acd acd -jHM +xUe acd acd aaa @@ -81366,7 +81358,7 @@ aYi aqW aqW bbQ -qpA +uFp apd aZH aZK @@ -81426,12 +81418,12 @@ cow cpk cpT cjJ -xLZ -oNQ +fjS +dXq btG -sZa -jhF -qmM +rtl +oqO +vFr bnV bph bii @@ -81440,9 +81432,9 @@ bih bsc btG aaa -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -81577,10 +81569,10 @@ abc abc afu abc -suI -qMu -kJr -dxB +itQ +pgn +tmO +eHU acd aaa aaa @@ -81681,25 +81673,25 @@ clG cnP coz cpn -dbn -dbn +sPY +sPY bgO -hjw +dgO bgO -nTE -pTn -jnm +pPI +uRd +ktP bnW bph bsc -mQR +mkv bsc -wNM +jFH btG gXs -prP +iDo ctv -prP +iDo aaa aaa aaa @@ -81834,11 +81826,11 @@ aea aeH aft abc -woX -kdm -rvZ -vUR -jHM +dly +mnC +mcp +xls +xUe aaa aaa aiU @@ -81944,19 +81936,19 @@ aaf aaa aaa gXs -gtL +iHk bgO bgO bgO bgO bgO bgO -vgp +jBA btG aaa -gSH +kvl ctv -prP +iDo aaa aaa aaa @@ -82080,7 +82072,7 @@ aaa aaa gXs gXs -dbM +dVU abc abu abu @@ -82092,10 +82084,10 @@ aeJ afw abc abc -kdm +mnC aay -vUR -qlF +xls +kMt aaf aaf aiU @@ -82163,7 +82155,7 @@ bCq bHD bJe bCq -czi +nkP bHE bHE bHE @@ -82211,7 +82203,7 @@ aaa aaa aaa aaa -prP +iDo ctv aaT aaa @@ -82349,9 +82341,9 @@ aeI afv agf abc -kdm +mnC aay -vUR +xls aiT aiT aiV @@ -82384,7 +82376,7 @@ aKA aLN aMS aOz -iMG +exP aPQ aSa aSr @@ -82394,7 +82386,7 @@ aYZ bLE aqW aqW -hfe +noy apd beA bqp @@ -82402,7 +82394,7 @@ cNG cNJ bLF aZK -haz +sRH bbR bqt cBq @@ -82468,8 +82460,8 @@ aaa aaa aaa aaa -prP -prP +iDo +iDo aaT aaa aaa @@ -82593,8 +82585,8 @@ aaa aaa aaa aai -jSa -uVt +eqd +kgr abe abw acc @@ -82606,9 +82598,9 @@ aeL afy agh abc -tOd -vRr -tLl +hnU +vda +ybj aiT ajs akb @@ -82850,7 +82842,7 @@ aaa aaa gXs aai -gIO +gbu aay abd abv @@ -82863,9 +82855,9 @@ aeK afx agg abc -orw -jMK -riA +dCV +idK +ttX aiU ajr aka @@ -83108,9 +83100,9 @@ aaf aaf aai acd -wgb +mIZ abg -jtU +enB aby aby aby @@ -83120,10 +83112,10 @@ aeN afA afA abc -vWw -wFk -oXL -cXx +laq +kdP +mGw +jls aju akd akK @@ -83190,14 +83182,14 @@ bCn bGq bGq bGq -tdF +rGq bLw bGq bGq bGq bLw bGq -tdF +rGq bTD bUx bVI @@ -83212,7 +83204,7 @@ bVI bVI bVI bTA -xlN +xgk bHE bHE bHE @@ -83245,7 +83237,7 @@ aaa aaa aaa aaa -hvS +kEY aaa aaa aaa @@ -83366,7 +83358,7 @@ aai aai abf aat -tHx +jRw abx acd acC @@ -83375,12 +83367,12 @@ adF aef aeM afz -jSD +dLG aav -sjT -pLt -pQr -new +vIi +fsj +mPt +lyR ajt akc akJ @@ -83693,7 +83685,7 @@ bqw aJq aJq aYl -ppY +fAj aLX aJq aJq @@ -83877,7 +83869,7 @@ aai aan aaw aaB -kfE +qmn aaJ aat abh @@ -84132,7 +84124,7 @@ aag aaa aak aap -fuo +saX aaD aau aat @@ -84207,7 +84199,7 @@ bqy cBr bqy buK -pNI +tZe aJw aJq aJq @@ -84239,7 +84231,7 @@ bWB bWB cec bVI -iOt +kNv ccw chY ciX @@ -84646,7 +84638,7 @@ aag aaa aal aar -phH +uGI aaF aat aat @@ -84725,7 +84717,7 @@ bwi bmr aMm aJq -otF +vEi bCs bCs bEY @@ -84903,12 +84895,12 @@ aag aaf aaj aaq -eOy +dyS aaE aat aaN aaV -rtT +rvS aat acd abL @@ -84987,7 +84979,7 @@ bCs bDv bEX bFb -hKF +kfv bFa bKt bLx @@ -85163,9 +85155,9 @@ aat aat aat aat -jeR -neC -jgv +qXg +jjC +xOx abD acd acd @@ -85183,9 +85175,9 @@ agj auj akl akO -uko -uko -xqW +fde +fde +seP anw anz aox @@ -85421,7 +85413,7 @@ aat aat aat aat -hRz +uEI aat abC acd @@ -85465,7 +85457,7 @@ aGq aHO aJl ayW -neb +ftE aJq aOE aJn @@ -85478,7 +85470,7 @@ aYq aZO aZC baK -qBe +rnt bbC bdI bgK @@ -85735,10 +85727,10 @@ aYs aZQ bbi bde -nLf +kvL bcd bcd -xhx +gNC bcd bcd bcd @@ -85930,14 +85922,14 @@ aaa aag aaf aai -cMk -cMk +wYc +wYc aaG -cMk +wYc aaP aaX -unu -lwY +keM +xib acd acD acY @@ -85993,7 +85985,7 @@ aZP bbh bcc bdd -gjf +cVs bfr bgM bif @@ -86211,9 +86203,9 @@ aiz ajg akl akR -uko -uko -xqW +fde +fde +seP anz anz aov @@ -86252,19 +86244,19 @@ bbk bfu bbk bfs -pUl +rTu aZM aZM aaf aaf -lCL +ktS aaf -lCL +ktS aaf -lCL +ktS aaf -lCL -wwB +ktS +fxV aXf aJq bBi @@ -86451,7 +86443,7 @@ aaa aaf aai abi -vdz +eqA ach acK adf @@ -86509,19 +86501,19 @@ bce bdf beb aYv -kTz -kDD +cUx +fcn aaf aaf -lCL -lCL +ktS +ktS aaf -wwB -wwB -wwB -wwB -wwB -wwB +fxV +fxV +fxV +fxV +fxV +fxV aXf aJq byU @@ -86766,19 +86758,19 @@ aZR bbm bec bfu -sdL +vBa aBa aBa aBa aBa aBa aBa -wwB +fxV bsb -lTq -tMS -eND -wEp +yhz +ouQ +cQT +nbT aXf aJq bBi @@ -86972,7 +86964,7 @@ cpg acv adi adi -pQD +yiY aeW agQ ahv @@ -86989,7 +86981,7 @@ anz anz aov aph -oOb +cIv ard ard ard @@ -87023,7 +87015,7 @@ aZR aZR aZR bft -srq +psk aBa aBT aDs @@ -87032,13 +87024,13 @@ aGb aBa bqD bsa -oeQ +vCn bsa bsa -wEp +nbT byS aJq -idX +wTf bCs bCs bCs @@ -87229,7 +87221,7 @@ acl cxA acL adi -vpz +pfm agp agT ahx @@ -87239,12 +87231,12 @@ ajc ajI akl akT -fGl -uko -xqW +unW +fde +seP anw anz -lYU +old apk anw anw @@ -87255,7 +87247,7 @@ avj awl axC ayY -uZM +cpF azZ azZ azZ @@ -87280,16 +87272,16 @@ bbm bdh bee bfv -vLD +xUL aBb -cSn +gpD aDr aEM aGa aHF bqF bsa -nmx +nXE buQ buQ bxI @@ -87359,7 +87351,7 @@ cgI cgI cgI aaa -hoo +gDl aaa aaa aaa @@ -87537,13 +87529,13 @@ bcf bdg bed bfv -kvZ -fGC -qvM +tyX +pst +cTT alu aEM aGd -nMx +uOJ bqE bqE bqE @@ -87769,7 +87761,7 @@ avk awk axE ayZ -ncj +pHO aBu aAa aAa @@ -87794,18 +87786,18 @@ bbm bdh bef bfv -smn +gTx aBc -jXg +xEB aDt aEO aGc aHF aKG bsf -kxc -kxc -kxc +dml +dml +dml bxK bwh bAh @@ -88015,7 +88007,7 @@ aml amT anw anz -ilJ +cXU apl aqc aqc @@ -88051,19 +88043,19 @@ aZR aZR aZR bfw -rzg +wZI aBa aBW bjy aEP -nOS +nYe aBa bqG bsa -jDY +eih bsa bsa -wEp +nbT bwb aJq bBr @@ -88272,7 +88264,7 @@ amn amV anw anz -rsX +gfC aod aqf ahT @@ -88308,19 +88300,19 @@ aZR bbm beh bfx -spX +qcm aBa aBa aBa aBa aBa aBa -mte +wql bsg -lTq -tMS -fZD -wEp +yhz +ouQ +fTC +nbT aJq aJq bBu @@ -88565,19 +88557,19 @@ bcg aZU beg aYB -ptV -fjy +qOB +qBi aaf aaf -lCL -lCL +ktS +ktS aaf -wwB -wwB -wwB -wwB -wwB -wwB +fxV +fxV +fxV +fxV +fxV +fxV aJq aJq bBt @@ -88782,9 +88774,9 @@ ajJ akr akX alC -iqw +wIG amX -elw +spu anz aoB aod @@ -88822,19 +88814,19 @@ bbp bfx bbp bfz -tAb +sqp aZV aZV aaf aaf -lCL +ktS aaf -lCL +ktS aaf -lCL +ktS aaf -lCL -wwB +ktS +fxV aJq aJq aXf @@ -89041,9 +89033,9 @@ akW aiG amo amW -uYE +uaj anz -rsX +gfC aod aqe arf @@ -89094,7 +89086,7 @@ bsh bqH aJq aJq -unY +gnf bCv bDJ bCt @@ -89333,7 +89325,7 @@ aYD aZX baf bdk -jwi +mRQ bek bfB bgU @@ -89576,7 +89568,7 @@ vHj eVC dgz aJv -ioG +khV aMg bHt aOE @@ -89806,13 +89798,13 @@ ahC aia aiP aiR -olv +coi akv ala aww afM aiX -uVq +xzj anz aoF apo @@ -89823,8 +89815,8 @@ atj aul auR atj -kcj -ghJ +mps +tKk atj aAX azc @@ -89847,7 +89839,7 @@ aPR aZV baq baQ -dTJ +wcB bcQ bfC bgV @@ -90083,8 +90075,8 @@ avt axL bbl azT -nlt -dwc +nZE +ker aDG aFd auk @@ -90137,7 +90129,7 @@ bOV bQj bRw bSF -gVY +daI bTP bRA bWQ @@ -90336,11 +90328,11 @@ arf arf arf arf -ukP -oma +ltK +xAv awr awr -wwn +ruo aAh aAh aAh @@ -90377,7 +90369,7 @@ btL buY buY bqH -neb +ftE aJq aXf bCv @@ -90394,7 +90386,7 @@ bOV bQo bRz bSH -cJn +plm bTP bRA bWQ @@ -90597,7 +90589,7 @@ avv awu awr aAd -uDW +tkq aAh aDL aAh @@ -90651,7 +90643,7 @@ bOV bQj bRy bSG -gVY +daI bUK bVT bWR @@ -90854,7 +90846,7 @@ awp axN awr awr -kSh +haM aAh aDQ aAh @@ -90862,7 +90854,7 @@ aGl aAh aBy aAh -pTR +rqf aJq aOE aJn @@ -90875,7 +90867,7 @@ aYF aZV bbw bcn -qUm +tgH ben bfE bgX @@ -91105,13 +91097,13 @@ aqe arf ari asu -kyi +mPk aun avR -oma -dHb +xAv +ofU awr -uya +sFW aAh aDM aGx @@ -91364,18 +91356,18 @@ arf arf arf arf -ukP +ltK axP azb aAi -wGP +uIO aCn -rOm -wwC +xBk +dtx aGm aHV aDM -nrR +hIM aJq aJq aJq @@ -91406,9 +91398,9 @@ bva bwu bwu bwu -ihm +kPj bBB -rhb +eBX bzs bFp bGJ @@ -91624,8 +91616,8 @@ arf awq axO aza -jtk -pqR +kmw +xrN aAh aAh aAh @@ -91874,7 +91866,7 @@ ajo aps aqk arf -vGX +vDR blU aHw avn @@ -91882,14 +91874,14 @@ awv axX aze awr -hMx +flE aAh aDU aBz aBz aAh -isy -uzk +dTI +ujv aJq aJq aJq @@ -92133,7 +92125,7 @@ aqj arf ark asu -epV +xPk aun awt awr @@ -92142,10 +92134,10 @@ azX aAZ aCe aDT -mEN -mEN -dzy -fyq +cPn +cPn +mkO +uQS aAh aJC aJC @@ -92402,18 +92394,18 @@ aDP aBx aBx aAh -kCk -qIf +qqs +sYR aMq adq aQb aPZ aRu -wpo +kAH aKR -tIC +tCa aXi -maC +hgO baa aJC bcq @@ -92653,7 +92645,7 @@ awy awr awr avG -udi +wqF aAh aAh aAh @@ -92663,13 +92655,13 @@ aAh aAh aKR aKR -pxD +fxe aPY -xMl +kAO aRx aKR -jzD -tuN +iTU +pqe aPY aZZ aQg @@ -92910,24 +92902,24 @@ awA axT axW aAl -tAE +cHf aJC aDR aFl -rLr +kqI aHZ aJC aKJ -rLR +hIL aKR -hSU -kay +wxT +moD aQd aQa aKR -xbu -hSU -lwj +elh +wxT +uBa bac aJC aYV @@ -93151,7 +93143,7 @@ aif aif aif bkV -fvk +jKP alK aif aif @@ -93159,19 +93151,19 @@ anc anD aoI arf -myt +eSe asN aur avy -tWR +nSt axS azk aAk -eUd +tvi aJC aDY aDY -rLr +kqI aKR aJk aKR @@ -93187,7 +93179,7 @@ aKR aKR bab aJC -xYO +ucq aYV ber bfF @@ -93399,13 +93391,13 @@ abp afo abp abp -hlY +uhm ahn aiA aiA aiA ahn -hYW +oLn anF aod ahn @@ -93416,15 +93408,15 @@ ahn ahn ahn arf -iES -jdT +oAB +eQb aut arf aXF awr awr aAn -wcy +rqk aJC aEc aFk @@ -93434,19 +93426,19 @@ aJC aKr aKR aKR -fbm -fbm -hzR +sLj +sLj +vcN aKR aKR aKR -fbm +sLj aKR aKR bbx aYV aYV -wDR +tkB bfF bhd bis @@ -93652,11 +93644,11 @@ aaf aaf aaf abp -unE +wdv afp -unE +wdv abp -nea +nQi ahn aaa aaf @@ -93666,39 +93658,39 @@ ahn anE aod aoK -sgV +oyX aqp ahn -ukS -tQk -cVp -jdT -jdT -jdT -rMc +tzQ +pgf +gzf +eQb +eQb +eQb +lUS aun avz awr awr aAn -fSr +jGW aJC aJC -gjC -lxx +plC +oAb aJC aJC aKq aKR aNF -egS -ghs -lMY +hOv +oax +oxm aSH aKR -dMX -igT -moq +rmN +eJa +hSZ aKR aQg aYV @@ -93724,7 +93716,7 @@ bvj bvj bvd bFu -hcd +jex bvj bvd bKH @@ -93926,19 +93918,19 @@ aoL apy aqq ahn -dhx -mfb +qLR +oIW arf -unl +kmS ast -jdT +eQb auv arf avA axW azo aAp -lYZ +uxY aBC aCt aEA @@ -93949,13 +93941,13 @@ aKN aKR aKR aOJ -fvW -dtE +oIJ +unA aKR aKR aUg bFC -moq +hSZ aKR bbx aYV @@ -93963,9 +93955,9 @@ aYV bet bfH bhf -slp +wbE bhh -slp +wbE bmJ bof bpu @@ -94191,11 +94183,11 @@ arf arf arf arf -hkg -eNW +hlV +oHB azf aAo -lMx +vyp aBB aBB aBB @@ -94205,12 +94197,12 @@ cNE aKM aMu aMu -poa -hdb +feG +tif aMu aMu aMu -uTq +jgA aSq aKR bad @@ -94222,7 +94214,7 @@ bfG bhe bit bjS -nGS +tCd bli boe bli @@ -94437,24 +94429,24 @@ aag aag aag arf -iep -gQn +wXl +iou arf -myt -qNs -lMx -sjw +eSe +wig +vyp +rrM clO asZ aua -dcG +oZl awB att azh -vYa -vYa -gKk -vbY +fHG +fHG +kxf +ufD alP aGI aId @@ -94468,7 +94460,7 @@ aMx aMx aMx aMx -eqm +rqE aKR aZb aJC @@ -94679,11 +94671,11 @@ aaa aaa aaa aaa -xzh +bvG aaa aqG aaa -vDq +oyN aaa aaa aaa @@ -94694,24 +94686,24 @@ aaa aaa aaa arf -pZv -tQk -cVp -jdT -ier +lOe +pgf +gzf +eQb +jLT arf arm -vYa +fHG aya -vYa -vYa +fHG +fHG auB atZ azg azp -vYa +fHG aCu -dgh +qOc alP aGH aIc @@ -94936,11 +94928,11 @@ aaa aaa aaa aaa -lCB -lNB +tqB +vae aaa -lNB -rUQ +vae +efO aaa aaa aaa @@ -94954,21 +94946,21 @@ arf arf arf arf -iES -jYI +oAB +ujS aqs -hVw -vYa -vYa -vYa -vYa -pSf -vYa +coh +fHG +fHG +fHG +fHG +pPi +fHG ayb -ndC -vYa +hWd +fHG aCv -frE +mbU alP aGJ aIe @@ -94982,7 +94974,7 @@ aXj aVy aSY aVy -oNb +xqG acN bah aJC @@ -95193,11 +95185,11 @@ aaa aaa aaa aaa -jmC -jmC +gJi +gJi gXs -jmC -jmC +gJi +gJi aaa aaa aaa @@ -95210,22 +95202,22 @@ aaa aaa aaa arf -ewZ -jdT -tOU +obc +eQb +qAm arf -fQF -qbx -qux -vYa -vYa -pSf -vYa +lXE +pFX +mOO +fHG +fHG +pPi +fHG ayb -ndC -vYa -vys -tCi +hWd +fHG +sci +sEi alP aGJ aIe @@ -95235,11 +95227,11 @@ aKQ aNu aJC aPw -kwy +egt aQc aSZ aQc -vjq +qaY acN bag aJC @@ -95467,22 +95459,22 @@ aaa aaa aaa arf -qoP -prU -fOc +mse +fMZ +dqb arf -oSO -sAI -fJa -vYa -svw -ntf -jvN -lBE -xpx -vYa +xzd +sJI +jJg +fHG +eAJ +rvr +nLu +hcA +ryr +fHG aCu -hgX +puh alP aGA aHS @@ -95504,7 +95496,7 @@ aYV aYV bet bfH -dok +qTV bhh bhg bln @@ -95708,9 +95700,9 @@ aaa aaa aaa aaa -aaz +xLX aaa -aaz +xLX aaa aaa aaa @@ -95728,18 +95720,18 @@ arf arf arf arf -mTp -qEv -kRk -mXB -qAQ -pzk -vYa -sMa -iEI -jeT -rTQ -vHM +fZm +jmV +epD +ghD +hBA +xbn +fHG +reA +lsk +xXi +jAN +jEc alP aGL aHM @@ -95984,18 +95976,18 @@ aaa aaa aaa gXs -kHJ -rEV -rEV -kQZ -fVU -vpm -vpm -fVU -nel -wCa -wCa -lFl +ewu +pQp +pQp +oqj +jBi +fpl +fpl +jBi +oDN +sEM +sEM +pRs arj alP aGL @@ -96092,7 +96084,7 @@ aaf ctZ cui cuq -ajY +cuC cuO cuz cvm @@ -96270,7 +96262,7 @@ aVz aVz aYJ aJI -sIe +mNW aYV aYV aYV @@ -96600,8 +96592,8 @@ czk cti cua cua -aeF -afs +ctw +ctH ctQ cuc cuj @@ -96787,7 +96779,7 @@ baj bbz aYV bdp -itT +mvt bfK bfK bfK @@ -96857,9 +96849,9 @@ ctb cth cua ctr -afn -age -agX +ctu +ctG +ctP cub cuj cur @@ -97040,7 +97032,7 @@ aVD aVE aXm aVz -egQ +juG bbz aYV bdp @@ -97114,13 +97106,13 @@ ctc ctc cto ctt -afq +cty ctJ -ahw +ctT cue cul cuu -akz +cuG cuS cve cvo @@ -97371,9 +97363,9 @@ ctb ctj ctk cts -afr -agv -ajC +ctx +ctI +ctS cud cuk cus @@ -97526,17 +97518,17 @@ aaa aaa aaa aaa -haX -rEV -rEV -rEV -nie -vpm -vpm -wFX -wCa -wCa -wCa +vmQ +pQp +pQp +pQp +grA +fpl +fpl +gbh +sEM +sEM +sEM aCy arj alP @@ -97554,7 +97546,7 @@ aTO cCq aVz aVz -fPs +qus bbz aYV bdp @@ -97787,14 +97779,14 @@ aaa aaa aaa arj -cRz +fCx avD awC ayb -mbD -nmS -oFk -xXY +eCr +jvd +cEo +xZD vpY alP aGJ @@ -97840,7 +97832,7 @@ bCR bqQ bGX bCR -oDy +edA bRN bIK bPq @@ -98046,13 +98038,13 @@ aaf arj auz avC -kOf +vHz aya -vYa -vYa -oYc -vYa -vYa +fHG +fHG +xkd +fHG +fHG gOZ aGJ avI @@ -98143,7 +98135,7 @@ aaa aaf cua ctF -agH +ctM ctX cuf cum @@ -98303,7 +98295,7 @@ alO arj arj arj -eOv +pBp gOZ cVb cVb @@ -98401,7 +98393,7 @@ aaf cua ctE ctL -ajX +ctW cuf cum cuw @@ -98815,10 +98807,10 @@ cxW anf aqv ayf -fIn -ego +dce +uua awE -dMu +tRB cVb vCb wUY @@ -99071,8 +99063,8 @@ aag alO anf alO -kSB -pAl +mAH +jaF alP anf aCG @@ -99088,11 +99080,11 @@ aIq aKK aMy aIp -jaa +nGf aQm -wOT -htr -htr +fzd +fFA +fFA aVK aRJ aRJ @@ -99334,10 +99326,10 @@ alP awF aCG alP -olw +nhY aBE aCz -trY +vEp aCJ aGT aIn @@ -99347,10 +99339,10 @@ aMt aIp aOW aQm -dRC +coI aSS aUj -pHo +sJx aRJ aYQ cBg @@ -99584,7 +99576,7 @@ aoN apA aof arq -hdp +itK atv auD alP @@ -99604,14 +99596,14 @@ aMA aIp aOX aQm -dRC +coI aST aUk -pHo +sJx aRJ aYQ bam -yiN +ssB aYV aYV aYV @@ -99828,10 +99820,10 @@ adU adU adU adU -ssL -rsv -rsv -rsv +eaR +jIs +jIs +jIs acx amv ane @@ -99861,14 +99853,14 @@ aMz aNQ aOX aQm -tFt -tsr -tsr -xzy +lva +nUV +nUV +gbd aRJ aYR ban -qje +ikm aYV aYV bez @@ -100112,7 +100104,7 @@ aaa aFq aGX aIp -vzS +sHx aKU aME aNN @@ -100125,7 +100117,7 @@ aXo aXo aYO bap -qje +ikm aYV bci beB @@ -100354,7 +100346,7 @@ aof aof aof aof -qkC +vCy aoP atw auF @@ -100362,7 +100354,7 @@ alP aoP auF azr -kel +jez atw alP alP @@ -100376,13 +100368,13 @@ aNQ aOZ aOX aOX -hZH +rdG aUz aVM aOX aYT bam -ory +iuR baR bcb bdl @@ -100439,7 +100431,7 @@ bAw bAw clp aag -jmC +gJi aaa aaa aaa @@ -100617,7 +100609,7 @@ aty auF alP aAt -kuY +jZT alP alP alP @@ -100868,7 +100860,7 @@ aaa aaa apC anf -kel +jez alP atx auF @@ -100877,7 +100869,7 @@ auD auF apE aAs -khA +vbi alP aCG aFr @@ -101130,12 +101122,12 @@ alP apE auG alP -rgF +iWx auF apE anf anf -jRy +noF aCG aDZ aFu @@ -101399,8 +101391,8 @@ bbE aIr bav aLf -aaL -kLR +aNV +qfD aRO aQp aRN @@ -101464,11 +101456,11 @@ cQB czY cOT aaa -jmC -jmC -jmC -jmC -jmC +gJi +gJi +gJi +gJi +gJi aaa aaa aaa @@ -101641,12 +101633,12 @@ apC alP alP alP -tuj +dbU auH avF awI ayc -mlr +gcF asw asw aCD @@ -101657,7 +101649,7 @@ aIu aJQ aIt aIt -kLR +qfD aRO aIt aRN @@ -101912,9 +101904,9 @@ anf aFu aIs aJP -wuB +vZR aIt -nsJ +hGH aYW aYW aYW @@ -101982,9 +101974,9 @@ aaa aaa aaa aaH -adO -aeD -aeE +eFW +nwX +weM aaa aaa aaa @@ -102169,9 +102161,9 @@ aFu aFu aIw aJS -tqt +pJR aNP -jFy +esZ aOS aOS aOS @@ -102235,14 +102227,14 @@ cQB cAa cOT gXs -xNY -kvb +rnK +kWp aaa aaa aaH aaH aaH -aeE +weM aaa aaa aaa @@ -102419,7 +102411,7 @@ awJ anf alP aAv -gCe +tJS aCE aDZ aFu @@ -102428,7 +102420,7 @@ aIv aJR aIt aIt -kLR +qfD aRO aIt aPd @@ -102492,14 +102484,14 @@ czU czZ cOT aaa -jmC +gJi aaH aaH aaH aaH aaH aaH -adO +eFW aaa aaa aaa @@ -102685,7 +102677,7 @@ aIx aJF aQq aNS -kLR +qfD aRO aIt aPd @@ -102749,14 +102741,14 @@ cgm czY cOT gXs -xNY -kvb -gJg +rnK +kWp +kaq aaH aaH aaa aaa -gJg +kaq aaa aaa aaa @@ -102946,12 +102938,12 @@ aFu aPf aQq aRP -kHK +pem aIt aIt aWd aXV -iWa +vsT bbD aYV aXq @@ -102959,7 +102951,7 @@ aYV bfV bhw cHM -kRw +wWT blB blF cHS @@ -103008,9 +103000,9 @@ cNW aaa aaa aaa -gJg -gJg -adO +kaq +kaq +eFW aaH gXs aaa @@ -103182,8 +103174,8 @@ alO anf anf arw -ftv -sLr +nuw +uve anf alP awL @@ -103456,7 +103448,7 @@ aIy aJG cAz aFw -iWk +gRZ aPg aQr aFu @@ -103523,10 +103515,10 @@ aaa aaa aaa aaa -jmC -jmC -jmC -jmC +gJi +gJi +gJi +gJi aaa aaa aaa @@ -103693,10 +103685,10 @@ aaa aaa gXs alP -qxc +jkx ayf -nuV -iOV +xAk +mHU aFn aFn aBB @@ -103713,7 +103705,7 @@ aFw aLo aLb aFw -eMQ +xEE aYW aYW aRQ @@ -103947,13 +103939,13 @@ aaa aaa aaa aaa -fzd -fzd -fzd -fzd -tNJ -fzd -fzd +nsA +nsA +nsA +nsA +qVP +nsA +nsA atB alP alP @@ -103970,7 +103962,7 @@ aIz aJM aLa aFw -tGG +hsb aYW aQs aFu @@ -104204,21 +104196,21 @@ aaa aaa aaa aaa -fzd -xdb -mCq -wJz -mHC -tWs -lmi -ghY -sxX -ghY -jBZ +nsA +cQF +ndq +rIA +fBy +hRI +jaH +hHQ +feE +hHQ +kGJ avI asA apE -vHv +dPk aCG aEf aFw @@ -104461,12 +104453,12 @@ aaa aaa aaa aaa -tIk -mCq -mCq -mCq -mCq -pjh +wKe +ndq +ndq +ndq +ndq +oLl asB asB asB @@ -104557,7 +104549,7 @@ cOe cBT aag gXs -jmC +gJi aaa aaa aaa @@ -104718,12 +104710,12 @@ aaa aaa aaa aaa -tIk -mCq -mCq -mCq -mCq -dSv +wKe +ndq +ndq +ndq +ndq +qeb asB atD auJ @@ -104975,12 +104967,12 @@ aaa aaa aaa aaa -fzd -mCq -mCq -mCq -mCq -mCq +nsA +ndq +ndq +ndq +ndq +ndq asB atC auI @@ -105064,7 +105056,7 @@ cNW cNW cNW cOe -qXH +fup csy cko cAf @@ -105232,12 +105224,12 @@ aaa aaa aaa aaa -tIk -mCq -mCq -mCq -mCq -mCq +wKe +ndq +ndq +ndq +ndq +ndq asB atE auI @@ -105489,18 +105481,18 @@ aaa aaa aaa aaa -tIk -mCq -mCq -mCq -mCq -mCq +wKe +ndq +ndq +ndq +ndq +ndq asB asB asB avL awR -hRT +hiV azu aAz asB @@ -105574,7 +105566,7 @@ cgp chv ciJ cbf -lLI +diq clr bnt cOe @@ -105746,12 +105738,12 @@ aaa aaa aaa aaa -fzd -wXP -mCq -nXa -mCq -nyH +nsA +lGV +ndq +pou +ndq +srG asB atG auL @@ -106003,12 +105995,12 @@ aaa aaa aaa aaa -fzd -fzd -fzd -fzd -fzd -fzd +nsA +nsA +nsA +nsA +nsA +nsA asB atF auK @@ -106092,7 +106084,7 @@ cNW clt cQw cNW -abG +mJo cNW cNW aaf @@ -106294,9 +106286,9 @@ aXB aZh baB aCR -riB +kYk bdx -dfI +vHT bgc bgc biX @@ -106348,7 +106340,7 @@ aaa cOT clt cQw -aaO +oEZ cOe cOe cNW @@ -106605,18 +106597,18 @@ aaa cOT clt cQw -aaQ +ttL cOe cOe cNW aaa -jzi -jzi -jzi -jzi -jzi -jzi -jzi +fIs +fIs +fIs +fIs +fIs +fIs +fIs aaS aaS aba @@ -106866,7 +106858,7 @@ bNB cOe cOe cNW -lCL +ktS aaS aaa aaf @@ -107119,7 +107111,7 @@ cNW cNW clt cQw -aaY +cCt cOe cOe cNW @@ -107368,7 +107360,7 @@ cbZ bSl cmo cNW -vOq +lZl cNW chC ciL @@ -108668,17 +108660,17 @@ cpi cpi cpi cqJ -ggg +vZA crk crk crk crk crk -pFt +pTB cqJ -ggg +vZA crk -pFt +pTB cpi cpi ctB @@ -108934,7 +108926,7 @@ crF aaa aaa aaa -hik +vPs aaa aaa aaa @@ -109673,7 +109665,7 @@ cNW cNW cNW cNW -vFt +kAJ clt cac cbh @@ -109939,7 +109931,7 @@ cbf cbf ceT cNW -kCW +dBm chH cNW aaf From 3cd6cfb7d5c31fc1e5803931c0edf75ddcf70073 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:50:33 +0100 Subject: [PATCH 064/118] Update defibrillator_mount.dm --- code/game/machinery/defibrillator_mount.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index f3be6ac214..7107a0baea 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -120,7 +120,7 @@ /obj/machinery/defibrillator_mount/AltClick(mob/living/carbon/user) . = ..() - if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) + if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return . = TRUE if(!defib) @@ -129,9 +129,10 @@ if(clamps_locked) to_chat(user, "You try to tug out [defib], but the mount's clamps are locked tight!") return - if(!user.put_in_hands(defib)) + if(!user.get_empty_held_indexes) to_chat(user, "You need a free hand!") return + user.put_in_hands(defib) user.visible_message("[user] unhooks [defib] from [src].", \ "You slide out [defib] from [src] and unhook the charging cables.") playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) @@ -147,4 +148,4 @@ materials = list(MAT_METAL = 300, MAT_GLASS = 100) w_class = WEIGHT_CLASS_BULKY result_path = /obj/machinery/defibrillator_mount - pixel_shift = -28 \ No newline at end of file + pixel_shift = -28 From ee2ab7c9f0dfca8491e7b9c339911fe295ebd00d Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:51:55 +0100 Subject: [PATCH 065/118] Update defibrillator_mount.dm --- code/game/machinery/defibrillator_mount.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 7107a0baea..a1931e133a 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -129,7 +129,7 @@ if(clamps_locked) to_chat(user, "You try to tug out [defib], but the mount's clamps are locked tight!") return - if(!user.get_empty_held_indexes) + if(!user.get_empty_held_indexes()) to_chat(user, "You need a free hand!") return user.put_in_hands(defib) From fe717597da965a8fdc9b361a55001ecd79146fcb Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 4 Feb 2020 18:35:26 -0600 Subject: [PATCH 066/118] fuck fermichem --- code/modules/mob/living/carbon/life.dm | 4 +++- code/modules/reagents/reagent_containers/hypospray.dm | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 7d9b876876..534509523a 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -358,7 +358,7 @@ return // No decay if formaldehyde in corpse or when the corpse is charred - if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 15) || HAS_TRAIT(src, TRAIT_HUSK)) + if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || HAS_TRAIT(src, TRAIT_HUSK)) return // Also no decay if corpse chilled or not organic/undead @@ -397,6 +397,8 @@ if(O) O.on_life() else + if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1)) // No organ decay if the body contains formaldehyde. + return for(var/V in internal_organs) var/obj/item/organ/O = V if(O) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index f4bb5e0d08..8805d1366e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -85,17 +85,17 @@ /obj/item/reagent_containers/hypospray/medipen name = "epinephrine medipen" - desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." + desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Contains a powerful preservative that can delay decomposition when applied to a dead body." icon_state = "medipen" item_state = "medipen" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - amount_per_transfer_from_this = 10 - volume = 10 + amount_per_transfer_from_this = 13 + volume = 13 ignore_flags = 1 //so you can medipen through hardsuits reagent_flags = DRAWABLE flags_1 = null - list_reagents = list(/datum/reagent/medicine/epinephrine = 10) + list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/toxin/formaldehyde = 3) /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") From 385aea3d14870c4c37374bed1955797516476167 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 4 Feb 2020 18:50:09 -0600 Subject: [PATCH 067/118] rcd ammo to indeng, typo --- code/modules/research/designs/misc_designs.dm | 2 +- code/modules/research/techweb/all_nodes.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 0059e0c417..3867fa9f23 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -405,7 +405,7 @@ /datum/design/holosigncombifan name = "ATMOS Holo-Combifan Projector" - desc = "A holographic projector that creates holographic barriesr that prevent changes in atmospheric and temperature conditions." + desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions." id = "holosigncombifan" build_type = PROTOLATHE materials = list(MAT_METAL = 7500, MAT_GLASS = 2500, MAT_SILVER = 2500, MAT_GOLD = 2500, MAT_TITANIUM = 1750) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 15e88fc811..e1abfedde6 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -191,7 +191,7 @@ prereq_ids = list("base") design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", - "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine") + "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000) export_price = 5000 From 6efe0dc273442e423b72c06238f8b86382cd5cee Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 4 Feb 2020 18:55:19 -0600 Subject: [PATCH 068/118] haha what if i made everything interfacable --- code/modules/research/machinery/_production.dm | 2 +- .../research/machinery/departmental_circuit_imprinter.dm | 3 +-- code/modules/research/machinery/departmental_protolathe.dm | 3 +-- code/modules/research/machinery/techfab.dm | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 659a83c703..25e8b82cc4 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -2,7 +2,7 @@ name = "technology fabricator" desc = "Makes researched and prototype items with materials and energy." layer = BELOW_OBJ_LAYER - var/consoleless_interface = FALSE //Whether it can be used without a console. + var/consoleless_interface = TRUE //Whether it can be used without a console. var/efficiency_coeff = 1 //Materials needed / coeff = actual. var/list/categories = list() var/datum/component/remote_materials/materials diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm index 623c40462a..336803c011 100644 --- a/code/modules/research/machinery/departmental_circuit_imprinter.dm +++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm @@ -4,10 +4,9 @@ icon_state = "circuit_imprinter" circuit = /obj/item/circuitboard/machine/circuit_imprinter/department requires_console = FALSE - consoleless_interface = TRUE /obj/machinery/rnd/production/circuit_imprinter/department/science name = "department circuit imprinter (Science)" circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE - department_tag = "Science" \ No newline at end of file + department_tag = "Science" diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index 0f9257cbeb..afea8248f3 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -4,7 +4,6 @@ icon_state = "protolathe" circuit = /obj/item/circuitboard/machine/protolathe/department requires_console = FALSE - consoleless_interface = TRUE /obj/machinery/rnd/production/protolathe/department/engineering name = "department protolathe (Engineering)" @@ -40,4 +39,4 @@ name = "department protolathe (Security)" allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY department_tag = "Security" - circuit = /obj/item/circuitboard/machine/protolathe/department/security \ No newline at end of file + circuit = /obj/item/circuitboard/machine/protolathe/department/security diff --git a/code/modules/research/machinery/techfab.dm b/code/modules/research/machinery/techfab.dm index 885f27c2cb..f93560ed10 100644 --- a/code/modules/research/machinery/techfab.dm +++ b/code/modules/research/machinery/techfab.dm @@ -31,5 +31,4 @@ console_link = FALSE production_animation = "protolathe_n" requires_console = FALSE - consoleless_interface = TRUE allowed_buildtypes = PROTOLATHE | IMPRINTER From fb2498781cdaa59c6bb3859dbf129e2f69ec8f3e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 4 Feb 2020 20:29:50 -0500 Subject: [PATCH 069/118] Update carp.dm --- .../mob/living/simple_animal/hostile/carp.dm | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 17d8b2dff0..d990362088 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -21,7 +21,9 @@ health = 35 spacewalk = TRUE - var/regen_cooldown = 0 //Used for Mega carp and Cayenne + var/regen = FALSE //Can it heal over time or not? + var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds + var/heal_amout = 0 //How much is healed pre regen cooldown harm_intent_damage = 8 obj_damage = 50 @@ -31,6 +33,20 @@ attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("gnashes") + //Some carps heal over time + +/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(regen != TRUE) + return + else + regen_cooldown = world.time + REGENERATION_DELAY + +/mob/living/simple_animal/hostile/carp/Life() + . = ..() + if(regen_cooldown < world.time) + heal_overall_damage(heal_amout) + //Space carp aren't affected by cold. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 @@ -61,6 +77,10 @@ icon_living = "megacarp" icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" + + heal_amout = 6 + regen = TRUE + maxHealth = 30 health = 30 pixel_x = -16 @@ -78,25 +98,19 @@ maxHealth += rand(40,60) move_to_delay = rand(3,7) -/mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(.) - regen_cooldown = world.time + REGENERATION_DELAY - -/mob/living/simple_animal/hostile/carp/megacarp/Life() - . = ..() - if(regen_cooldown < world.time) - heal_overall_damage(4) - /mob/living/simple_animal/hostile/carp/cayenne name = "Cayenne" desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE + + regen = TRUE + heal_amout = 8 + speak_emote = list("squeaks") maxHealth = 90 health = 90 gold_core_spawnable = NO_SPAWN - faction = list(ROLE_SYNDICATE) + faction = list(ROLE_SYNDICATE, "carp") //They are still a carp AIStatus = AI_OFF harm_intent_damage = 12 @@ -104,14 +118,4 @@ melee_damage_lower = 15 melee_damage_upper = 18 -/mob/living/simple_animal/hostile/carp/cayenne/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(.) - regen_cooldown = world.time + REGENERATION_DELAY - -/mob/living/simple_animal/hostile/carp/cayenne/Life() - . = ..() - if(regen_cooldown < world.time) - heal_overall_damage(8) - #undef REGENERATION_DELAY From 4ecbd1e407da1a1d4a4ab72168120840f2069fa1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:00:33 -0500 Subject: [PATCH 070/118] Update carp.dm --- code/modules/mob/living/simple_animal/hostile/carp.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index d990362088..fbe46f9665 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -37,14 +37,12 @@ /mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() - if(regen != TRUE) - return - else + if(regen) regen_cooldown = world.time + REGENERATION_DELAY /mob/living/simple_animal/hostile/carp/Life() . = ..() - if(regen_cooldown < world.time) + if(regen && regen_cooldown < world.time) heal_overall_damage(heal_amout) //Space carp aren't affected by cold. From bad4b5cb56b0fb8b55b44c06731e3b236083b435 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Tue, 4 Feb 2020 22:13:03 -0600 Subject: [PATCH 071/118] huskies --- code/__DEFINES/reagents.dm | 2 ++ code/modules/mob/living/carbon/carbon.dm | 4 ++-- .../reagents/chemistry/reagents/medicine_reagents.dm | 12 ++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 54f4648006..d08344cc96 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -40,6 +40,8 @@ #define ADD_REAGENT 2 // reagent added #define REM_REAGENT 3 // reagent removed (may still exist) +#define THRESHOLD_UNHUSK 50 // health threshold for synthflesh/rezadone to unhusk someone + //reagent bitflags, used for altering how they works #define REAGENT_DEAD_PROCESS (1<<0) //calls on_mob_dead() if present in a dead body #define REAGENT_DONOTSPLIT (1<<1) //Do not split the chem at all during processing diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 113588facf..ef33afec25 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -559,7 +559,7 @@ health = round(maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute, DAMAGE_PRECISION) staminaloss = round(total_stamina, DAMAGE_PRECISION) update_stat() - if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD ) + if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD*2) && stat == DEAD ) become_husk("burn") med_hud_set_health() if(stat == SOFT_CRIT) @@ -986,4 +986,4 @@ if(H.clothing_flags & SCAN_REAGENTS) return TRUE if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS)) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index d8fc47d1b8..e8913f9ce4 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -216,6 +216,14 @@ ..() . = 1 +/datum/reagent/medicine/rezadone/reaction_mob(mob/living/M, method=TOUCH, reac_volume) + . = ..() + if(iscarbon(M)) + var/mob/living/carbon/patient = M + if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < THRESHOLD_UNHUSK) //One carp yields 12u rezadone. + patient.cure_husk("burn") + patient.visible_message("[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance.") + /datum/reagent/medicine/spaceacillin name = "Spaceacillin" description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with." @@ -436,6 +444,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M) if(show_message) to_chat(M, "You feel your burns and bruises healing! It stings like hell!") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) + //Has to be at less than THRESHOLD_UNHUSK burn damage and have 100 synthflesh before unhusking. Corpses dont metabolize. + if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && M.getFireLoss() < THRESHOLD_UNHUSK && M.reagents.has_reagent(/datum/reagent/medicine/synthflesh, 100)) + M.cure_husk("burn") + M.visible_message("Most of [M]'s burnt off or charred flesh has been restored.") ..() /datum/reagent/medicine/synthflesh/overdose_start(mob/living/M) From aaa58ef1e8d433c3d1b003c1697d6082b4ee1bc7 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 05:13:36 +0100 Subject: [PATCH 072/118] Update Mining_Station_Public_01.dmm --- .../Lavaland/Mining_Station/Mining_Station_Public_01.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index 75c0434771..94a4f95f71 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -674,6 +674,7 @@ /area/mine/production) "mp" = ( /obj/docking_port/stationary{ + area_type = /area/lavaland/surface/outdoors; dir = 8; dwidth = 2; height = 5; @@ -1897,6 +1898,7 @@ /area/mine/laborcamp) "Hk" = ( /obj/docking_port/stationary{ + area_type = /area/lavaland/surface/outdoors; dir = 8; dwidth = 3; height = 7; @@ -2286,6 +2288,7 @@ /area/mine/living_quarters) "Lb" = ( /obj/docking_port/stationary{ + area_type = /area/lavaland/surface/outdoors; dir = 8; dwidth = 3; height = 10; From 57ac5c3d66f1a97e145e58505db58afadccd89da Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 06:12:57 +0100 Subject: [PATCH 073/118] Update carp.dm --- .../mob/living/simple_animal/hostile/carp.dm | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index fbe46f9665..440dd38f0c 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -20,11 +20,6 @@ maxHealth = 35 health = 35 spacewalk = TRUE - - var/regen = FALSE //Can it heal over time or not? - var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds - var/heal_amout = 0 //How much is healed pre regen cooldown - harm_intent_damage = 8 obj_damage = 50 melee_damage_lower = 15 @@ -32,19 +27,6 @@ attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("gnashes") - - //Some carps heal over time - -/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(regen) - regen_cooldown = world.time + REGENERATION_DELAY - -/mob/living/simple_animal/hostile/carp/Life() - . = ..() - if(regen && regen_cooldown < world.time) - heal_overall_damage(heal_amout) - //Space carp aren't affected by cold. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 @@ -53,6 +35,19 @@ movement_type = FLYING pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN + //some carps heal over time + var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds + var/regen_amount = 0 //How much is healed pre regen cooldown + +/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(regen_amount) + regen_cooldown = world.time + REGENERATION_DELAY + +/mob/living/simple_animal/hostile/carp/Life() + . = ..() + if(regen_amount && regen_cooldown < world.time) + heal_overall_damage(regen_amount) /mob/living/simple_animal/hostile/carp/AttackingTarget() . = ..() @@ -76,8 +71,7 @@ icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" - heal_amout = 6 - regen = TRUE + regen_amount = 6 maxHealth = 30 health = 30 @@ -101,8 +95,7 @@ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE - regen = TRUE - heal_amout = 8 + regen_amout = 8 speak_emote = list("squeaks") maxHealth = 90 From 6159c197bb8cdbc1f17b0dbc15c3021fc1f85113 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 06:30:50 +0100 Subject: [PATCH 074/118] Update persistence.dm --- code/controllers/subsystem/persistence.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 2825f4343b..4cd75c9af3 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -265,7 +265,8 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/persistence/proc/LoadPanicBunker() var/bunker_path = file("data/bunker_passthrough.json") if(fexists(bunker_path)) - GLOB.bunker_passthrough = json_decode(file2text(bunker_path)) + var/list/json = json_decode(file2text(bunker_path)) + GLOB.bunker_passthrough = json["data"] for(var/ckey in GLOB.bunker_passthrough) if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days)) GLOB.bunker_passthrough -= ckey From 1547f99ddb33a596547ca8254ba1bd9b56e6a99a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Feb 2020 00:59:16 -0500 Subject: [PATCH 075/118] Update carp.dm --- code/modules/mob/living/simple_animal/hostile/carp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 440dd38f0c..d527a40120 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -95,7 +95,7 @@ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE - regen_amout = 8 + regen_amount = 8 speak_emote = list("squeaks") maxHealth = 90 From 3539fa7603bd0d91285408e930acbd4666396f28 Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Wed, 5 Feb 2020 00:31:54 -0600 Subject: [PATCH 076/118] Stunbaton PR had bad math didn't properly reduce effectiveness oops. --- code/game/objects/items/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index c4457ea991..45313dc9b0 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -189,7 +189,7 @@ L.Knockdown(stunpwr, override_stamdmg = 0) - L.apply_damage(stunpwr*0.55, STAMINA, user.zone_selected) + L.apply_damage(stunpwr*0.5, STAMINA, user.zone_selected) L.apply_effect(EFFECT_STUTTER, stunforce) SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK) if(user) From a45038d214a2e20f0da95ee0cb56fc32ba711b45 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 5 Feb 2020 03:31:55 -0700 Subject: [PATCH 077/118] Update pockets.dm --- code/datums/components/storage/concrete/pockets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 9c8622d16e..4d3ecc8d17 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -56,7 +56,7 @@ /obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper, /obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini, - /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol + /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol )) /datum/component/storage/concrete/pockets/shoes/clown/Initialize() From 8b5e3e6004708e908da17bd713d3f13f295e0480 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 5 Feb 2020 14:55:47 +0100 Subject: [PATCH 078/118] Removes the shitty verb --- .../reagents/reagent_containers/hypospray.dm | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index f4bb5e0d08..da99cd184b 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -423,18 +423,19 @@ else unload_hypo(vial,user) -/obj/item/hypospray/mkii/verb/modes() - set name = "Toggle Application Mode" - set category = "Object" - set src in usr - var/mob/M = usr - switch(mode) - if(HYPO_SPRAY) - mode = HYPO_INJECT - to_chat(M, "[src] is now set to inject contents on application.") - if(HYPO_INJECT) - mode = HYPO_SPRAY - to_chat(M, "[src] is now set to spray contents on application.") +/obj/item/hypospray/mkii/AltClick(mob/living/user) + if(user.canUseTopic(src, BE_CLOSE, FALSE,)) + switch(mode) + if(HYPO_SPRAY) + mode = HYPO_INJECT + to_chat(user, "[src] is now set to inject contents on application.") + if(HYPO_INJECT) + mode = HYPO_SPRAY + to_chat(user, "[src] is now set to spray contents on application.") + +/obj/item/hypospray/mkii/examine(mob/user) + . = ..() + . += "You can click on it while holding Alt to toggle its mode from spraying to injecting." #undef HYPO_SPRAY #undef HYPO_INJECT From 192bae76fdc98926acea2c88631f1e81a8dd4509 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 5 Feb 2020 11:32:21 -0600 Subject: [PATCH 079/118] Automatic changelog generation for PR #10894 [ci skip] --- html/changelogs/AutoChangeLog-pr-10894.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10894.yml diff --git a/html/changelogs/AutoChangeLog-pr-10894.yml b/html/changelogs/AutoChangeLog-pr-10894.yml new file mode 100644 index 0000000000..770308755d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10894.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "Carps have evolved to take more damage" From 7e2ad2b71fbc94b8231fe5b32cd347c6df4eed1c Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 18:45:15 +0100 Subject: [PATCH 080/118] Fixing accidental nerfs to the magpistol. --- code/datums/components/storage/concrete/pockets.dm | 2 +- code/modules/projectiles/boxes_magazines/external/magweapon.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 9c8622d16e..4d3ecc8d17 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -56,7 +56,7 @@ /obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper, /obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini, - /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol + /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol )) /datum/component/storage/concrete/pockets/shoes/clown/Initialize() diff --git a/code/modules/projectiles/boxes_magazines/external/magweapon.dm b/code/modules/projectiles/boxes_magazines/external/magweapon.dm index fa90170ace..a1b7f58698 100644 --- a/code/modules/projectiles/boxes_magazines/external/magweapon.dm +++ b/code/modules/projectiles/boxes_magazines/external/magweapon.dm @@ -13,7 +13,7 @@ name = "magpistol magazine (non-lethal disabler)" icon_state = "smallmagmag" ammo_type = /obj/item/ammo_casing/caseless/magnetic/weak/disabler - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/magazine/mmag/small/lethal name = "magpistol magazine (lethal)" From aef2251400b11d39c24f3063174f1c1f2b867074 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 5 Feb 2020 12:22:39 -0600 Subject: [PATCH 081/118] Automatic changelog generation for PR #10915 [ci skip] --- html/changelogs/AutoChangeLog-pr-10915.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10915.yml diff --git a/html/changelogs/AutoChangeLog-pr-10915.yml b/html/changelogs/AutoChangeLog-pr-10915.yml new file mode 100644 index 0000000000..88f0c1652e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10915.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - balance: "shoes can now fit magpistols again." From be3694d858398e7e062fb1e6ec5a5f558ba0a03e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 5 Feb 2020 12:26:43 -0600 Subject: [PATCH 082/118] Automatic changelog generation for PR #10903 [ci skip] --- html/changelogs/AutoChangeLog-pr-10903.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10903.yml diff --git a/html/changelogs/AutoChangeLog-pr-10903.yml b/html/changelogs/AutoChangeLog-pr-10903.yml new file mode 100644 index 0000000000..a353d6594a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10903.yml @@ -0,0 +1,5 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscadd: "Formaldehyde prevents organ decay and corpses' miasma production at 1u in the body." + - rscadd: "Epinephrine pens now contain 3u formaldehyde. This should not kill you." From 9951f291fd0f9a0359886a851d00abc079036693 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 5 Feb 2020 20:14:35 +0100 Subject: [PATCH 083/118] Reviewer suggestions --- code/modules/reagents/reagent_containers/hypospray.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index da99cd184b..d459206c99 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -424,7 +424,7 @@ unload_hypo(vial,user) /obj/item/hypospray/mkii/AltClick(mob/living/user) - if(user.canUseTopic(src, BE_CLOSE, FALSE,)) + if(user.canUseTopic(src, FALSE)) switch(mode) if(HYPO_SPRAY) mode = HYPO_INJECT @@ -432,10 +432,11 @@ if(HYPO_INJECT) mode = HYPO_SPRAY to_chat(user, "[src] is now set to spray contents on application.") + return TRUE /obj/item/hypospray/mkii/examine(mob/user) . = ..() - . += "You can click on it while holding Alt to toggle its mode from spraying to injecting." + . += "Alt-Click it to toggle its mode from spraying to injecting and vice versa." #undef HYPO_SPRAY #undef HYPO_INJECT From 560228901380f2a238df380a11f15428385305f9 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 5 Feb 2020 20:25:04 +0100 Subject: [PATCH 084/118] Parent call Failed to get in the previous commit for some reason. --- code/modules/reagents/reagent_containers/hypospray.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index d459206c99..034f52bd2c 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -424,6 +424,7 @@ unload_hypo(vial,user) /obj/item/hypospray/mkii/AltClick(mob/living/user) + ..() if(user.canUseTopic(src, FALSE)) switch(mode) if(HYPO_SPRAY) From c2b68d0ba339156805f58dc5514a2cbb5b25c9d0 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 5 Feb 2020 20:35:24 +0100 Subject: [PATCH 085/118] Adds debbuging --- code/__DEFINES/spaceman_dmm.dm | 5 +++++ code/game/world.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/__DEFINES/spaceman_dmm.dm b/code/__DEFINES/spaceman_dmm.dm index e590a30ff9..8f7f9c5bf7 100644 --- a/code/__DEFINES/spaceman_dmm.dm +++ b/code/__DEFINES/spaceman_dmm.dm @@ -11,3 +11,8 @@ #define SHOULD_CALL_PARENT(X) #define UNLINT(X) X #endif + +/world/proc/enable_debugger() + var/dll = world.GetConfig("env", "EXTOOLS_DLL") + if(dll) + call(dll, "debug_initialize")() diff --git a/code/game/world.dm b/code/game/world.dm index 8e18f2ea51..6b380e0f94 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -8,6 +8,7 @@ GLOBAL_LIST(topic_status_cache) //This happens after the Master subsystem new(s) (it's a global datum) //So subsystems globals exist, but are not initialised /world/New() + enable_debugger() log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!") From 3b30990e22c70183267650cc0897eb17fd0b1333 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 5 Feb 2020 13:47:58 -0600 Subject: [PATCH 086/118] Automatic changelog generation for PR #10898 [ci skip] --- html/changelogs/AutoChangeLog-pr-10898.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10898.yml diff --git a/html/changelogs/AutoChangeLog-pr-10898.yml b/html/changelogs/AutoChangeLog-pr-10898.yml new file mode 100644 index 0000000000..7c7198105f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10898.yml @@ -0,0 +1,5 @@ +author: "EmeraldSundisk" +delete-after: True +changes: + - bugfix: "Connects mining's disposal unit on Delta." + - tweak: "Slight visual adjustments to the immediate affected area." From 01d8086ebd5bae0ce853460d4160c42cba9f9b50 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 21:12:15 +0100 Subject: [PATCH 087/118] Lavaland's Herald speech fix. --- .../simple_animal/hostile/mining_mobs/elites/herald.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index f1e7494beb..0d62eb260d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -62,8 +62,9 @@ /mob/living/simple_animal/hostile/asteroid/elite/herald/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) . = ..() - playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - + if(.) + playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) + /datum/action/innate/elite_attack/herald_trishot name = "Triple Shot" button_icon_state = "herald_trishot" From 98c721fffc868910e173bcb0e0794e908a61ce89 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 5 Feb 2020 13:29:31 -0700 Subject: [PATCH 088/118] Update cart.dm --- code/game/objects/items/devices/PDA/cart.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index b186c29539..4f4a6fc4e8 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -100,7 +100,8 @@ bot_access_flags = CLEAN_BOT /obj/item/cartridge/lawyer - name = "\improper P.R.O.V.E. cartridge" + name = "\improper S.P.A.M. cartridge" + desc = "Introducing the Station Public Announcement Messenger cartridge, featuring the unique ability to broadcast-mark messages, designed for lawyers across Nanotrasen to advertise their useful and important services." icon_state = "cart-law" access = CART_SECURITY spam_enabled = 1 From 78339881de6e3faf4acafb3cbcdce6d8c858d04d Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 5 Feb 2020 21:37:36 +0100 Subject: [PATCH 089/118] Wierd ass formatting causing tabs to betray me --- code/__DEFINES/spaceman_dmm.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/spaceman_dmm.dm b/code/__DEFINES/spaceman_dmm.dm index 8f7f9c5bf7..b9c0544bc1 100644 --- a/code/__DEFINES/spaceman_dmm.dm +++ b/code/__DEFINES/spaceman_dmm.dm @@ -14,5 +14,5 @@ /world/proc/enable_debugger() var/dll = world.GetConfig("env", "EXTOOLS_DLL") - if(dll) - call(dll, "debug_initialize")() + if (dll) + call(dll, "debug_initialize")() From 23834ce3f5811f15fc5325593440f996e956dea5 Mon Sep 17 00:00:00 2001 From: Arturlang Date: Wed, 5 Feb 2020 22:54:01 +0200 Subject: [PATCH 090/118] Parent call Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 034f52bd2c..02c8798329 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -424,7 +424,7 @@ unload_hypo(vial,user) /obj/item/hypospray/mkii/AltClick(mob/living/user) - ..() + . = ..() if(user.canUseTopic(src, FALSE)) switch(mode) if(HYPO_SPRAY) From 3a1a40ebd249ec316d378f519e9639b8fcece195 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 23:41:52 +0100 Subject: [PATCH 091/118] Update read_from_file.dm --- .../code/modules/custom_loadout/read_from_file.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modular_citadel/code/modules/custom_loadout/read_from_file.dm b/modular_citadel/code/modules/custom_loadout/read_from_file.dm index 78124b0324..004757add4 100644 --- a/modular_citadel/code/modules/custom_loadout/read_from_file.dm +++ b/modular_citadel/code/modules/custom_loadout/read_from_file.dm @@ -18,13 +18,13 @@ GLOBAL_LIST(custom_item_list) if(copytext(line,1,3) == "//") //Commented line, ignore. 3 == length("//") + 1 continue var/ckey_str_sep = findtext(line, "|") //Process our stuff.. - var/char_str_sep = findtext(line, "|", ckey_str_sep + length(ckey_str_sep)) - var/job_str_sep = findtext(line, "|", char_str_sep + length(char_str_sep)) - var/item_str_sep = findtext(line, "|", job_str_sep + length(job_str_sep)) + var/char_str_sep = findtext(line, "|", ckey_str_sep + length(line[ckey_str_sep])) + var/job_str_sep = findtext(line, "|", char_str_sep + length(line[char_str_sep])) + var/item_str_sep = findtext(line, "|", job_str_sep + length(line[job_str_sep])) var/ckey_str = ckey(copytext(line, 1, ckey_str_sep)) - var/char_str = copytext(line, ckey_str_sep + length(ckey_str_sep), char_str_sep) - var/job_str = copytext(line, char_str_sep + length(char_str_sep), job_str_sep) - var/item_str = copytext(line, job_str_sep + length(job_str_sep), item_str_sep) + var/char_str = copytext(line, ckey_str_sep + length(line[ckey_str_sep]), char_str_sep) + var/job_str = copytext(line, char_str_sep + length(line[char_str_sep]), job_str_sep) + var/item_str = copytext(line, job_str_sep + length(line[job_str_sep]), item_str_sep) if(!ckey_str || !char_str || !job_str || !item_str || !length(ckey_str) || !length(char_str) || !length(job_str) || !length(item_str)) log_admin("Errored custom_items_whitelist line: [line] - Component/separator missing!") if(!islist(GLOB.custom_item_list[ckey_str])) @@ -42,7 +42,7 @@ GLOBAL_LIST(custom_item_list) for(var/item_string in item_strings) var/path_str_sep = findtext(item_string, "=") var/path = copytext(item_string, 1, path_str_sep) //Path to spawn - var/amount = copytext(item_string, path_str_sep + length(path_str_sep)) //Amount to spawn + var/amount = copytext(item_string, path_str_sep + length(item_string[path_str_sep])) //Amount to spawn //world << "DEBUG: Item string [item_string] processed" amount = text2num(amount) path = text2path(path) From 523e080f8745f79b7f38c190e6dee440c58e91de Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Thu, 6 Feb 2020 02:09:27 +0100 Subject: [PATCH 092/118] Double-esword and hypereuplastic blade toys are sharp now blunt. --- code/game/objects/items/toys.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8f5a6e8e0b..461d718131 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -453,6 +453,7 @@ force_wielded = 0 attack_verb = list("attacked", "struck", "hit") total_mass_on = TOTAL_MASS_TOY_SWORD + sharpness = IS_BLUNT /obj/item/twohanded/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return FALSE From 8131a60f3a9269463cdd1baada2e232d4a0eabc1 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Thu, 6 Feb 2020 02:10:03 +0100 Subject: [PATCH 093/118] Oh. --- code/game/objects/items/toys.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 461d718131..6782ba0098 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -473,6 +473,7 @@ attack_verb = list("attacked", "struck", "hit") total_mass_on = TOTAL_MASS_TOY_SWORD slowdown_wielded = 0 + sharpness = IS_BLUNT /obj/item/twohanded/dualsaber/hypereutactic/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return FALSE From f100b6c5e48a237daf885c3ea62bbbb99cafcfdd Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 5 Feb 2020 19:47:20 -0600 Subject: [PATCH 094/118] multitools in basic tools, dumb headers --- .../autolathe_desings/autolathe_designs_construction.dm | 8 ++++---- .../designs/autolathe_desings/autolathe_designs_tools.dm | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm index c3e3993cb2..bfc92d24d8 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm @@ -1,11 +1,11 @@ /////////////////////////////////// -//////////Autolathe Designs /////// +//////////Autolathe Designs//////// /////////////////////////////////// -//////////////// -///Construction// -//////////////// +////////////////// +///Construction/// +////////////////// /datum/design/rods name = "Metal Rod" diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm index c413f546f0..6affacf1b1 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm @@ -1,8 +1,8 @@ /////////////////////////////////// -//////////Autolathe Designs /////// +/////////Autolathe Designs///////// /////////////////////////////////// /////////// -///Tools // +///Tools/// /////////// /datum/design/bucket name = "Bucket" @@ -52,7 +52,8 @@ build_type = AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/multitool - category = list("initial","Tools") + category = list("initial","Tools","Tool Designs") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/analyzer name = "Analyzer" From 181944bb36b64b710ba1c864149c6446503ac6d6 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 6 Feb 2020 03:07:42 +0100 Subject: [PATCH 095/118] Update admin_ranks.dm --- code/modules/admin/admin_ranks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 8856982cf2..b5127929a7 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -138,15 +138,15 @@ GLOBAL_PROTECT(protected_ranks) if(!line || findtextEx_char(line,"#",1,2)) continue var/next = findtext(line, "=") - var/datum/admin_rank/R = new(ckeyEx(copytext(line, 1, line[next]))) + var/datum/admin_rank/R = new(ckeyEx(copytext(line, 1, next))) if(!R) continue GLOB.admin_ranks += R GLOB.protected_ranks += R var/prev = findchar(line, "+-*", next, 0) while(prev) - next = findchar(line, "+-*", prev + 1, 0) - R.process_keyword(copytext_char(line, prev, next), previous_rights) + next = findchar(line, "+-*", prev + length(line[prev]), 0) + R.process_keyword(copytext(line, prev, next), previous_rights) prev = next previous_rights = R.rights if(!CONFIG_GET(flag/admin_legacy_system) || dbfail) From f6d0c177be076adc3fe2f4aa90efea066bb39e31 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:43:25 -0600 Subject: [PATCH 096/118] Automatic changelog generation for PR #10907 [ci skip] --- html/changelogs/AutoChangeLog-pr-10907.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10907.yml diff --git a/html/changelogs/AutoChangeLog-pr-10907.yml b/html/changelogs/AutoChangeLog-pr-10907.yml new file mode 100644 index 0000000000..af893e9415 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10907.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed no-grav lavaland labor/mining shuttle areas." From 1c4fb05a988c8c7b93466df0c0743ec4102499a4 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:43:56 -0600 Subject: [PATCH 097/118] Automatic changelog generation for PR #10905 [ci skip] --- html/changelogs/AutoChangeLog-pr-10905.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10905.yml diff --git a/html/changelogs/AutoChangeLog-pr-10905.yml b/html/changelogs/AutoChangeLog-pr-10905.yml new file mode 100644 index 0000000000..de9374bd12 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10905.yml @@ -0,0 +1,6 @@ +author: "Hatterhat" +delete-after: True +changes: + - tweak: "Standard RCD ammo can now be printed from Engineering-keyed techfabs once you hit Industrial Engineering." + - tweak: "Consoleless interfaces are now default - this means unrestricted protolathes and circuit imprinters can now be interfaced with by interacting with the machine itself." + - bugfix: "Multitools can now actually be printed from Engineering and Science protolathes/techfabs once you unlock Basic Tools." From cbf1497996d9619e6df068a67a98dfd199c14c34 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:44:11 -0600 Subject: [PATCH 098/118] Automatic changelog generation for PR #10900 [ci skip] --- html/changelogs/AutoChangeLog-pr-10900.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10900.yml diff --git a/html/changelogs/AutoChangeLog-pr-10900.yml b/html/changelogs/AutoChangeLog-pr-10900.yml new file mode 100644 index 0000000000..0f79245c73 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10900.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Atmos reaction priority works now." From 0263502a05e3e588bd1481e40534edf34bc094d5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:44:33 -0600 Subject: [PATCH 099/118] Automatic changelog generation for PR #10899 [ci skip] --- html/changelogs/AutoChangeLog-pr-10899.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10899.yml diff --git a/html/changelogs/AutoChangeLog-pr-10899.yml b/html/changelogs/AutoChangeLog-pr-10899.yml new file mode 100644 index 0000000000..f1542b2b09 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10899.yml @@ -0,0 +1,6 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "restock crates for each vender" + - rscadd: "restock units for all station venders" + - bugfix: "Sec-vender missing icon" From 984af3cc9a52382ed54e5e501eca52796ade5245 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:45:33 -0600 Subject: [PATCH 100/118] Automatic changelog generation for PR #10885 [ci skip] --- html/changelogs/AutoChangeLog-pr-10885.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10885.yml diff --git a/html/changelogs/AutoChangeLog-pr-10885.yml b/html/changelogs/AutoChangeLog-pr-10885.yml new file mode 100644 index 0000000000..bcc19eb9d2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10885.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Milkies fix." From 109b15ebdde758cab20b849fa6c23dbe433530ab Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:45:49 -0600 Subject: [PATCH 101/118] Automatic changelog generation for PR #10902 [ci skip] --- html/changelogs/AutoChangeLog-pr-10902.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10902.yml diff --git a/html/changelogs/AutoChangeLog-pr-10902.yml b/html/changelogs/AutoChangeLog-pr-10902.yml new file mode 100644 index 0000000000..9a60860f3f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10902.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed some mounted defibrillator issue with the altclicking functionality." From 3a47e49cb336ac5a8f496b815a4000a31d593bc6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 00:46:07 -0600 Subject: [PATCH 102/118] Automatic changelog generation for PR #10883 [ci skip] --- html/changelogs/AutoChangeLog-pr-10883.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10883.yml diff --git a/html/changelogs/AutoChangeLog-pr-10883.yml b/html/changelogs/AutoChangeLog-pr-10883.yml new file mode 100644 index 0000000000..f99613d846 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10883.yml @@ -0,0 +1,4 @@ +author: "ancientpower" +delete-after: True +changes: + - tweak: "Ghosts are now literate." From 1dd6514bd7aa5a30f339ec8039657efc4c7a3242 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 01:37:03 -0600 Subject: [PATCH 103/118] Automatic changelog generation for PR #10919 [ci skip] --- html/changelogs/AutoChangeLog-pr-10919.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10919.yml diff --git a/html/changelogs/AutoChangeLog-pr-10919.yml b/html/changelogs/AutoChangeLog-pr-10919.yml new file mode 100644 index 0000000000..0fa6420e39 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10919.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixing accidental nerfs to the magpistol magazine." From b3fb11559ef0ef485581ac8227d1fe138c71e696 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 01:38:34 -0600 Subject: [PATCH 104/118] Automatic changelog generation for PR #10700 [ci skip] --- html/changelogs/AutoChangeLog-pr-10700.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10700.yml diff --git a/html/changelogs/AutoChangeLog-pr-10700.yml b/html/changelogs/AutoChangeLog-pr-10700.yml new file mode 100644 index 0000000000..296ebe4d99 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10700.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - tweak: "The anomalous honking crystal should now properly clown your mind." From 1c82779846a3dd77dfd3eb51690f23cc3768daa2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 01:41:32 -0600 Subject: [PATCH 105/118] Automatic changelog generation for PR #10881 [ci skip] --- html/changelogs/AutoChangeLog-pr-10881.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10881.yml diff --git a/html/changelogs/AutoChangeLog-pr-10881.yml b/html/changelogs/AutoChangeLog-pr-10881.yml new file mode 100644 index 0000000000..7c00713eae --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10881.yml @@ -0,0 +1,6 @@ +author: "Ghommie" +delete-after: True +changes: + - refactor: "Refactored mob holders into an element." + - bugfix: "Fixed a few minor issues with that feature. such as mismatching sprites for certain held mobs and a slight lack of safety checks." + - rscdel: "holdable mobs can't force themselves into people's hands anymore." From c54786e3bb7079d14b7a32b17fc3861ffcda179f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 01:42:08 -0600 Subject: [PATCH 106/118] Automatic changelog generation for PR #10906 [ci skip] --- html/changelogs/AutoChangeLog-pr-10906.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10906.yml diff --git a/html/changelogs/AutoChangeLog-pr-10906.yml b/html/changelogs/AutoChangeLog-pr-10906.yml new file mode 100644 index 0000000000..ef725e921e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10906.yml @@ -0,0 +1,5 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscadd: "Husking (from being burned to shit) can now be reverted! 5u rezadone or 100u synthflesh, at below 50 burn." + - balance: "Turning a body into a burnt husk now takes more effort. 300 burn's worth of effort." From e77c8bef98f5e4cfa3e967df53e3a11d0252e083 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 01:42:42 -0600 Subject: [PATCH 107/118] Automatic changelog generation for PR #10868 [ci skip] --- html/changelogs/AutoChangeLog-pr-10868.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10868.yml diff --git a/html/changelogs/AutoChangeLog-pr-10868.yml b/html/changelogs/AutoChangeLog-pr-10868.yml new file mode 100644 index 0000000000..629f93585a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10868.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - tweak: "Holographic fans won't display above mobs and other objects anymore." From 365b41022ee3fe11ff0ca730135d80c342f3831f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 01:43:49 -0600 Subject: [PATCH 108/118] Automatic changelog generation for PR #10870 [ci skip] --- html/changelogs/AutoChangeLog-pr-10870.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10870.yml diff --git a/html/changelogs/AutoChangeLog-pr-10870.yml b/html/changelogs/AutoChangeLog-pr-10870.yml new file mode 100644 index 0000000000..672e6abdbc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10870.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed paraplegics appearing as shoeless." From 90bdc0c3e8929956fb0b9d1107bf1c5a908aa1c8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 04:47:32 -0600 Subject: [PATCH 109/118] Automatic changelog generation for PR #10901 [ci skip] --- html/changelogs/AutoChangeLog-pr-10901.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10901.yml diff --git a/html/changelogs/AutoChangeLog-pr-10901.yml b/html/changelogs/AutoChangeLog-pr-10901.yml new file mode 100644 index 0000000000..57c1d821f7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10901.yml @@ -0,0 +1,5 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - bugfix: "Box station captain office issues +maping: Gulag on box can now be accessed" From 0353f1602d7fa421b6bb034b66201a715189d54a Mon Sep 17 00:00:00 2001 From: Arturlang Date: Thu, 6 Feb 2020 20:10:02 +0100 Subject: [PATCH 110/118] Fixes ore boxes --- code/game/objects/structures.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 9246a00399..1d36b2b41b 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -37,7 +37,7 @@ structureclimber.visible_message("[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].") /obj/structure/ui_act(action, params) - ..() + . = ..() add_fingerprint(usr) /obj/structure/MouseDrop_T(atom/movable/O, mob/user) From 6373b263c02c2874483677b6f70e382874f65624 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 13:31:49 -0600 Subject: [PATCH 111/118] Automatic changelog generation for PR #10917 [ci skip] --- html/changelogs/AutoChangeLog-pr-10917.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10917.yml diff --git a/html/changelogs/AutoChangeLog-pr-10917.yml b/html/changelogs/AutoChangeLog-pr-10917.yml new file mode 100644 index 0000000000..f6e5997348 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10917.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - tweak: "The MK2 hypospray now" From 5123c6b45576ffd227cc539b0216dde0f9026e7b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 17:25:25 -0600 Subject: [PATCH 112/118] Automatic changelog generation for PR #10623 [ci skip] --- html/changelogs/AutoChangeLog-pr-10623.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10623.yml diff --git a/html/changelogs/AutoChangeLog-pr-10623.yml b/html/changelogs/AutoChangeLog-pr-10623.yml new file mode 100644 index 0000000000..623560f7d2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10623.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "Lots of new traitor objectives" From 76683f572f598eff0011216fbc767cf521bef69b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Feb 2020 22:53:11 -0600 Subject: [PATCH 113/118] Automatic changelog generation for PR #10922 [ci skip] --- html/changelogs/AutoChangeLog-pr-10922.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10922.yml diff --git a/html/changelogs/AutoChangeLog-pr-10922.yml b/html/changelogs/AutoChangeLog-pr-10922.yml new file mode 100644 index 0000000000..c71630fd0d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10922.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - tweak: "The lawyer's PDA cartridge has been rebranded to something more accurate to its true nature." From 3b3be0a56725632a6410fa1592161eecce25f61f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 7 Feb 2020 00:51:20 -0600 Subject: [PATCH 114/118] Automatic changelog generation for PR #10929 [ci skip] --- html/changelogs/AutoChangeLog-pr-10929.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10929.yml diff --git a/html/changelogs/AutoChangeLog-pr-10929.yml b/html/changelogs/AutoChangeLog-pr-10929.yml new file mode 100644 index 0000000000..fa9413f25a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10929.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Childproofs double-esword and hypereuplastic blade toys." From d70b290dceecfd62336ec914e8c4c95fa9a2b4b1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 7 Feb 2020 00:52:52 -0600 Subject: [PATCH 115/118] Automatic changelog generation for PR #10798 [ci skip] --- html/changelogs/AutoChangeLog-pr-10798.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10798.yml diff --git a/html/changelogs/AutoChangeLog-pr-10798.yml b/html/changelogs/AutoChangeLog-pr-10798.yml new file mode 100644 index 0000000000..637343c7b6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10798.yml @@ -0,0 +1,5 @@ +author: "necromanceranne" +delete-after: True +changes: + - rscdel: "Removed the formal security officer jacket from the secdrobe" + - tweak: "formal security jackets are now armor vests" From d741fb0a1ff3bbff81a56664a1c1ab867b46a142 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 7 Feb 2020 00:53:57 -0600 Subject: [PATCH 116/118] Automatic changelog generation for PR #10787 [ci skip] --- html/changelogs/AutoChangeLog-pr-10787.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10787.yml diff --git a/html/changelogs/AutoChangeLog-pr-10787.yml b/html/changelogs/AutoChangeLog-pr-10787.yml new file mode 100644 index 0000000000..ee221b69f3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10787.yml @@ -0,0 +1,4 @@ +author: "Seris02" +delete-after: True +changes: + - rscadd: "thief's gloves" From e8236f504bee2daed4ac1b1c6ac039baa0f12d49 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 7 Feb 2020 00:56:16 -0600 Subject: [PATCH 117/118] Automatic changelog generation for PR #10921 [ci skip] --- html/changelogs/AutoChangeLog-pr-10921.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10921.yml diff --git a/html/changelogs/AutoChangeLog-pr-10921.yml b/html/changelogs/AutoChangeLog-pr-10921.yml new file mode 100644 index 0000000000..d6d551b40d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10921.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "The Lavaland's Herald speech sound should only play if they are actually speaking." From 34f43dccb4691012b16a9745f2aeecfc35a1f522 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 7 Feb 2020 00:56:35 -0600 Subject: [PATCH 118/118] Automatic changelog generation for PR #10924 [ci skip] --- html/changelogs/AutoChangeLog-pr-10924.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10924.yml diff --git a/html/changelogs/AutoChangeLog-pr-10924.yml b/html/changelogs/AutoChangeLog-pr-10924.yml new file mode 100644 index 0000000000..d419928dd2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10924.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed whitelisted/donor loadouts"