From 70abf6d8e92c552cd3570bbe020c25a571a7a7f3 Mon Sep 17 00:00:00 2001 From: Jordie Date: Thu, 14 Dec 2017 20:43:26 +1100 Subject: [PATCH 001/132] Saves newscaster data and photos to round logs folder --- code/__HELPERS/roundend.dm | 432 +++++++++++++++++++++++++++ code/controllers/subsystem/ticker.dm | 1 + code/game/machinery/newscaster.dm | 11 +- 3 files changed, 443 insertions(+), 1 deletion(-) create mode 100644 code/__HELPERS/roundend.dm diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm new file mode 100644 index 0000000000..c8710d6570 --- /dev/null +++ b/code/__HELPERS/roundend.dm @@ -0,0 +1,432 @@ +/datum/controller/subsystem/ticker/proc/gather_roundend_feedback() + var/clients = GLOB.player_list.len + var/surviving_humans = 0 + var/surviving_total = 0 + var/ghosts = 0 + var/escaped_humans = 0 + var/escaped_total = 0 + + for(var/mob/M in GLOB.player_list) + if(ishuman(M)) + if(!M.stat) + surviving_humans++ + if(M.z == ZLEVEL_CENTCOM) + escaped_humans++ + if(!M.stat) + surviving_total++ + if(M.z == ZLEVEL_CENTCOM) + escaped_total++ + + if(isobserver(M)) + ghosts++ + + if(clients) + SSblackbox.record_feedback("nested tally", "round_end_stats", clients, list("clients")) + if(ghosts) + SSblackbox.record_feedback("nested tally", "round_end_stats", ghosts, list("ghosts")) + if(surviving_humans) + SSblackbox.record_feedback("nested tally", "round_end_stats", surviving_humans, list("survivors", "human")) + if(surviving_total) + SSblackbox.record_feedback("nested tally", "round_end_stats", surviving_total, list("survivors", "total")) + if(escaped_humans) + SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_humans, list("escapees", "human")) + if(escaped_total) + SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_total, list("escapees", "total")) + + gather_antag_success_rate() + +/datum/controller/subsystem/ticker/proc/gather_antag_success_rate() + var/team_gid = 1 + var/list/team_ids = list() + + for(var/datum/antagonist/A in GLOB.antagonists) + var/list/antag_info = list() + antag_info["key"] = A.owner.key + antag_info["name"] = A.owner.name + antag_info["antagonist_type"] = A.type + antag_info["antagonist_name"] = A.name //For auto and custom roles + antag_info["objectives"] = list() + antag_info["team"] = list() + var/datum/objective_team/T = A.get_team() + if(T) + antag_info["team"]["type"] = T.type + antag_info["team"]["name"] = T.name + if(!team_ids[T]) + team_ids[T] = team_gid++ + antag_info["team"]["id"] = team_ids[T] + + if(!A.owner) + continue + if(A.objectives.len) + for(var/datum/objective/O in A.objectives) + var/result = O.check_completion() ? "SUCCESS" : "FAIL" + antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result)) + SSblackbox.record_feedback("associative", "antagonists", 1, antag_info) + +/datum/controller/subsystem/ticker/proc/gather_newscaster() + var/json_file = file("[GLOB.log_directory]/newscaster.json") + var/list/file_data = list() + var/pos = 1 + for(var/datum/newscaster/feed_channel/channel in GLOB.news_network.network_channels) + if(!GLOB.news_network.network_channels.len) + break + file_data["[pos]"] = list("channel name" = "[channel.channel_name]", "author" = "[channel.author]", "censored" = channel.censored ? 1 : 0, "author censored" = channel.authorCensor ? 1 : 0, "messages" = list()) + if(!channel.messages.len) + continue + for(var/datum/newscaster/feed_message/message in channel.messages) + file_data["[pos]"]["messages"] |= list("author" = "[message.author]", "time stamp" = "[message.time_stamp]", "censored" = message.bodyCensor ? 1 : 0, "author censored" = message.authorCensor ? 1 : 0, "photo file" = "[message.photo_file]", "photo caption" = "[message.caption]", "body" = "[message.body]", "comments" = list()) + if(!message.comments.len) + continue + for(var/datum/newscaster/feed_comment/comment in message.comments) + file_data["[pos]"]["messages"]["comments"] = list("author" = "[comment.author]", "time stamp" = "[comment.time_stamp]", "body" = "[comment.body]") + pos++ + if(GLOB.news_network.wanted_issue.active) + file_data["wanted"] = list("author" = "[GLOB.news_network.wanted_issue.scannedUser]", "criminal" = "[GLOB.news_network.wanted_issue.criminal]", "description" = "[GLOB.news_network.wanted_issue.body]", "photo file" = "[GLOB.news_network.wanted_issue.photo_file]") + WRITE_FILE(json_file, json_encode(file_data)) + +/datum/controller/subsystem/ticker/proc/declare_completion() + set waitfor = FALSE + + to_chat(world, "


The round has ended.") + if(LAZYLEN(GLOB.round_end_notifiees)) + send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.") + + for(var/client/C in GLOB.clients) + if(!C.credits) + C.RollCredits() + C.playtitlemusic(40) + + display_report() + + gather_roundend_feedback() + + CHECK_TICK + + //Set news report and mode result + mode.set_round_result() + + send2irc("Server", "Round just ended.") + + if(length(CONFIG_GET(keyed_string_list/cross_server))) + send_news_report() + + CHECK_TICK + + //These need update to actually reflect the real antagonists + //Print a list of antagonists to the server log + var/list/total_antagonists = list() + //Look into all mobs in world, dead or alive + for(var/datum/mind/Mind in minds) + var/temprole = Mind.special_role + if(temprole) //if they are an antagonist of some sort. + if(temprole in total_antagonists) //If the role exists already, add the name to it + total_antagonists[temprole] += ", [Mind.name]([Mind.key])" + else + total_antagonists.Add(temprole) //If the role doesnt exist in the list, create it and add the mob + total_antagonists[temprole] += ": [Mind.name]([Mind.key])" + + CHECK_TICK + + //Now print them all into the log! + log_game("Antagonists at round end were...") + for(var/i in total_antagonists) + log_game("[i]s[total_antagonists[i]].") + + CHECK_TICK + + //Collects persistence features + if(mode.allow_persistence_save) + SSpersistence.CollectData() + + //stop collecting feedback during grifftime + SSblackbox.Seal() + + sleep(50) + ready_for_reboot = TRUE + standard_reboot() + +/datum/controller/subsystem/ticker/proc/standard_reboot() + if(ready_for_reboot) + if(mode.station_was_nuked) + Reboot("Station destroyed by Nuclear Device.", "nuke") + else + Reboot("Round ended.", "proper completion") + else + CRASH("Attempted standard reboot without ticker roundend completion") + +//Common part of the report +/datum/controller/subsystem/ticker/proc/build_roundend_report() + var/list/parts = list() + + //Gamemode specific things. Should be empty most of the time. + parts += mode.special_report() + + CHECK_TICK + + //AI laws + parts += law_report() + + CHECK_TICK + + //Antagonists + parts += antag_report() + + CHECK_TICK + //Medals + parts += medal_report() + //Station Goals + parts += goal_report() + + listclearnulls(parts) + + return parts.Join() + + +/datum/controller/subsystem/ticker/proc/survivor_report() + var/list/parts = list() + var/station_evacuated = EMERGENCY_ESCAPED_OR_ENDGAMED + var/num_survivors = 0 + var/num_escapees = 0 + var/num_shuttle_escapees = 0 + + //Player status report + for(var/i in GLOB.mob_list) + var/mob/Player = i + if(Player.mind && !isnewplayer(Player)) + if(Player.stat != DEAD && !isbrain(Player)) + num_survivors++ + if(station_evacuated) //If the shuttle has already left the station + var/list/area/shuttle_areas + if(SSshuttle && SSshuttle.emergency) + shuttle_areas = SSshuttle.emergency.shuttle_areas + if(Player.onCentCom() || Player.onSyndieBase()) + num_escapees++ + if(shuttle_areas[get_area(Player)]) + num_shuttle_escapees++ + + //Round statistics report + 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) + + parts += "[GLOB.TAB]Shift Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]" + parts += "[GLOB.TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" + var/total_players = GLOB.joined_player_list.len + if(total_players) + parts+= "[GLOB.TAB]Total Population: [total_players]" + if(station_evacuated) + parts += "
[GLOB.TAB]Evacuation Rate: [num_escapees] ([PERCENT(num_escapees/total_players)]%)" + parts += "[GLOB.TAB](on emergency shuttle): [num_shuttle_escapees] ([PERCENT(num_shuttle_escapees/total_players)]%)" + parts += "[GLOB.TAB]Survival Rate: [num_survivors] ([PERCENT(num_survivors/total_players)]%)" + return parts.Join("
") + +/datum/controller/subsystem/ticker/proc/show_roundend_report(client/C,common_report) + var/list/report_parts = list() + + report_parts += personal_report(C) + report_parts += common_report + + var/datum/browser/roundend_report = new(C, "roundend") + roundend_report.width = 800 + roundend_report.height = 600 + roundend_report.set_content(report_parts.Join()) + roundend_report.stylesheets = list() + roundend_report.add_stylesheet("roundend",'html/browser/roundend.css') + + roundend_report.open(0) + +/datum/controller/subsystem/ticker/proc/personal_report(client/C) + var/list/parts = list() + var/mob/M = C.mob + if(M.mind && !isnewplayer(M)) + if(M.stat != DEAD && !isbrain(M)) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) + if(!M.onCentCom() || !M.onSyndieBase()) + parts += "
" + parts += "You managed to survive, but were marooned on [station_name()]..." + else + parts += "
" + parts += "You managed to survive the events on [station_name()] as [M.real_name]." + else + parts += "
" + parts += "You managed to survive the events on [station_name()] as [M.real_name]." + + else + parts += "
" + parts += "You did not survive the events on [station_name()]..." + else + parts += "
" + parts += "
" + if(GLOB.survivor_report) + parts += GLOB.survivor_report + else + parts += survivor_report() + + parts += "
" + + return parts.Join() + +/datum/controller/subsystem/ticker/proc/display_report() + GLOB.common_report = build_roundend_report() + for(var/client/C in GLOB.clients) + show_roundend_report(C,GLOB.common_report) + give_show_report_button(C) + CHECK_TICK + +/datum/controller/subsystem/ticker/proc/law_report() + var/list/parts = list() + //Silicon laws report + for (var/i in GLOB.ai_list) + var/mob/living/silicon/ai/aiPlayer = i + if(aiPlayer.mind) + parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:" + parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE) + + parts += "Total law changes: [aiPlayer.law_change_counter]" + + if (aiPlayer.connected_robots.len) + var/robolist = "[aiPlayer.real_name]'s minions were: " + for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) + if(robo.mind) + robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.mind.key]), ":" (Played by: [robo.mind.key]), "]" + parts += "[robolist]" + + for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs) + if (!robo.connected_ai && robo.mind) + if (robo.stat != DEAD) + parts += "[robo.name] (Played by: [robo.mind.key]) survived as an AI-less borg! Its laws were:" + else + parts += "[robo.name] (Played by: [robo.mind.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" + + if(robo) //How the hell do we lose robo between here and the world messages directly above this? + parts += robo.laws.get_law_list(include_zeroth=TRUE) + if(parts.len) + return "
[parts.Join("
")]
" + else + return "" + +/datum/controller/subsystem/ticker/proc/goal_report() + var/list/parts = list() + if(mode.station_goals.len) + for(var/V in mode.station_goals) + var/datum/station_goal/G = V + parts += G.get_result() + return "
    [parts.Join()]
" + +/datum/controller/subsystem/ticker/proc/medal_report() + if(GLOB.commendations.len) + var/list/parts = list() + parts += "Medal Commendations:" + for (var/com in GLOB.commendations) + parts += com + return "
[parts.Join("
")]
" + return "" + +/datum/controller/subsystem/ticker/proc/antag_report() + var/list/result = list() + var/list/all_teams = list() + var/list/all_antagonists = list() + + for(var/datum/antagonist/A in GLOB.antagonists) + all_teams |= A.get_team() + all_antagonists += A + + for(var/datum/objective_team/T in all_teams) + result += T.roundend_report() + for(var/datum/antagonist/X in all_antagonists) + if(X.get_team() == T) + all_antagonists -= X + result += " "//newline between teams + + var/currrent_category + var/datum/antagonist/previous_category + + sortTim(all_antagonists, /proc/cmp_antag_category) + + for(var/datum/antagonist/A in all_antagonists) + if(!A.show_in_roundend) + continue + if(A.roundend_category != currrent_category) + if(previous_category) + result += previous_category.roundend_report_footer() + result += "
" + result += "
" + result += A.roundend_report_header() + currrent_category = A.roundend_category + previous_category = A + result += A.roundend_report() + result += "

" + + if(all_antagonists.len) + var/datum/antagonist/last = all_antagonists[all_antagonists.len] + result += last.roundend_report_footer() + result += "
" + + return result.Join() + +/proc/cmp_antag_category(datum/antagonist/A,datum/antagonist/B) + return sorttext(B.roundend_category,A.roundend_category) + + +/datum/controller/subsystem/ticker/proc/give_show_report_button(client/C) + var/datum/action/report/R = new + C.player_details.player_actions += R + R.Grant(C.mob) + to_chat(C,"Show roundend report again") + +/datum/action/report + name = "Show roundend report" + button_icon_state = "vote" + +/datum/action/report/Trigger() + if(owner && GLOB.common_report && SSticker.current_state == GAME_STATE_FINISHED) + SSticker.show_roundend_report(owner.client,GLOB.common_report) + +/datum/action/report/IsAvailable() + return 1 + +/datum/action/report/Topic(href,href_list) + if(usr != owner) + return + if(href_list["report"]) + Trigger() + return + + +/proc/printplayer(datum/mind/ply, fleecheck) + var/text = "[ply.key] was [ply.name] the [ply.assigned_role] and" + if(ply.current) + if(ply.current.stat == DEAD) + text += " died" + else + text += " survived" + if(fleecheck) + var/turf/T = get_turf(ply.current) + if(!T || !(T.z in GLOB.station_z_levels)) + text += " while fleeing the station" + if(ply.current.real_name != ply.name) + text += " as [ply.current.real_name]" + else + text += " had their body destroyed" + return text + +/proc/printplayerlist(list/players,fleecheck) + var/list/parts = list() + + parts += "
    " + for(var/datum/mind/M in players) + parts += "
  • [printplayer(M,fleecheck)]
    • " + parts += "
" + return parts.Join() + + +/proc/printobjectives(datum/mind/ply) + var/list/objective_parts = list() + var/count = 1 + for(var/datum/objective/objective in ply.objectives) + if(objective.check_completion()) + objective_parts += "Objective #[count]: [objective.explanation_text] Success!" + else + objective_parts += "Objective #[count]: [objective.explanation_text] Fail." + count++ + return objective_parts.Join("
") diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 881bb7fcb7..11908cbdbc 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -829,6 +829,7 @@ SUBSYSTEM_DEF(ticker) world.Reboot() /datum/controller/subsystem/ticker/Shutdown() + gather_newscaster() //called here so we ensure the log is created even upon admin reboot if(!round_end_sound) round_end_sound = pick(\ 'sound/roundend/newroundsexy.ogg', diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 18acd9ece7..730380225d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(allCasters) var/creationTime var/authorCensor var/bodyCensor + var/photo_file /datum/newscaster/feed_message/proc/returnAuthor(censor) if(censor == -1) @@ -97,6 +98,7 @@ GLOBAL_LIST_EMPTY(allCasters) var/scannedUser var/isAdminMsg var/icon/img + var/photo_file /datum/newscaster/feed_network var/list/datum/newscaster/feed_channel/network_channels = list() @@ -126,6 +128,7 @@ GLOBAL_LIST_EMPTY(allCasters) if(photo) newMsg.img = photo.img newMsg.caption = photo.scribble + newMsg.photo_file = save_photo(photo.img) for(var/datum/newscaster/feed_channel/FC in network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg @@ -143,6 +146,7 @@ GLOBAL_LIST_EMPTY(allCasters) wanted_issue.isAdminMsg = adminMsg if(photo) wanted_issue.img = photo.img + wanted_issue.photo_file = save_photo(photo.img) if(newMessage) for(var/obj/machinery/newscaster/N in GLOB.allCasters) N.newsAlert() @@ -157,7 +161,12 @@ GLOBAL_LIST_EMPTY(allCasters) for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) NEWSCASTER.update_icon() - +/datum/newscaster/feed_network/proc/save_photo(icon/photo) + var/photo_file = copytext(md5("\icon[photo]"), 1, 6) + if(!fexists("[GLOB.log_directory]/photos/[photo_file].png")) + var/icon/p = icon(photo, frame = 1) + fcopy(p, "[GLOB.log_directory]/photos/[photo_file].png") + return photo_file /obj/item/wallframe/newscaster name = "newscaster frame" From 2f8d49de9110372398f3590da1686b862ef818e9 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 15 Dec 2017 19:34:51 -0500 Subject: [PATCH 002/132] [READY] Monkey mode overhaul --- code/__DEFINES/antagonists.dm | 10 +- code/__DEFINES/say.dm | 1 + code/datums/antagonists/monkey.dm | 170 ++++++++++++++++++ code/datums/diseases/transformation.dm | 11 +- code/datums/mind.dm | 28 ++- code/datums/saymode.dm | 24 ++- .../gamemodes/miniantags/monkey/monkey.dm | 86 +++++---- .../browserassets/css/browserOutput.css | 5 + code/modules/mob/living/carbon/human/human.dm | 3 +- .../mob/living/carbon/human/human_movement.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 27 ++- .../mob/living/carbon/monkey/monkey.dm | 12 +- code/modules/surgery/organs/heart.dm | 14 ++ interface/stylesheet.dm | 6 + tgstation.dme | 1 + 15 files changed, 325 insertions(+), 75 deletions(-) create mode 100644 code/datums/antagonists/monkey.dm diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index 17b6e60158..1fba96b1eb 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -9,10 +9,12 @@ #define ANTAG_DATUM_TRAITOR /datum/antagonist/traitor #define ANTAG_DATUM_TRAITOR_HUMAN /datum/antagonist/traitor/human #define ANTAG_DATUM_TRAITOR_AI /datum/antagonist/traitor/AI -#define ANTAG_DATUM_IAA /datum/antagonist/traitor/internal_affairs +#define ANTAG_DATUM_IAA /datum/antagonist/traitor/internal_affairs #define ANTAG_DATUM_IAA_HUMAN /datum/antagonist/traitor/human/internal_affairs -#define ANTAG_DATUM_IAA_AI /datum/antagonist/traitor/AI/internal_affairs +#define ANTAG_DATUM_IAA_AI /datum/antagonist/traitor/AI/internal_affairs #define ANTAG_DATUM_BROTHER /datum/antagonist/brother #define ANTAG_DATUM_ABDUCTOR /datum/antagonist/abductor -#define ANTAG_DATUM_ABDUCTOR_SCIENTIST /datum/antagonist/abductor/scientist -#define ANTAG_DATUM_ABDUCTOR_AGENT /datum/antagonist/abductor/agent +#define ANTAG_DATUM_ABDUCTOR_SCIENTIST /datum/antagonist/abductor/scientist +#define ANTAG_DATUM_ABDUCTOR_AGENT /datum/antagonist/abductor/agent +#define ANTAG_DATUM_MONKEY /datum/antagonist/monkey +#define ANTAG_DATUM_MONKEY_LEADER /datum/antagonist/monkey/leader \ No newline at end of file diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 74a1669686..8f38acb203 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -17,6 +17,7 @@ #define MODE_HOLOPAD "holopad" #define MODE_CHANGELING "changeling" #define MODE_VOCALCORDS "cords" +#define MODE_MONKEY "monkeyhive" //Spans. Robot speech, italics, etc. Applied in compose_message(). #define SPAN_ROBOT "robot" diff --git a/code/datums/antagonists/monkey.dm b/code/datums/antagonists/monkey.dm new file mode 100644 index 0000000000..8d7462b567 --- /dev/null +++ b/code/datums/antagonists/monkey.dm @@ -0,0 +1,170 @@ +#define MONKEYS_ESCAPED 1 +#define MONKEYS_LIVED 2 +#define MONKEYS_DIED 3 +#define DISEASE_LIVED 4 + +/datum/antagonist/monkey + name = "Monkey" + job_rank = ROLE_MONKEY + roundend_category = "monkeys" + var/datum/objective_team/monkey/monkey_team + +/datum/antagonist/monkey/on_gain() + . = ..() + SSticker.mode.ape_infectees += owner + owner.special_role = "Infected Monkey" + + var/datum/disease/D = new /datum/disease/transformation/jungle_fever + if(!owner.current.HasDisease(D)) + D.affected_mob = owner + owner.current.viruses += D + else + QDEL_NULL(D) + +/datum/antagonist/monkey/greet() + to_chat(owner, "You are a monkey now!") + to_chat(owner, "Bite humans to infect them, follow the orders of the monkey leaders, and help fellow monkeys!") + to_chat(owner, "Ensure at least one infected monkey escapes on the Emergency Shuttle!") + to_chat(owner, "As an intelligent monkey, you know how to use technology and how to ventcrawl while wearing things.") + to_chat(owner, "You can use :k to talk to fellow monkeys!") + SEND_SOUND(owner.current, sound('sound/ambience/antag/monkey.ogg')) + +/datum/antagonist/monkey/on_removal() + . = ..() + owner.special_role = null + SSticker.mode.ape_infectees -= owner + + var/datum/disease/D = (/datum/disease/transformation/jungle_fever in owner.current.viruses) + if(D) + D.cure() + +/datum/antagonist/monkey/create_team(datum/objective_team/monkey/new_team) + if(!new_team) + for(var/datum/antagonist/monkey/N in get_antagonists(/datum/antagonist/monkey, TRUE)) + if(N.monkey_team) + monkey_team = N.monkey_team + return + monkey_team = new /datum/objective_team/monkey + monkey_team.update_objectives() + return + if(!istype(new_team)) + stack_trace("Wrong team type passed to [type] initialization.") + monkey_team = new_team + +/datum/antagonist/monkey/proc/forge_objectives() + if(monkey_team) + owner.objectives |= monkey_team.objectives + +/datum/antagonist/monkey/leader + name = "Monkey Leader" + +/datum/antagonist/monkey/leader/on_gain() + . = ..() + var/datum/disease/D = (/datum/disease/transformation/jungle_fever in owner.current.viruses) + if(D) + D.visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC + var/obj/item/organ/heart/freedom/F = new + F.Insert(owner.current, drop_if_replaced = FALSE) + SSticker.mode.ape_leaders += owner + owner.special_role = "Monkey Leader" + +/datum/antagonist/monkey/leader/on_removal() + . = ..() + SSticker.mode.ape_leaders -= owner + var/obj/item/organ/heart/H = new + H.Insert(owner.current, drop_if_replaced = FALSE) //replace freedom heart with normal heart + +/datum/antagonist/monkey/leader/greet() + to_chat(owner, "You are the Jungle Fever patient zero!!") + to_chat(owner, "You have been planted onto this station by the Animal Rights Consortium.") + to_chat(owner, "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.") + to_chat(owner, "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.") + to_chat(owner, "Your mission will be deemed a success if any of the live infected monkeys reach CentCom.") + to_chat(owner, "As an initial infectee, you will be considered a 'leader' by your fellow monkeys.") + to_chat(owner, "You can use :k to talk to fellow monkeys!") + SEND_SOUND(owner.current, sound('sound/ambience/antag/monkey.ogg')) + +/datum/objective/monkey + explanation_text = "Ensure that infected monkeys escape on the emergency shuttle!" + martyr_compatible = TRUE + var/monkeys_to_win = 1 + var/escaped_monkeys = 0 + +/datum/objective/monkey/check_completion() + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() + for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list) + if (M.HasDisease(D) && (M.onCentCom() || M.onSyndieBase())) + escaped_monkeys++ + if(escaped_monkeys >= monkeys_to_win) + return TRUE + return FALSE + +/datum/objective_team/monkey + name = "Monkeys" + +/datum/objective_team/monkey/proc/update_objectives() + objectives = list() + var/datum/objective/monkey/O = new /datum/objective/monkey() + O.team = src + objectives += O + return + +/datum/objective_team/monkey/proc/infected_monkeys_alive() + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() + for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list) + if(M.HasDisease(D)) + return TRUE + return FALSE + +/datum/objective_team/monkey/proc/infected_monkeys_escaped() + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() + for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list) + if(M.HasDisease(D) && (M.onCentCom() || M.onSyndieBase())) + return TRUE + return FALSE + +/datum/objective_team/monkey/proc/infected_humans_escaped() + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() + for(var/mob/living/carbon/human/M in GLOB.alive_mob_list) + if(M.HasDisease(D) && (M.onCentCom() || M.onSyndieBase())) + return TRUE + return FALSE + +/datum/objective_team/monkey/proc/infected_humans_alive() + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() + for(var/mob/living/carbon/human/M in GLOB.alive_mob_list) + if(M.HasDisease(D)) + return TRUE + return FALSE + +/datum/objective_team/monkey/proc/get_result() + if(infected_monkeys_escaped()) + return MONKEYS_ESCAPED + if(infected_monkeys_alive()) + return MONKEYS_LIVED + if(infected_humans_alive() || infected_humans_escaped()) + return DISEASE_LIVED + return MONKEYS_DIED + +/datum/objective_team/monkey/roundend_report() + var/list/parts = list() + switch(get_result()) + if(MONKEYS_ESCAPED) + parts += "Monkey Major Victory!" + parts += "Central Command and [station_name()] were taken over by the monkeys! Ook ook!" + if(MONKEYS_LIVED) + parts += "Monkey Minor Victory!" + parts += "[station_name()] was taken over by the monkeys! Ook ook!" + if(DISEASE_LIVED) + parts += "Monkey Minor Defeat!" + parts += "All the monkeys died, but the disease lives on! The future is uncertain." + if(MONKEYS_DIED) + parts += "Monkey Major Defeat!" + parts += "All the monkeys died, and Jungle Fever was wiped out!" + if(LAZYLEN(SSticker.mode.ape_leaders)) + parts += "The monkey leaders were:" + parts += printplayerlist(SSticker.mode.ape_leaders) + if(LAZYLEN(SSticker.mode.ape_infectees)) + parts += "The monkeys were:" + parts += printplayerlist(SSticker.mode.ape_infectees) + return "
[parts.Join("
")]
" \ No newline at end of file diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 60622f61cb..30bb3d1898 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -88,9 +88,12 @@ stage5 = list("You feel like monkeying around.") /datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob) - if(!ismonkey(affected_mob)) - SSticker.mode.add_monkey(affected_mob.mind) - affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) + if(affected_mob.mind && !is_monkey(affected_mob)) + add_monkey(affected_mob.mind) + if(ishuman(affected_mob)) + var/mob/living/carbon/monkey/M = affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) + M.ventcrawler = VENTCRAWLER_ALWAYS + /datum/disease/transformation/jungle_fever/stage_act() ..() @@ -107,7 +110,7 @@ affected_mob.say(pick("Eeek, ook ook!", "Eee-eeek!", "Eeee!", "Ungh, ungh.")) /datum/disease/transformation/jungle_fever/cure() - SSticker.mode.remove_monkey(affected_mob.mind) + remove_monkey(affected_mob.mind) ..() diff --git a/code/datums/mind.dm b/code/datums/mind.dm index c0ab1dc015..e35837a7d2 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -464,20 +464,27 @@ text = uppertext(text) text = "[text]: " if (ishuman(current)) - text += "healthy | infected | HUMAN | other" + if(is_monkey_leader(src)) + text += "healthy | infected LEADER | human | other" + else + text += "healthy | infected | leader | HUMAN | other" else if(ismonkey(current)) var/found = FALSE for(var/datum/disease/transformation/jungle_fever/JF in current.viruses) found = TRUE break - if(found) - text += "healthy | INFECTED | human | other" + var/isLeader = is_monkey_leader(src) + + if(isLeader) + text += "healthy | infected LEADER | human | other" + else if(found) + text += "healthy | INFECTED | leader | human | other" else - text += "HEALTHY | infected | human | other" + text += "HEALTHY | infected | leader | human | other" else - text += "healthy | infected | human | OTHER" + text += "healthy | infected | leader | human | OTHER" if(current && current.client && (ROLE_MONKEY in current.client.prefs.be_special)) text += " | Enabled in Prefs" @@ -1241,11 +1248,17 @@ else if (istype(M) && length(M.viruses)) for(var/thing in M.viruses) var/datum/disease/D = thing - D.cure(0) + D.cure(FALSE) + if("leader") + if(check_rights(R_ADMIN, 0)) + add_monkey_leader(src) + log_admin("[key_name(usr)] made [key_name(current)] a monkey leader!") + message_admins("[key_name_admin(usr)] made [key_name_admin(current)] a monkey leader!") if("infected") - if (check_rights(R_ADMIN, 0)) + if(check_rights(R_ADMIN, 0)) var/mob/living/carbon/human/H = current var/mob/living/carbon/monkey/M = current + add_monkey(src) if (istype(H)) log_admin("[key_name(usr)] attempting to monkeyize and infect [key_name(current)]") message_admins("[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]") @@ -1263,6 +1276,7 @@ for(var/datum/disease/transformation/jungle_fever/JF in M.viruses) JF.cure(0) stoplag() //because deleting of virus is doing throught spawn(0) //What + remove_monkey(src) log_admin("[key_name(usr)] attempting to humanize [key_name(current)]") message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]") H = M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm index e372d5c0b2..176c762e9c 100644 --- a/code/datums/saymode.dm +++ b/code/datums/saymode.dm @@ -33,7 +33,7 @@ if(LINGHIVE_LING) var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/msg = "[changeling.changelingID]: [message]" - log_talk(src,"[changeling.changelingID]/[user.key] : [message]",LOGSAY) + log_talk(user,"[changeling.changelingID]/[user.key] : [message]",LOGSAY) for(var/_M in GLOB.mob_list) var/mob/M = _M if(M in GLOB.dead_mob_list) @@ -110,3 +110,25 @@ AI.holopad_talk(message, language) return FALSE return TRUE + +/datum/saymode/monkey + key = "k" + mode = MODE_MONKEY + +/datum/saymode/monkey/handle_message(mob/living/user, message, datum/language/language) + var/datum/mind = user.mind + if(!mind) + return TRUE + if(is_monkey_leader(mind) || (ismonkey(user) && is_monkey(mind))) + log_talk(user, "(MONKEY) [user]/[user.key]: [message]",LOGSAY) + if(prob(75) && ismonkey(user)) + user.visible_message("\The [user] chimpers.") + var/msg = "\[[is_monkey_leader(mind) ? "Monkey Leader" : "Monkey"]\] [user]: [message]" + for(var/_M in GLOB.mob_list) + var/mob/M = _M + if(M in GLOB.dead_mob_list) + var/link = FOLLOW_LINK(M, user) + to_chat(M, "[link] [msg]") + if((is_monkey_leader(M.mind) || ismonkey(M)) && (M.mind in SSticker.mode.ape_infectees)) + to_chat(M, msg) + return FALSE diff --git a/code/game/gamemodes/miniantags/monkey/monkey.dm b/code/game/gamemodes/miniantags/monkey/monkey.dm index 379031dce9..9050d03686 100644 --- a/code/game/gamemodes/miniantags/monkey/monkey.dm +++ b/code/game/gamemodes/miniantags/monkey/monkey.dm @@ -1,5 +1,6 @@ /datum/game_mode var/list/ape_infectees = list() + var/list/ape_leaders = list() /datum/game_mode/monkey name = "monkey" @@ -21,6 +22,9 @@ var/players_per_carrier = 30 + var/datum/objective_team/monkey/monkey_team + + /datum/game_mode/monkey/pre_setup() carriers_to_make = max(round(num_players()/players_per_carrier, 1), 1) @@ -30,79 +34,59 @@ break var/datum/mind/carrier = pick(antag_candidates) carriers += carrier - carrier.special_role = "monkey" + carrier.special_role = "Monkey Leader" carrier.restricted_roles = restricted_jobs log_game("[carrier.key] (ckey) has been selected as a Jungle Fever carrier") antag_candidates -= carrier if(!carriers.len) - return 0 - return 1 + return FALSE + return TRUE /datum/game_mode/monkey/announce() to_chat(world, "The current game mode is - Monkey!") to_chat(world, "One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. Monkeys: Ensure that your kind lives on! Rise up against your captors!") - -/datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier) - to_chat(carrier.current, "You are the Jungle Fever patient zero!!") - to_chat(carrier.current, "You have been planted onto this station by the Animal Rights Consortium.") - to_chat(carrier.current, "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.") - to_chat(carrier.current, "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.") - to_chat(carrier.current, "Your mission will be deemed a success if any of the live infected monkeys reach CentCom.") - carrier.current.playsound_local(get_turf(carrier.current), 'sound/ambience/antag/monkey.ogg', 100, FALSE, pressure_affected = FALSE) - return - /datum/game_mode/monkey/post_setup() for(var/datum/mind/carriermind in carriers) - greet_carrier(carriermind) - ape_infectees += carriermind - - var/datum/disease/D = new /datum/disease/transformation/jungle_fever - D.visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC - D.affected_mob = carriermind.current - carriermind.current.viruses += D - ..() + var/datum/antagonist/monkey/M = add_monkey_leader(carriermind, monkey_team) + if(M) + monkey_team = M.monkey_team + return ..() /datum/game_mode/monkey/check_finished() if((SSshuttle.emergency.mode == SHUTTLE_ENDGAME) || station_was_nuked) - return 1 + return TRUE if(!round_converted) for(var/datum/mind/monkey_mind in ape_infectees) - continuous_sanity_checked = 1 + continuous_sanity_checked = TRUE if(monkey_mind.current && monkey_mind.current.stat != DEAD) - return 0 + return FALSE var/datum/disease/D = new /datum/disease/transformation/jungle_fever() //ugly but unfortunately needed for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) - if(H.mind && H.stat != DEAD) + if(!(H.z in GLOB.station_z_levels)) + continue + if(H.mind && H.client && H.stat != DEAD) if(H.HasDisease(D)) - return 0 + return FALSE - ..() + return ..() /datum/game_mode/monkey/proc/check_monkey_victory() if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) - return 0 + return FALSE var/datum/disease/D = new /datum/disease/transformation/jungle_fever() for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list) if (M.HasDisease(D)) if(M.onCentCom() || M.onSyndieBase()) escaped_monkeys++ if(escaped_monkeys >= monkeys_to_win) - return 1 + return TRUE else - return 0 - -/datum/game_mode/proc/add_monkey(datum/mind/monkey_mind) - ape_infectees |= monkey_mind - monkey_mind.special_role = "Infected Monkey" - -/datum/game_mode/proc/remove_monkey(datum/mind/monkey_mind) - ape_infectees.Remove(monkey_mind) - monkey_mind.special_role = null + return FALSE /datum/game_mode/monkey/declare_completion() @@ -115,3 +99,29 @@ /datum/game_mode/monkey/generate_report() return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "banana blight")] outbreak that turn humans into monkeys has been reported in your quadrant. Any such infections may be treated with banana juice. If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at CentCom." + +/proc/add_monkey_leader(datum/mind/monkey_mind) + if(is_monkey_leader(monkey_mind)) + return FALSE + var/datum/antagonist/monkey/leader/M = monkey_mind.add_antag_datum(ANTAG_DATUM_MONKEY_LEADER) + return M + +/proc/add_monkey(datum/mind/monkey_mind) + if(is_monkey(monkey_mind)) + return FALSE + var/datum/antagonist/monkey/M = monkey_mind.add_antag_datum(ANTAG_DATUM_MONKEY) + return M + +/proc/remove_monkey(datum/mind/monkey_mind) + if(!is_monkey(monkey_mind)) + return FALSE + var/datum/antagonist/monkey/M = monkey_mind.has_antag_datum(ANTAG_DATUM_MONKEY) + M.on_removal() + return TRUE + +/proc/is_monkey_leader(datum/mind/monkey_mind) + return monkey_mind && monkey_mind.has_antag_datum(ANTAG_DATUM_MONKEY_LEADER) + +/proc/is_monkey(datum/mind/monkey_mind) + return monkey_mind && (monkey_mind.has_antag_datum(ANTAG_DATUM_MONKEY) || is_monkey_leader(monkey_mind)) + diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 4d31d082c6..482290fc37 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -383,8 +383,13 @@ h1.alert, h2.alert {color: #000000;} .swarmer {color: #2C75FF;} .resonate {color: #298F85;} +<<<<<<< HEAD .love {color: #FF69Bf;} .lovebold {color: #FF69Bf; font-weight: bold;} +======= +.monkeyhive {color: #774704;} +.monkeylead {color: #774704; font-size: 2;} +>>>>>>> d3aacc2... [READY] Monkey mode overhaul (#32916) .connectionClosed, .fatalError {background: red; color: white; padding: 5px;} .connectionClosed.restored {background: green;} diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f0c630421d..b153f914f3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -847,7 +847,8 @@ return TRUE /mob/living/carbon/human/update_gravity(has_gravity,override = 0) - override = dna.species.override_float + if(dna && dna.species) //prevents a runtime while a human is being monkeyfied + override = dna.species.override_float ..() /mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index c90d1a0231..6e5d8c7373 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -23,7 +23,7 @@ . = 1 /mob/living/carbon/human/mob_negates_gravity() - return ((shoes && shoes.negates_gravity()) || dna.species.negates_gravity(src)) + return ((shoes && shoes.negates_gravity()) || (dna.species.negates_gravity(src))) /mob/living/carbon/human/Move(NewLoc, direct) . = ..() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cca672d3d8..8363b64c9d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -93,19 +93,18 @@ failed_last_breath = 1 - if(dna && dna.species) - var/datum/species/S = dna.species + var/datum/species/S = dna.species - if(S.breathid == "o2") - throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) - else if(S.breathid == "tox") - throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) - else if(S.breathid == "co2") - throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2) - else if(S.breathid == "n2") - throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro) + if(S.breathid == "o2") + throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + else if(S.breathid == "tox") + throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) + else if(S.breathid == "co2") + throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2) + else if(S.breathid == "n2") + throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro) - return 0 + return FALSE else if(istype(L, /obj/item/organ/lungs)) var/obj/item/organ/lungs/lun = L @@ -238,10 +237,10 @@ /mob/living/carbon/human/proc/get_cold_protection(temperature) if(dna.check_mutation(COLDRES)) - return 1 //Fully protected from the cold. + return TRUE //Fully protected from the cold. - if(dna && (RESISTCOLD in dna.species.species_traits)) - return 1 + if(RESISTCOLD in dna.species.species_traits) + return TRUE if(istype(loc, /obj/item/device/dogborg/sleeper)) return 1 //freezing to death in sleepers ruins fun. diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 7c65e4a604..59a19c7b84 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -11,7 +11,7 @@ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1) type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey gib_type = /obj/effect/decal/cleanable/blood/gibs - unique_name = 1 + unique_name = TRUE 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) devourable = TRUE @@ -62,7 +62,7 @@ if (bodytemperature < 283.222) . += (283.222 - bodytemperature) / 10 * 1.75 - + var/static/config_monkey_delay if(isnull(config_monkey_delay)) config_monkey_delay = CONFIG_GET(number/monkey_delay) @@ -89,13 +89,15 @@ /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools - return 0 + if(mind && is_monkey(mind)) + return TRUE + return FALSE /mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents - return 0 + return FALSE /mob/living/carbon/monkey/canBeHandcuffed() - return 1 + return TRUE /mob/living/carbon/monkey/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) if(judgement_criteria & JUDGE_EMAGGED) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 21d15fb609..5da89f125f 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -152,3 +152,17 @@ /obj/item/organ/heart/cybernetic/emp_act() Stop() + +/obj/item/organ/heart/freedom + name = "heart of freedom" + desc = "This heart pumps with the passion to give... something freedom." + var/min_next_adrenaline = 0 + +/obj/item/organ/heart/freedom/on_life() + . = ..() + if(owner.health < 5 && world.time > min_next_adrenaline) + min_next_adrenaline = world.time + rand(250, 600) //anywhere from 4.5 to 10 minutes + to_chat(owner, "You feel yourself dying, but you refuse to give up!") + owner.heal_overall_damage(15, 15) + if(owner.reagents.get_reagent_amount("ephedrine") < 20) + owner.reagents.add_reagent("ephedrine", 10) \ No newline at end of file diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index dd23e1807a..bef6731c9f 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -165,6 +165,12 @@ h1.alert, h2.alert {color: #000000;} .monkey {color: #975032;} .swarmer {color: #2C75FF;} .resonate {color: #298F85;} +<<<<<<< HEAD .love {color: #FF69Bf;} .lovebold {color: #FF69Bf; font-weight: bold;} +======= + +.monkeyhive {color: #774704;} +.monkeylead {color: #774704; font-size: 2;} +>>>>>>> d3aacc2... [READY] Monkey mode overhaul (#32916) "} diff --git a/tgstation.dme b/tgstation.dme index 11399a1b14..28d4bf1319 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -329,6 +329,7 @@ #include "code\datums\antagonists\datum_traitor.dm" #include "code\datums\antagonists\devil.dm" #include "code\datums\antagonists\internal_affairs.dm" +#include "code\datums\antagonists\monkey.dm" #include "code\datums\antagonists\ninja.dm" #include "code\datums\antagonists\pirate.dm" #include "code\datums\antagonists\revolution.dm" From 86cfa46c9b31c5ccd7445e7ef5e2399ade680049 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 17:53:11 -0600 Subject: [PATCH 003/132] Update browserOutput.css --- code/modules/goonchat/browserassets/css/browserOutput.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 482290fc37..cb3ca7d6be 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -383,13 +383,11 @@ h1.alert, h2.alert {color: #000000;} .swarmer {color: #2C75FF;} .resonate {color: #298F85;} -<<<<<<< HEAD .love {color: #FF69Bf;} .lovebold {color: #FF69Bf; font-weight: bold;} -======= .monkeyhive {color: #774704;} .monkeylead {color: #774704; font-size: 2;} ->>>>>>> d3aacc2... [READY] Monkey mode overhaul (#32916) + .connectionClosed, .fatalError {background: red; color: white; padding: 5px;} .connectionClosed.restored {background: green;} From c2361b6997d0a3a1f2ccfa83b2892f5f32269a1e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 17:53:13 -0600 Subject: [PATCH 004/132] Update stylesheet.dm --- interface/stylesheet.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index bef6731c9f..3a43667a5d 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -165,12 +165,9 @@ h1.alert, h2.alert {color: #000000;} .monkey {color: #975032;} .swarmer {color: #2C75FF;} .resonate {color: #298F85;} -<<<<<<< HEAD .love {color: #FF69Bf;} .lovebold {color: #FF69Bf; font-weight: bold;} -======= .monkeyhive {color: #774704;} .monkeylead {color: #774704; font-size: 2;} ->>>>>>> d3aacc2... [READY] Monkey mode overhaul (#32916) "} From 3af0aa2489a9af4dbdab09812185317fe3341358 Mon Sep 17 00:00:00 2001 From: XDTM Date: Mon, 18 Dec 2017 22:20:07 +0100 Subject: [PATCH 005/132] [Ready Again]Refactors disabilities into lists, allowing for independent disability sources --- code/__DEFINES/stat.dm | 25 +++ code/_onclick/item_attack.dm | 5 + code/datums/antagonists/changeling.dm | 2 +- code/datums/brain_damage/mild.dm | 4 +- code/datums/brain_damage/severe.dm | 44 +++--- .../diseases/advance/symptoms/vision.dm | 15 +- code/datums/martial/sleeping_carp.dm | 2 +- code/datums/mutations.dm | 1 - code/datums/mutations/body.dm | 8 +- code/datums/mutations/sight.dm | 8 +- code/datums/mutations/speech.dm | 4 +- .../gamemodes/changeling/powers/tiny_prick.dm | 16 +- .../clock_items/wraith_spectacles.dm | 25 +-- .../clock_structures/ocular_warden.dm | 2 +- code/game/gamemodes/cult/runes.dm | 2 +- code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/computer/dna_console.dm | 4 +- code/game/machinery/dna_scanner.dm | 2 +- code/game/objects/items.dm | 10 +- code/game/objects/items/defib.dm | 4 +- code/game/objects/items/devices/flashlight.dm | 4 +- code/game/objects/items/devices/scanners.dm | 11 +- code/game/objects/items/dna_injector.dm | 4 +- code/game/objects/items/grenades/grenade.dm | 2 +- code/game/objects/items/handcuffs.dm | 2 +- code/game/objects/items/kitchen.dm | 4 +- code/game/objects/items/melee/misc.dm | 2 +- code/game/objects/items/melee/transforming.dm | 2 +- code/game/objects/items/pneumaticCannon.dm | 2 +- code/game/objects/items/shields.dm | 145 ++++++++++++++++++ code/game/objects/items/storage/book.dm | 2 +- code/game/objects/items/stunbaton.dm | 2 +- code/game/objects/items/teleprod.dm | 2 +- code/game/objects/items/tools/screwdriver.dm | 4 +- code/game/objects/items/twohanded.dm | 2 +- .../objects/structures/petrified_statue.dm | 4 +- code/modules/assembly/flash.dm | 2 +- code/modules/assembly/mousetrap.dm | 145 ++++++++++++++++++ code/modules/clothing/glasses/_glasses.dm | 2 +- code/modules/events/disease_outbreak.dm | 14 ++ .../mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mob/living/blood.dm | 8 +- code/modules/mob/living/brain/brain_item.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 16 +- .../mob/living/carbon/carbon_defense.dm | 8 +- code/modules/mob/living/carbon/human/death.dm | 4 +- .../mob/living/carbon/human/human_defense.dm | 5 + .../mob/living/carbon/human/interactive.dm | 2 +- .../mob/living/carbon/human/inventory.dm | 2 +- .../mob/living/carbon/human/species.dm | 20 ++- .../carbon/human/species_types/golems.dm | 2 +- .../mob/living/carbon/human/status_procs.dm | 4 +- .../mob/living/carbon/human/update_icons.dm | 2 +- .../mob/living/carbon/monkey/combat.dm | 7 + .../mob/living/carbon/monkey/update_icons.dm | 2 +- .../modules/mob/living/carbon/status_procs.dm | 37 +---- .../modules/mob/living/carbon/update_icons.dm | 2 +- code/modules/mob/living/life.dm | 8 +- code/modules/mob/living/living.dm | 7 +- code/modules/mob/living/living_defense.dm | 45 +++++- code/modules/mob/living/living_defines.dm | 2 + code/modules/mob/living/say.dm | 2 +- .../hostile/megafauna/colossus.dm | 6 +- code/modules/mob/living/status_procs.dm | 73 +++++++++ code/modules/mob/mob_defines.dm | 1 - code/modules/mob/status_procs.dm | 37 ++--- code/modules/paperwork/paper.dm | 4 +- code/modules/paperwork/paperplane.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/ballistic/revolver.dm | 2 +- code/modules/projectiles/pins.dm | 2 +- .../chemistry/reagents/drink_reagents.dm | 2 +- .../chemistry/reagents/medicine_reagents.dm | 14 +- .../chemistry/reagents/toxin_reagents.dm | 2 +- .../spells/spell_types/construct_spells.dm | 6 +- code/modules/spells/spell_types/genetic.dm | 32 +++- code/modules/surgery/bodyparts/bodyparts.dm | 2 +- code/modules/surgery/bodyparts/head.dm | 2 +- code/modules/surgery/eye_surgery.dm | 4 +- code/modules/surgery/lipoplasty.dm | 2 +- code/modules/surgery/organs/ears.dm | 4 +- 81 files changed, 711 insertions(+), 221 deletions(-) diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 331bc6765f..208970ff9f 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -10,6 +10,7 @@ //mob disabilities stat +<<<<<<< HEAD #define BLIND 1 #define MUTE 2 #define DEAF 4 @@ -20,6 +21,30 @@ #define CLUMSY 256 #define DUMB 512 #define MONKEYLIKE 1024 //sets IsAdvancedToolUser to FALSE +======= +#define BLIND "blind" +#define MUTE "mute" +#define DEAF "deaf" +#define NEARSIGHT "nearsighted" +#define FAT "fat" +#define HUSK "husk" +#define NOCLONE "noclone" +#define CLUMSY "clumsy" +#define DUMB "dumb" +#define MONKEYLIKE "monkeylike" //sets IsAdvancedToolUser to FALSE +#define PACIFISM "pacifism" + +// common disability sources +#define EYE_DAMAGE "eye_damage" +#define GENETIC_MUTATION "genetic" +#define STATUE_MUTE "statue" +#define CHANGELING_DRAIN "drain" +#define OBESITY "obesity" +#define MAGIC_DISABILITY "magic" +#define STASIS_MUTE "stasis" +#define GENETICS_SPELL "genetics_spell" +#define TRAUMA_DISABILITY "trauma" +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) // bitflags for machine stat variable #define BROKEN 1 diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 859c957a43..134e33224f 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -58,6 +58,11 @@ SendSignal(COMSIG_ITEM_ATTACK, M, user) if(flags_1 & NOBLUDGEON_1) return +<<<<<<< HEAD +======= + if(user.has_disability(PACIFISM)) + return +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(!force) playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) else if(hitsound) diff --git a/code/datums/antagonists/changeling.dm b/code/datums/antagonists/changeling.dm index e98bfed782..1eddc725d2 100644 --- a/code/datums/antagonists/changeling.dm +++ b/code/datums/antagonists/changeling.dm @@ -223,7 +223,7 @@ if(verbose) to_chat(user, "[target] is not compatible with our biology.") return - if((target.disabilities & NOCLONE) || (target.disabilities & HUSK)) + if((target.has_disability(NOCLONE)) || (target.has_disability(NOCLONE))) if(verbose) to_chat(user, "DNA of [target] is ruined beyond usability!") return diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 6bfa149aa7..29d08b4ce1 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -42,7 +42,7 @@ lose_text = "You feel smart again." /datum/brain_trauma/mild/dumbness/on_gain() - owner.disabilities |= DUMB + owner.add_disability(DUMB, TRAUMA_DISABILITY) ..() /datum/brain_trauma/mild/dumbness/on_life() @@ -54,7 +54,7 @@ ..() /datum/brain_trauma/mild/dumbness/on_lose() - owner.disabilities &= ~DUMB + owner.remove_disability(DUMB, TRAUMA_DISABILITY) owner.derpspeech = 0 ..() diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 08cee65085..a36d4b9fb8 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -12,17 +12,11 @@ lose_text = "You suddenly remember how to speak." /datum/brain_trauma/severe/mute/on_gain() - owner.disabilities |= MUTE - ..() - -//no fiddling with genetics to get out of this one -/datum/brain_trauma/severe/mute/on_life() - if(!(owner.disabilities & MUTE)) - on_gain() + owner.add_disability(MUTE, TRAUMA_DISABILITY) ..() /datum/brain_trauma/severe/mute/on_lose() - owner.disabilities &= ~MUTE + owner.remove_disability(MUTE, TRAUMA_DISABILITY) ..() /datum/brain_trauma/severe/blindness @@ -33,17 +27,11 @@ lose_text = "Your vision returns." /datum/brain_trauma/severe/blindness/on_gain() - owner.become_blind() - ..() - -//no fiddling with genetics to get out of this one -/datum/brain_trauma/severe/blindness/on_life() - if(!(owner.disabilities & BLIND)) - on_gain() + owner.become_blind(TRAUMA_DISABILITY) ..() /datum/brain_trauma/severe/blindness/on_lose() - owner.cure_blind() + owner.cure_blind(TRAUMA_DISABILITY) ..() /datum/brain_trauma/severe/paralysis @@ -109,7 +97,7 @@ stress -= 4 /datum/brain_trauma/severe/monophobia/proc/check_alone() - if(owner.disabilities & BLIND) + if(owner.has_disability(BLIND)) return TRUE for(var/mob/M in oview(owner, 7)) if(!isliving(M)) //ghosts ain't people @@ -171,9 +159,27 @@ lose_text = "You feel in control of your hands again." /datum/brain_trauma/severe/discoordination/on_gain() - owner.disabilities |= MONKEYLIKE + owner.add_disability(MONKEYLIKE, TRAUMA_DISABILITY) ..() /datum/brain_trauma/severe/discoordination/on_lose() - owner.disabilities &= ~MONKEYLIKE + owner.remove_disability(MONKEYLIKE, TRAUMA_DISABILITY) ..() +<<<<<<< HEAD +======= + +/datum/brain_trauma/severe/pacifism + name = "Traumatic Non-Violence" + desc = "Patient is extremely unwilling to harm others in violent ways." + scan_desc = "pacific syndrome" + gain_text = "You feel oddly peaceful." + lose_text = "You no longer feel compelled to not harm." + +/datum/brain_trauma/severe/pacifism/on_gain() + owner.add_disability(PACIFISM, TRAUMA_DISABILITY) + ..() + +/datum/brain_trauma/severe/pacifism/on_lose() + owner.remove_disability(PACIFISM, TRAUMA_DISABILITY) + ..() +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 728dfa01d0..39d853a758 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -58,11 +58,12 @@ Bonus M.blur_eyes(20) M.adjust_eye_damage(5) if(eyes.eye_damage >= 10) - M.become_nearsighted() + M.become_nearsighted(EYE_DAMAGE) if(prob(eyes.eye_damage - 10 + 1)) if(!remove_eyes) - if(M.become_blind()) + if(!M.has_disability(BLIND)) to_chat(M, "You go blind!") + M.become_blind(EYE_DAMAGE) else M.visible_message("[M]'s eyes fall off their sockets!", "Your eyes fall off their sockets!") eyes.Remove(M) @@ -111,16 +112,16 @@ Bonus return switch(A.stage) if(4, 5) //basically oculine - if(M.disabilities & BLIND) + if(M.has_disability(BLIND, EYE_DAMAGE)) if(prob(20)) to_chat(M, "Your vision slowly returns...") - M.cure_blind() - M.cure_nearsighted() + M.cure_blind(EYE_DAMAGE) + M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(35) - else if(M.disabilities & NEARSIGHT) + else if(M.has_disability(NEARSIGHT, EYE_DAMAGE)) to_chat(M, "The blackness in your peripheral vision fades.") - M.cure_nearsighted() + M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) else if(M.eye_blind || M.eye_blurry) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index f3a1f53dd2..0a4309e708 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -197,7 +197,7 @@ /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user) add_fingerprint(user) - if((CLUMSY in user.disabilities) && prob(50)) + if((user.has_disability(CLUMSY)) && prob(50)) to_chat(user, "You club yourself over the head with [src].") user.Knockdown(60) if(ishuman(user)) diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index 170c0a2a7f..a171cf91da 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(mutations_list) GLOB.mutations_list[name] = src /datum/mutation/human - var/dna_block var/quality var/get_chance = 100 diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 23b91add58..015004eef6 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -85,12 +85,12 @@ /datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner) if(..()) return - owner.disabilities |= CLUMSY + owner.add_disability(CLUMSY, GENETIC_MUTATION) /datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner) if(..()) return - owner.disabilities &= ~CLUMSY + owner.remove_disability(CLUMSY, GENETIC_MUTATION) //Tourettes causes you to randomly stand in place and shout. @@ -124,12 +124,12 @@ /datum/mutation/human/deaf/on_acquiring(mob/living/carbon/human/owner) if(..()) return - owner.disabilities |= DEAF + owner.add_disability(DEAF, GENETIC_MUTATION) /datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner) if(..()) return - owner.disabilities &= ~DEAF + owner.remove_disability(DEAF, GENETIC_MUTATION) //Monified turns you into a monkey. diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index dee26166dd..60f5d75c5e 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -7,12 +7,12 @@ /datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/human/owner) if(..()) return - owner.become_nearsighted() + owner.become_nearsighted(GENETIC_MUTATION) /datum/mutation/human/nearsight/on_losing(mob/living/carbon/human/owner) if(..()) return - owner.cure_nearsighted() + owner.cure_nearsighted(GENETIC_MUTATION) //Blind makes you blind. Who knew? @@ -24,12 +24,12 @@ /datum/mutation/human/blind/on_acquiring(mob/living/carbon/human/owner) if(..()) return - owner.become_blind() + owner.become_blind(GENETIC_MUTATION) /datum/mutation/human/blind/on_losing(mob/living/carbon/human/owner) if(..()) return - owner.cure_blind() + owner.cure_blind(GENETIC_MUTATION) //X-Ray Vision lets you see through walls. diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 3b4b38bbcc..dc1333024a 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -30,12 +30,12 @@ /datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner) if(..()) return - owner.disabilities |= MUTE + owner.add_disability(MUTE, GENETIC_MUTATION) /datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner) if(..()) return - owner.disabilities &= ~MUTE + owner.remove_disability(MUTE, GENETIC_MUTATION) /datum/mutation/human/smile diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 4fdd84040e..e3f486a2f1 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -20,7 +20,7 @@ to_chat(user, "We prepare our sting, use alt+click or middle mouse button on target to sting them.") var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.chosen_sting = src - + user.hud_used.lingstingdisplay.icon_state = sting_icon user.hud_used.lingstingdisplay.invisibility = 0 @@ -28,7 +28,7 @@ to_chat(user, "We retract our sting, we can't sting anyone for now.") var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.chosen_sting = null - + user.hud_used.lingstingdisplay.icon_state = null user.hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT @@ -90,7 +90,7 @@ /obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/living/carbon/target) if(!..()) return - if((target.disabilities & HUSK) || !iscarbon(target) || (NOTRANSSTING in target.dna.species.species_traits)) + if((target.has_disability(HUSK)) || !iscarbon(target) || (NOTRANSSTING in target.dna.species.species_traits)) to_chat(user, "Our sting appears ineffective against its DNA.") return 0 return 1 @@ -129,9 +129,11 @@ /obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(mob/user, mob/target) if(!..()) return - if((target.disabilities & HUSK) || !target.has_dna()) - to_chat(user, "Our sting appears ineffective against its DNA.") - return 0 + if(isliving(target)) + var/mob/living/L = target + if((L.has_disability(HUSK)) || !L.has_dna()) + to_chat(user, "Our sting appears ineffective against its DNA.") + return 0 return 1 /obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target) @@ -207,7 +209,7 @@ /obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target) add_logs(user, target, "stung", "blind sting") to_chat(target, "Your eyes burn horrifically!") - target.become_nearsighted() + target.become_nearsighted(EYE_DAMAGE) target.blind_eyes(20) target.blur_eyes(40) return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm b/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm index fc734ac426..b579326fcc 100644 --- a/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm +++ b/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm @@ -32,7 +32,7 @@ if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(src == H.glasses && !up) - if(H.disabilities & BLIND) + if(H.has_disability(BLIND)) to_chat(H, "\"You're blind, idiot. Stop embarrassing yourself.\"") return if(blind_cultist(H)) @@ -51,7 +51,7 @@ to_chat(victim, "\"It looks like Nar-Sie's dogs really don't value their eyes.\"") to_chat(victim, "Your eyes explode with horrific pain!") victim.emote("scream") - victim.become_blind() + victim.become_blind(EYE_DAMAGE) victim.adjust_blurriness(30) victim.adjust_blindness(30) return TRUE @@ -76,7 +76,7 @@ ..() if(slot != slot_glasses || up) return - if(user.disabilities & BLIND) + if(user.has_disability(BLIND)) to_chat(user, "\"You're blind, idiot. Stop embarrassing yourself.\"" ) return if(blind_cultist(user)) //Cultists instantly go blind @@ -115,11 +115,11 @@ var/obj/item/clothing/glasses/wraith_spectacles/WS = L.glasses desc = "[glasses_right && !WS.up ? "":""]You are [glasses_right ? "":"not "]wearing wraith spectacles[glasses_right && !WS.up ? "!":"."]
\ You have taken [W.eye_damage_done] eye damage from them.
" - if(L.disabilities & NEARSIGHT) + if(L.has_disability(NEARSIGHT)) desc += "You are nearsighted!
" else if(glasses_right && !WS.up) desc += "You will become nearsighted at [W.nearsight_breakpoint] eye damage.
" - if(L.disabilities & BLIND) + if(L.has_disability(BLIND)) desc += "You are blind!" else if(glasses_right && !WS.up) desc += "You will become blind at [W.blind_breakpoint] eye damage." @@ -142,8 +142,8 @@ apply_eye_damage(H) else if(GLOB.ratvar_awakens) - H.cure_nearsighted() - H.cure_blind() + H.cure_nearsighted(list(EYE_DAMAGE)) + H.cure_blind(list(EYE_DAMAGE)) H.adjust_eye_damage(-eye_damage_done) eye_damage_done = 0 else if(prob(50) && eye_damage_done) @@ -153,17 +153,20 @@ qdel(src) /datum/status_effect/wraith_spectacles/proc/apply_eye_damage(mob/living/carbon/human/H) - if(H.disabilities & BLIND) + if(H.has_disability(BLIND)) return H.adjust_eye_damage(0.5) eye_damage_done += 0.5 if(eye_damage_done >= 20) H.adjust_blurriness(2) if(eye_damage_done >= nearsight_breakpoint) - if(H.become_nearsighted()) - to_chat(H, "Your vision doubles, then trebles. Darkness begins to close in. You can't keep this up!") + if(!H.has_disability(NEARSIGHT)) + to_chat(H, "Your vision doubles, then trembles. Darkness begins to close in. You can't keep this up!") + H.become_nearsighted(EYE_DAMAGE) if(eye_damage_done >= blind_breakpoint) - if(H.become_blind()) + if(!H.has_disability(BLIND)) to_chat(H, "A piercing white light floods your vision. Suddenly, all goes dark!") + H.become_blind(EYE_DAMAGE) + if(prob(min(20, 5 + eye_damage_done))) to_chat(H, "Your eyes continue to burn.") diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm index c7aea3df7e..76e942037c 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm @@ -110,7 +110,7 @@ if(!(BI.resistance_flags & ON_FIRE)) BI.fire_act() continue - if(is_servant_of_ratvar(L) || (L.disabilities & BLIND) || L.null_rod_check()) + if(is_servant_of_ratvar(L) || (L.has_disability(BLIND)) || L.null_rod_check()) continue if(L.stat || L.restrained() || L.buckled || L.lying) continue diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 33d5f49661..8472c6c7cf 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -115,7 +115,7 @@ structure_check() searches for nearby cultist structures required for the invoca continue if(ishuman(L)) var/mob/living/carbon/human/H = L - if((H.disabilities & MUTE) || H.silent) + if((H.has_disability(MUTE)) || H.silent) continue if(L.stat) continue diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 7814e05138..c4a4d118b3 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -449,7 +449,7 @@ scantemp = "Subject's brain is not responding to scanning stimuli." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return - if((mob_occupant.disabilities & NOCLONE) && (src.scanner.scan_level < 2)) + if((mob_occupant.has_disability(NOCLONE)) && (src.scanner.scan_level < 2)) scantemp = "Subject no longer contains the fundamental materials required to create a living clone." playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) return diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 9fa196bd46..e5bd141d05 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -81,7 +81,7 @@ if(connected && connected.is_operational()) if(connected.occupant) //set occupant_status message viable_occupant = connected.occupant - if(viable_occupant.has_dna() && (!(RADIMMUNE in viable_occupant.dna.species.species_traits)) && (!(viable_occupant.disabilities & NOCLONE) || (connected.scan_level == 3))) //occupant is viable for dna modification + if(viable_occupant.has_dna() && (!(RADIMMUNE in viable_occupant.dna.species.species_traits)) && (!(viable_occupant.has_disability(NOCLONE)) || (connected.scan_level == 3))) //occupant is viable for dna modification occupant_status += "[viable_occupant.name] => " switch(viable_occupant.stat) if(CONSCIOUS) @@ -527,7 +527,7 @@ var/mob/living/carbon/viable_occupant = null if(connected) viable_occupant = connected.occupant - if(!istype(viable_occupant) || !viable_occupant.dna || (viable_occupant.disabilities & NOCLONE)) + if(!istype(viable_occupant) || !viable_occupant.dna || (viable_occupant.has_disability(NOCLONE))) viable_occupant = null return viable_occupant diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index d1189ff8b8..29df5e4949 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -100,7 +100,7 @@ var/mob/living/mob_occupant = get_mob_or_brainmob(occupant) if(istype(mob_occupant)) if(locate_computer(/obj/machinery/computer/cloning)) - if(!mob_occupant.suiciding && !(mob_occupant.disabilities & NOCLONE) && !mob_occupant.hellbound) + if(!mob_occupant.suiciding && !(mob_occupant.has_disability(NOCLONE)) && !mob_occupant.hellbound) mob_occupant.notify_ghost_cloning("Your corpse has been placed into a cloning scanner. Re-enter your corpse if you want to be cloned!", source = src) // DNA manipulators cannot operate on severed heads or brains diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a74b246282..52933c4fbe 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -536,9 +536,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) M.adjust_blurriness(15) if(M.stat != DEAD) to_chat(M, "Your eyes start to bleed profusely!") - if(!(M.disabilities & (NEARSIGHT | BLIND))) - if(M.become_nearsighted()) - to_chat(M, "You become nearsighted!") + if(!(M.has_disability(BLIND) || M.has_disability(NEARSIGHT))) + to_chat(M, "You become nearsighted!") + M.become_nearsighted(EYE_DAMAGE) if(prob(50)) if(M.stat != DEAD) if(M.drop_all_held_items()) @@ -547,8 +547,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) M.Unconscious(20) M.Knockdown(40) if (prob(eyes.eye_damage - 10 + 1)) - if(M.become_blind()) - to_chat(M, "You go blind!") + M.become_blind(EYE_DAMAGE) + to_chat(M, "You go blind!") /obj/item/clean_blood() . = ..() diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index e501e24c6a..22cd62a962 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -393,7 +393,7 @@ /obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/human/H) var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain) - return (!H.suiciding && !(H.disabilities & NOCLONE) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain) + return (!H.suiciding && !(H.has_disability(NOCLONE)) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain) /obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H) if(isliving(H.pulledby)) //CLEAR! @@ -514,7 +514,7 @@ shock_touching(30, H) var/failed - if (H.suiciding || (H.disabilities & NOCLONE)) + if (H.suiciding || (H.has_disability(NOCLONE))) failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile." else if (H.hellbound) failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile." diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index f656d55afd..7a40d8f3a2 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -48,7 +48,7 @@ add_fingerprint(user) if(istype(M) && on && user.zone_selected in list("eyes", "mouth")) - if((user.disabilities & (CLUMSY | DUMB)) && prob(50)) //too dumb to use flashlight properly + if((user.has_disability(CLUMSY) || user.has_disability(DUMB)) && prob(50)) //too dumb to use flashlight properly return ..() //just hit them in the head if(!user.IsAdvancedToolUser()) @@ -82,7 +82,7 @@ else user.visible_message("[user] directs [src] to [M]'s eyes.", \ "You direct [src] to [M]'s eyes.") - if(M.stat == DEAD || (M.disabilities & BLIND) || !M.flash_act(visual = 1)) //mob is dead or fully blind + if(M.stat == DEAD || (M.has_disability(BLIND)) || !M.flash_act(visual = 1)) //mob is dead or fully blind to_chat(user, "[M]'s pupils don't react to the light!") else if(M.dna && M.dna.check_mutation(XRAY)) //mob has X-RAY vision to_chat(user, "[M]'s pupils give an eerie glow!") diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 9a60bb0edb..6e67ca886b 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -85,7 +85,7 @@ GAS ANALYZER /obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) // Clumsiness/brain damage check - if ((user.disabilities & (CLUMSY | DUMB)) && prob(50)) + if ((user.has_disability(CLUMSY) || user.has_disability(DUMB)) && prob(50)) to_chat(user, "You stupidly try to analyze the floor's vitals!") user.visible_message("[user] has analyzed the floor's vitals!") to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy") @@ -181,9 +181,12 @@ GAS ANALYZER to_chat(user, "\t==EAR STATUS==") if(istype(ears)) var/healthy = TRUE - if(C.disabilities & DEAF) + if(C.has_disability(DEAF, GENETIC_MUTATION)) healthy = FALSE to_chat(user, "\tSubject is genetically deaf.") + else if(C.has_disability(DEAF)) + healthy = FALSE + to_chat(user, "\tSubject is deaf.") else if(ears.ear_damage) to_chat(user, "\tSubject has [ears.ear_damage > UNHEALING_EAR_DAMAGE? "permanent ": "temporary "]hearing damage.") @@ -199,10 +202,10 @@ GAS ANALYZER to_chat(user, "\t==EYE STATUS==") if(istype(eyes)) var/healthy = TRUE - if(C.disabilities & BLIND) + if(C.has_disability(BLIND)) to_chat(user, "\tSubject is blind.") healthy = FALSE - if(C.disabilities & NEARSIGHT) + if(C.has_disability(NEARSIGHT)) to_chat(user, "\tSubject is nearsighted.") healthy = FALSE if(eyes.eye_damage > 30) diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 9644d827ea..19008b43a6 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -31,7 +31,7 @@ /obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user) prepare() - if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE)) + if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.has_disability(NOCLONE))) M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2)) var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" for(var/datum/mutation/human/HM in remove_mutations) @@ -313,7 +313,7 @@ to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.") return FALSE - if(M.has_dna() && !(M.disabilities & NOCLONE)) + if(M.has_dna() && !(M.has_disability(NOCLONE))) M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2)) var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" var/endtime = world.time+duration diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index e444ecce25..257007aba9 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -24,7 +24,7 @@ qdel(src) /obj/item/grenade/proc/clown_check(mob/living/carbon/human/user) - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) to_chat(user, "Huh? How does this thing work?") preprime(user, 5, FALSE) return FALSE diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 886a248c8c..1dd2b1b1de 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -26,7 +26,7 @@ /obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user) if(!istype(C)) return - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) return diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 5a8fcda09b..0a9e356014 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -44,7 +44,7 @@ forkload = null else if(user.zone_selected == "eyes") - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) M = user return eyestab(M,user) else @@ -70,7 +70,7 @@ /obj/item/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user) if(user.zone_selected == "eyes") - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) M = user return eyestab(M,user) else diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 6e21251b6e..6fb173b905 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -99,7 +99,7 @@ return ..() add_fingerprint(user) - if((CLUMSY in user.disabilities) && prob(50)) + if((user.has_disability(CLUMSY)) && prob(50)) to_chat(user, "You club yourself over the head.") user.Knockdown(60 * force) if(ishuman(user)) diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index b63c5bcefa..94f7de09bc 100644 --- a/code/game/objects/items/melee/transforming.dm +++ b/code/game/objects/items/melee/transforming.dm @@ -72,6 +72,6 @@ to_chat(user, "[src] [active ? "is now active":"can now be concealed"].") /obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user) - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_bodypart_damage(5,5) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 9bf0b949c0..b901d04815 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -147,7 +147,7 @@ if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") return - if(user.disabilities & CLUMSY && prob(75) && clumsyCheck) + if(user.has_disability(CLUMSY) && prob(75) && clumsyCheck) user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") user.dropItemToGround(src, TRUE) if(prob(10)) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 57306f498c..a746ed1778 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/item/shield name = "shield" block_chance = 50 @@ -140,3 +141,147 @@ slot_flags = null to_chat(user, "[src] can now be concealed.") add_fingerprint(user) +======= +/obj/item/shield + name = "shield" + block_chance = 50 + armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 80, acid = 70) + +/obj/item/shield/riot + name = "riot shield" + desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "riot" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + slot_flags = SLOT_BACK + force = 10 + throwforce = 5 + throw_speed = 2 + throw_range = 3 + w_class = WEIGHT_CLASS_BULKY + materials = list(MAT_GLASS=7500, MAT_METAL=1000) + attack_verb = list("shoved", "bashed") + var/cooldown = 0 //shield bash cooldown. based on world.time + + +/obj/item/shield/riot/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/melee/baton)) + if(cooldown < world.time - 25) + user.visible_message("[user] bashes [src] with [W]!") + playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) + cooldown = world.time + else + return ..() + +/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(attack_type == THROWN_PROJECTILE_ATTACK) + final_block_chance += 30 + if(attack_type == LEAP_ATTACK) + final_block_chance = 100 + return ..() + +/obj/item/shield/riot/roman + name = "roman shield" + desc = "Bears an inscription on the inside: \"Romanes venio domus\"." + icon_state = "roman_shield" + item_state = "roman_shield" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + +/obj/item/shield/riot/buckler + name = "wooden buckler" + desc = "A medieval wooden buckler." + icon_state = "buckler" + item_state = "buckler" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + materials = list() + resistance_flags = FLAMMABLE + block_chance = 30 + +/obj/item/shield/energy + name = "energy combat shield" + desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "eshield0" // eshield1 for expanded + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + force = 3 + throwforce = 3 + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_TINY + attack_verb = list("shoved", "bashed") + var/active = 0 + +/obj/item/shield/energy/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 0 + +/obj/item/shield/energy/IsReflect() + return (active) + +/obj/item/shield/energy/attack_self(mob/living/carbon/human/user) + if(user.has_disability(CLUMSY) && prob(50)) + to_chat(user, "You beat yourself in the head with [src].") + user.take_bodypart_damage(5) + active = !active + icon_state = "eshield[active]" + + if(active) + force = 10 + throwforce = 8 + throw_speed = 2 + w_class = WEIGHT_CLASS_BULKY + playsound(user, 'sound/weapons/saberon.ogg', 35, 1) + to_chat(user, "[src] is now active.") + else + force = 3 + throwforce = 3 + throw_speed = 3 + w_class = WEIGHT_CLASS_TINY + playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) + to_chat(user, "[src] can now be concealed.") + add_fingerprint(user) + +/obj/item/shield/riot/tele + name = "telescopic shield" + desc = "An advanced riot shield made of lightweight materials that collapses for easy storage." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "teleriot0" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + slot_flags = null + force = 3 + throwforce = 3 + throw_speed = 3 + throw_range = 4 + w_class = WEIGHT_CLASS_NORMAL + var/active = 0 + +/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(active) + return ..() + return 0 + +/obj/item/shield/riot/tele/attack_self(mob/living/user) + active = !active + icon_state = "teleriot[active]" + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) + + if(active) + force = 8 + throwforce = 5 + throw_speed = 2 + w_class = WEIGHT_CLASS_BULKY + slot_flags = SLOT_BACK + to_chat(user, "You extend \the [src].") + else + force = 3 + throwforce = 3 + throw_speed = 3 + w_class = WEIGHT_CLASS_NORMAL + slot_flags = null + to_chat(user, "[src] can now be concealed.") + add_fingerprint(user) +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index ef04fc48f5..a06d1a509e 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", to_chat(user, "You don't have the dexterity to do this!") return - if (user.disabilities & CLUMSY && prob(50)) + if (user.has_disability(CLUMSY) && prob(50)) to_chat(user, "[src] slips out of your hand and hits your head.") user.take_bodypart_damage(10) user.Unconscious(400) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index ab82f92c2d..128a313525 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -108,7 +108,7 @@ add_fingerprint(user) /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user) - if(status && user.disabilities & CLUMSY && prob(50)) + if(status && user.has_disability(CLUMSY) && prob(50)) user.visible_message("[user] accidentally hits themself with [src]!", \ "You accidentally hit yourself with [src]!") user.Knockdown(stunforce*3) diff --git a/code/game/objects/items/teleprod.dm b/code/game/objects/items/teleprod.dm index 92e7a8e9ba..c780d32917 100644 --- a/code/game/objects/items/teleprod.dm +++ b/code/game/objects/items/teleprod.dm @@ -8,7 +8,7 @@ /obj/item/melee/baton/cattleprod/teleprod/attack(mob/living/carbon/M, mob/living/carbon/user)//handles making things teleport when hit ..() - if(status && user.disabilities & CLUMSY && prob(50)) + if(status && user.has_disability(CLUMSY) && prob(50)) user.visible_message("[user] accidentally hits themself with [src]!", \ "You accidentally hit yourself with [src]!") if(do_teleport(user, get_turf(user), 50))//honk honk diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 08f22b7e46..8fd37a3b38 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -75,7 +75,7 @@ return ..() if(user.zone_selected != "eyes" && user.zone_selected != "head") return ..() - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) M = user return eyestab(M,user) @@ -105,7 +105,7 @@ item_state = "drill" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) //done for balance reasons, making them high value for research, but harder to get + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change w_class = WEIGHT_CLASS_SMALL throwforce = 8 diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index c11d41eaa8..dc61944b4f 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -302,7 +302,7 @@ unwield() return ..() - if(user.disabilities & CLUMSY && (wielded) && prob(40)) + if(user.has_disability(CLUMSY) && (wielded) && prob(40)) impale(user) return if((wielded) && prob(50)) diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index 36233bc155..d2bee1af36 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -17,7 +17,7 @@ L.buckled.unbuckle_mob(L,force=1) L.visible_message("[L]'s skin rapidly turns to marble!", "Your body freezes up! Can't... move... can't... think...") L.forceMove(src) - L.disabilities |= MUTE + L.add_disability(MUTE, STATUE_MUTE) L.faction += "mimic" //Stops mimics from instaqdeling people in statues L.status_flags |= GODMODE obj_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues @@ -59,7 +59,7 @@ if(petrified_mob) petrified_mob.status_flags &= ~GODMODE petrified_mob.forceMove(loc) - petrified_mob.disabilities &= ~MUTE + petrified_mob.remove_disability(MUTE, STATUE_MUTE) petrified_mob.take_overall_damage((petrified_mob.health - obj_integrity + 100)) //any new damage the statue incurred is transfered to the mob petrified_mob.faction -= "mimic" petrified_mob = null diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 81f2c75660..8feff99df4 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -30,7 +30,7 @@ holder.update_icon() /obj/item/device/assembly/flash/proc/clown_check(mob/living/carbon/human/user) - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) flash_carbon(user, user, 15, 0) return 0 return 1 diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index e8ee742e56..ca697cdbf6 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/item/device/assembly/mousetrap name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." @@ -140,3 +141,147 @@ /obj/item/device/assembly/mousetrap/armed icon_state = "mousetraparmed" armed = TRUE +======= +/obj/item/device/assembly/mousetrap + name = "mousetrap" + desc = "A handy little spring-loaded trap for catching pesty rodents." + icon_state = "mousetrap" + materials = list(MAT_METAL=100) + attachable = 1 + var/armed = 0 + + +/obj/item/device/assembly/mousetrap/examine(mob/user) + ..() + if(armed) + to_chat(user, "The mousetrap is armed!") + else + to_chat(user, "The mousetrap is not armed.") + +/obj/item/device/assembly/mousetrap/activate() + if(..()) + armed = !armed + if(!armed) + if(ishuman(usr)) + var/mob/living/carbon/human/user = usr + if((user.has_disability(DUMB) || user.has_disability(CLUMSY)) && prob(50)) + to_chat(user, "Your hand slips, setting off the trigger!") + pulse(0) + update_icon() + if(usr) + playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + +/obj/item/device/assembly/mousetrap/describe() + return "The pressure switch is [armed?"primed":"safe"]." + +/obj/item/device/assembly/mousetrap/update_icon() + if(armed) + icon_state = "mousetraparmed" + else + icon_state = "mousetrap" + if(holder) + holder.update_icon() + +/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet") + if(!armed) + return + var/obj/item/bodypart/affecting = null + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(PIERCEIMMUNE in H.dna.species.species_traits) + playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + armed = 0 + update_icon() + pulse(0) + return 0 + switch(type) + if("feet") + if(!H.shoes) + affecting = H.get_bodypart(pick("l_leg", "r_leg")) + H.Knockdown(60) + if("l_hand", "r_hand") + if(!H.gloves) + affecting = H.get_bodypart(type) + H.Stun(60) + if(affecting) + if(affecting.receive_damage(1, 0)) + H.update_damage_overlays() + else if(ismouse(target)) + var/mob/living/simple_animal/mouse/M = target + visible_message("SPLAT!") + M.splat() + playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + armed = 0 + update_icon() + pulse(0) + + +/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user) + if(!armed) + to_chat(user, "You arm [src].") + else + if((user.has_disability(DUMB) || user.has_disability(CLUMSY)) && prob(50)) + var/which_hand = "l_hand" + if(!(user.active_hand_index % 2)) + which_hand = "r_hand" + triggered(user, which_hand) + user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ + "You accidentally trigger [src]!") + return + to_chat(user, "You disarm [src].") + armed = !armed + update_icon() + playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + + +/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user) + if(armed) + if((user.has_disability(DUMB) || user.has_disability(CLUMSY)) && prob(50)) + var/which_hand = "l_hand" + if(!(user.active_hand_index % 2)) + which_hand = "r_hand" + triggered(user, which_hand) + user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ + "You accidentally trigger [src]!") + return + ..() + + +/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj) + if(armed) + if(ismob(AM)) + var/mob/MM = AM + if(!(MM.movement_type & FLYING)) + if(ishuman(AM)) + var/mob/living/carbon/H = AM + if(H.m_intent == MOVE_INTENT_RUN) + triggered(H) + H.visible_message("[H] accidentally steps on [src].", \ + "You accidentally step on [src]") + else if(ismouse(MM)) + triggered(MM) + else if(AM.density) // For mousetrap grenades, set off by anything heavy + triggered(AM) + ..() + + +/obj/item/device/assembly/mousetrap/on_found(mob/finder) + if(armed) + finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ + "You accidentally trigger [src]!") + triggered(finder, (finder.active_hand_index % 2 == 0) ? "r_hand" : "l_hand") + return 1 //end the search! + return 0 + + +/obj/item/device/assembly/mousetrap/hitby(A as mob|obj) + if(!armed) + return ..() + visible_message("[src] is triggered by [A].") + triggered(null) + + +/obj/item/device/assembly/mousetrap/armed + icon_state = "mousetraparmed" + armed = 1 +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 29990a299b..ddb1cf5545 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -41,7 +41,7 @@ /obj/item/clothing/glasses/proc/thermal_overload() if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc - if(!(H.disabilities & BLIND)) + if(!(H.has_disability(BLIND))) if(H.glasses == src) to_chat(H, "[src] overloads and blinds you!") H.flash_act(visual = 1) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index eb7625e08c..db2b1ee561 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -41,6 +41,7 @@ continue var/datum/disease/D +<<<<<<< HEAD if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. if(!H.dna || (H.disabilities & BLIND)) //A blindness disease would be the worst. continue @@ -49,6 +50,19 @@ DS.strain_data["name"] = H.real_name DS.strain_data["UI"] = H.dna.uni_identity DS.strain_data["SE"] = H.dna.struc_enzymes +======= + if(!advanced_virus) + if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. + if(!H.dna || (H.has_disability(BLIND))) //A blindness disease would be the worst. + continue + D = new virus_type() + var/datum/disease/dnaspread/DS = D + DS.strain_data["name"] = H.real_name + DS.strain_data["UI"] = H.dna.uni_identity + DS.strain_data["SE"] = H.dna.struc_enzymes + else + D = new virus_type() +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) else D = new virus_type() D.carrier = TRUE diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 9d6d522c11..c8c042e30b 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -656,7 +656,7 @@ playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000)) /obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user) - if(user.disabilities & CLUMSY && prob(50)) + if(user.has_disability(CLUMSY) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_bodypart_damage(10) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 45f26d55c3..c1ea547b34 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -16,7 +16,7 @@ /mob/living/carbon/monkey/handle_blood() - if(bodytemperature >= 225 && !(disabilities & NOCLONE)) //cryosleep or husked people do not pump the blood. + if(bodytemperature >= 225 && !(has_disability(NOCLONE))) //cryosleep or husked people do not pump the blood. //Blood regeneration if there is some space if(blood_volume < BLOOD_VOLUME_NORMAL) blood_volume += 0.1 // regenerate blood VERY slowly @@ -28,7 +28,7 @@ bleed_rate = 0 return - if(bodytemperature >= 225 && !(disabilities & NOCLONE)) //cryosleep or husked people do not pump the blood. + if(bodytemperature >= 225 && !(has_disability(NOCLONE))) //cryosleep or husked people do not pump the blood. //Blood regeneration if there is some space if(blood_volume < BLOOD_VOLUME_NORMAL && !(NOHUNGER in dna.species.species_traits)) @@ -201,13 +201,13 @@ return "blood" /mob/living/carbon/monkey/get_blood_id() - if(!(disabilities & NOCLONE)) + if(!(has_disability(NOCLONE))) return "blood" /mob/living/carbon/human/get_blood_id() if(dna.species.exotic_blood) return dna.species.exotic_blood - else if((NOBLOOD in dna.species.species_traits) || (disabilities & NOCLONE)) + else if((NOBLOOD in dna.species.species_traits) || (has_disability(NOCLONE))) return return "blood" diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index db48302f49..c745de747e 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -79,8 +79,8 @@ if(!brainmob.stored_dna) brainmob.stored_dna = new /datum/dna/stored(brainmob) C.dna.copy_dna(brainmob.stored_dna) - if(L.disabilities & NOCLONE) - brainmob.disabilities |= NOCLONE //This is so you can't just decapitate a husked guy and clone them without needing to get a new body + if(L.has_disability(NOCLONE)) + brainmob.disabilities[NOCLONE] = L.disabilities[NOCLONE] var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE) if(ZI) brainmob.set_species(ZI.old_species) //For if the brain is cloned diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index edb82e7ad4..4b2a6f64d5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -157,6 +157,11 @@ if(!throwable_mob.buckled) thrown_thing = throwable_mob stop_pulling() +<<<<<<< HEAD +======= + if(has_disability(PACIFISM)) + to_chat(src, "You gently let go of [throwable_mob].") +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/end_T = get_turf(target) if(start_T && end_T) @@ -168,6 +173,13 @@ thrown_thing = I dropItemToGround(I) +<<<<<<< HEAD +======= + if(has_disability(PACIFISM) && I.throwforce) + to_chat(src, "You set [I] down gently on the ground.") + return + +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(thrown_thing) visible_message("[src] has thrown [thrown_thing].") add_logs(src, thrown_thing, "has thrown") @@ -403,7 +415,7 @@ dropItemToGround(I) var/modifier = 0 - if(disabilities & CLUMSY) + if(has_disability(CLUMSY)) modifier -= 40 //Clumsy people are more likely to hit themselves -Honk! switch(rand(1,100)+modifier) //91-100=Nothing special happens @@ -512,7 +524,7 @@ health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute update_stat() if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD ) - become_husk() + become_husk("burn") med_hud_set_health() /mob/living/carbon/update_sight() diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 0bfa287a09..a6d4f3536b 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -306,11 +306,15 @@ if(eyes.eye_damage > 20) if(prob(eyes.eye_damage - 20)) - if(become_nearsighted()) + if(!has_disability(NEARSIGHT)) to_chat(src, "Your eyes start to burn badly!") + become_nearsighted(EYE_DAMAGE) + else if(prob(eyes.eye_damage - 25)) - if(become_blind()) + if(!has_disability(BLIND)) to_chat(src, "You can't see anything!") + become_blind(EYE_DAMAGE) + else to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!") if(has_bane(BANE_LIGHT)) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 4b1afe0780..4453c33436 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -48,7 +48,7 @@ /mob/living/carbon/proc/Drain() - become_husk() - disabilities |= NOCLONE + become_husk(CHANGELING_DRAIN) + add_disability(NOCLONE, CHANGELING_DRAIN) blood_volume = 0 return 1 diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index a515ef23b1..7cdcad35bb 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -140,8 +140,13 @@ return ..() /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0) +<<<<<<< HEAD if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling)) vore_attack(user, pulling) +======= + if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (has_disability(FAT)) && ismonkey(pulling)) + devour_mob(pulling) +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) else ..() diff --git a/code/modules/mob/living/carbon/human/interactive.dm b/code/modules/mob/living/carbon/human/interactive.dm index 38dfad5787..8c913349c5 100644 --- a/code/modules/mob/living/carbon/human/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive.dm @@ -339,7 +339,7 @@ if(TRAITS & TRAIT_SMART) smartness = 75 else if(TRAITS & TRAIT_DUMB) - disabilities |= CLUMSY + add_disability(CLUMSY, GENETIC_MUTATION) smartness = 25 if(TRAITS & TRAIT_MEAN) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 4f41c2d40c..640447fc4d 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -187,7 +187,7 @@ if(G.tint) update_tint() if(G.vision_correction) - if(disabilities & NEARSIGHT) + if(has_disability(NEARSIGHT)) overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) adjust_eye_damage(0) if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0b02a2c711..1f30562dcf 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!HD) //Decapitated return - if(H.disabilities & HUSK) + if(H.has_disability(HUSK)) return var/datum/sprite_accessory/S var/list/standing = list() @@ -453,7 +453,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/obj/item/bodypart/head/HD = H.get_bodypart("head") - if(HD && !(H.disabilities & HUSK)) + if(HD && !(H.has_disability(HUSK))) // lipstick if(H.lip_style && (LIPS in species_traits)) var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[H.lip_style]", -BODY_LAYER) @@ -724,7 +724,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(S.center) accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y) - if(!(H.disabilities & HUSK)) + if(!(H.has_disability(HUSK))) if(!forced_colour) switch(S.color_src) if(MUTCOLORS) @@ -1103,16 +1103,16 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/handle_digestion(mob/living/carbon/human/H) //The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with - if(H.disabilities & FAT)//I share your pain, past coder. + if(H.has_disability(FAT))//I share your pain, past coder. if(H.overeatduration < 100) to_chat(H, "You feel fit again!") - H.disabilities &= ~FAT + H.remove_disability(FAT, OBESITY) H.update_inv_w_uniform() H.update_inv_wear_suit() else if(H.overeatduration > 500) to_chat(H, "You suddenly feel blubbery!") - H.disabilities |= FAT + H.add_disability(FAT, OBESITY) H.update_inv_w_uniform() H.update_inv_wear_suit() @@ -1269,7 +1269,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) . += (health_deficiency / 25) if((hungry >= 70) && !flight) //Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares. . += hungry / 50 - if(H.disabilities & FAT) + if(H.has_disability(FAT)) . += (1.5 - flight) if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR @@ -1315,6 +1315,12 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) +<<<<<<< HEAD +======= + if(user.has_disability(PACIFISM)) + to_chat(user, "You don't want to harm [target]!") + return FALSE +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(target.check_block()) target.visible_message("[target] blocks [user]'s attack!") return 0 diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index d2c83fa39f..25be12a0ff 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -725,7 +725,7 @@ /obj/structure/cloth_pile/proc/revive() if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime return - if(cloth_golem.suiciding || cloth_golem.disabilities & NOCLONE) + if(cloth_golem.suiciding || cloth_golem.has_disability(NOCLONE)) QDEL_NULL(cloth_golem) return diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index aca6973355..cf3d676e90 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/code/modules/mob/living/carbon/human/status_procs.dm @@ -11,12 +11,12 @@ amount = dna.species.spec_stun(src,amount) return ..() -/mob/living/carbon/human/cure_husk() +/mob/living/carbon/human/cure_husk(list/sources) . = ..() if(.) update_hair() -/mob/living/carbon/human/become_husk() +/mob/living/carbon/human/become_husk(source) if(istype(dna.species, /datum/species/skeleton)) //skeletons shouldn't be husks. cure_husk() return diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7264e9ad95..14f294fd90 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -609,7 +609,7 @@ generate/load female uniform sprites matching all previously decided variables if(BP.dmg_overlay_type) . += "-[BP.dmg_overlay_type]" - if(disabilities & HUSK) + if(has_disability(HUSK)) . += "-husk" /mob/living/carbon/human/load_limb_from_cache() diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index d6afdbdbc2..089a242347 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -120,7 +120,14 @@ /mob/living/carbon/monkey/proc/should_target(var/mob/living/L) if(L == src) +<<<<<<< HEAD return 0 +======= + return FALSE + + if(has_disability(PACIFISM)) + return FALSE +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(enemies[L]) return 1 diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index 5a4ba686b2..87058ce76d 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -19,7 +19,7 @@ if(!HD) //Decapitated return - if(disabilities & HUSK) + if(has_disability(HUSK)) return var/hair_hidden = 0 diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index e46ae2f8e6..74385b895c 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -64,43 +64,8 @@ /mob/living/carbon/set_disgust(amount) disgust = Clamp(amount, 0, DISGUST_LEVEL_MAXEDOUT) -/mob/living/carbon/cure_blind() - if(disabilities & BLIND) - disabilities &= ~BLIND - adjust_blindness(-1) - return 1 -/mob/living/carbon/become_blind() - if(!(disabilities & BLIND)) - disabilities |= BLIND - blind_eyes(1) - return 1 -/mob/living/carbon/cure_nearsighted() - if(disabilities & NEARSIGHT) - disabilities &= ~NEARSIGHT - clear_fullscreen("nearsighted") - return 1 - -/mob/living/carbon/become_nearsighted() - if(!(disabilities & NEARSIGHT)) - disabilities |= NEARSIGHT - overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) - return 1 - -/mob/living/carbon/cure_husk() - if(disabilities & HUSK) - disabilities &= ~HUSK - status_flags &= ~DISFIGURED - update_body() - return 1 - -/mob/living/carbon/become_husk() - if(disabilities & HUSK) - return - disabilities |= HUSK - status_flags |= DISFIGURED //makes them unknown - update_body() - return 1 +////////////////////////////////////////TRAUMAS///////////////////////////////////////// /mob/living/carbon/proc/get_traumas() . = list() diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 701fa0c7bc..5034abfbbe 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -290,7 +290,7 @@ else . += "-robotic" - if(disabilities & HUSK) + if(has_disability(HUSK)) . += "-husk" diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 0aafef753f..b8423cdc46 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -126,7 +126,7 @@ /mob/living/proc/handle_disabilities() //Eyes if(eye_blind) //blindness, heals slowly over time - if(!stat && !(disabilities & BLIND)) + if(!stat && !(has_disability(BLIND))) eye_blind = max(eye_blind-1,0) if(client && !eye_blind) clear_alert("blind") @@ -137,6 +137,12 @@ eye_blurry = max(eye_blurry-1, 0) if(client && !eye_blurry) clear_fullscreen("blurry") +<<<<<<< HEAD +======= + if(has_disability(PACIFISM) && a_intent == INTENT_HARM) + to_chat(src, "You don't feel like harming anybody.") + a_intent_change(INTENT_HELP) +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) /mob/living/proc/update_damage_hud() return diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f589ecbb20..24985f54a6 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -406,7 +406,6 @@ cure_nearsighted() cure_blind() cure_husk() - disabilities = 0 hallucination = 0 heal_overall_damage(100000, 100000, 0, 0, 1) //heal brute and burn dmg on both organic and robotic limbs, and update health right away. ExtinguishMob() @@ -812,6 +811,12 @@ if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser()) to_chat(src, "You don't have the dexterity to do this!") return FALSE +<<<<<<< HEAD +======= + if(has_disability(PACIFISM)) + to_chat(src, "You don't want to risk harming anyone!") + return FALSE +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) return TRUE /mob/living/carbon/proc/update_stamina() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index f77c65225f..d99ce1b014 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -134,7 +134,16 @@ if(!(status_flags & CANPUSH)) to_chat(user, "[src] can't be grabbed more aggressively!") +<<<<<<< HEAD return 0 +======= + return FALSE + + if(user.has_disability(PACIFISM)) + to_chat(user, "You don't want to risk hurting [src]!") + return FALSE + +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) grippedby(user) //proc to upgrade a simple pull into a more aggressive grab. @@ -188,6 +197,13 @@ M.Feedstop() return // can't attack while eating! +<<<<<<< HEAD +======= + if(has_disability(PACIFISM)) + to_chat(M, "You don't want to hurt anyone!") + return FALSE + +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if (stat != DEAD) add_logs(M, src, "attacked") M.do_attack_animation(src) @@ -201,6 +217,13 @@ M.visible_message("\The [M] [M.friendly] [src]!") return 0 else +<<<<<<< HEAD +======= + if(M.has_disability(PACIFISM)) + to_chat(M, "You don't want to hurt anyone!") + return FALSE + +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) M.do_attack_animation(src) @@ -216,6 +239,13 @@ return 0 if (M.a_intent == INTENT_HARM) +<<<<<<< HEAD +======= + if(M.has_disability(PACIFISM)) + to_chat(M, "You don't want to hurt anyone!") + return FALSE + +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH)) to_chat(M, "You can't bite with your mouth covered!") return 0 @@ -238,6 +268,13 @@ return 0 else +<<<<<<< HEAD +======= + if(L.has_disability(PACIFISM)) + to_chat(L, "You don't want to hurt anyone!") + return + +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) L.do_attack_animation(src) if(prob(90)) add_logs(L, src, "attacked") @@ -260,6 +297,12 @@ grabbedby(M) return 0 if("harm") +<<<<<<< HEAD +======= + if(M.has_disability(PACIFISM)) + to_chat(M, "You don't want to hurt anyone!") + return FALSE +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) M.do_attack_animation(src) return 1 if("disarm") @@ -347,7 +390,7 @@ //called when the mob receives a bright flash /mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash) - if(get_eye_protection() < intensity && (override_blindness_check || !(disabilities & BLIND))) + if(get_eye_protection() < intensity && (override_blindness_check || !(has_disability(BLIND)))) overlay_fullscreen("flash", type) addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25) return 1 diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 50f2ce4db0..6990262409 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -26,6 +26,8 @@ var/incorporeal_move = FALSE //FALSE is off, INCORPOREAL_MOVE_BASIC is normal, INCORPOREAL_MOVE_SHADOW is for ninjas //and INCORPOREAL_MOVE_JAUNT is blocked by holy water/salt + var/list/disabilities = list() + var/list/surgeries = list() //a list of surgery datums. generally empty, they're added when the player wants them. var/now_pushing = null //used by living/Collide() and living/PushAM() to prevent potential infinite loop. diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index b1d0484086..e21c21453a 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -285,7 +285,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels - if(disabilities & MUTE) + if(has_disability(MUTE)) return 0 if(is_muzzled()) 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 58e3e0837b..b8b419087f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -558,7 +558,7 @@ Difficulty: Very Hard H.regenerate_limbs() H.regenerate_organs() H.revive(1,0) - H.disabilities |= NOCLONE //Free revives, but significantly limits your options for reviving except via the crystal + H.add_disability(NOCLONE, MAGIC_DISABILITY) //Free revives, but significantly limits your options for reviving except via the crystal H.grab_ghost(force = TRUE) /obj/machinery/anomalous_crystal/helpers //Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans @@ -719,7 +719,7 @@ Difficulty: Very Hard if(isliving(A) && holder_animal) var/mob/living/L = A L.notransform = 1 - L.disabilities |= MUTE + L.add_disability(MUTE, STASIS_MUTE) L.status_flags |= GODMODE L.mind.transfer_to(holder_animal) var/obj/effect/proc_holder/spell/targeted/exit_possession/P = new /obj/effect/proc_holder/spell/targeted/exit_possession @@ -729,7 +729,7 @@ Difficulty: Very Hard /obj/structure/closet/stasis/dump_contents(var/kill = 1) STOP_PROCESSING(SSobj, src) for(var/mob/living/L in src) - L.disabilities &= ~MUTE + L.remove_disability(MUTE, STASIS_MUTE) L.status_flags &= ~GODMODE L.notransform = 0 if(holder_animal) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 3d50f03e17..0149c98a3e 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -137,3 +137,76 @@ to_chat(src, "[priority_absorb_key["self_message"]]") priority_absorb_key["stuns_absorbed"] += amount return TRUE + +/////////////////////////////////// DISABILITIES //////////////////////////////////// + +/mob/living/proc/add_disability(disability, source) + if(!disabilities[disability]) + disabilities[disability] = list(source) + else + disabilities[disability] |= list(source) + +/mob/living/proc/remove_disability(disability, list/sources) + if(!disabilities[disability]) + return + + if(LAZYLEN(sources)) + for(var/S in sources) + if(S in disabilities[disability]) + disabilities[disability] -= S + else + disabilities[disability] = list() + + if(!LAZYLEN(disabilities[disability])) + disabilities -= disability + +/mob/living/proc/has_disability(disability, list/sources) + if(!disabilities[disability]) + return FALSE + + . = FALSE + + if(LAZYLEN(sources)) + for(var/S in sources) + if(S in disabilities[disability]) + return TRUE + else + if(LAZYLEN(disabilities[disability])) + return TRUE + +/mob/living/proc/remove_all_disabilities() + disabilities = list() + +/////////////////////////////////// DISABILITY PROCS //////////////////////////////////// + +/mob/living/proc/cure_blind(list/sources) + remove_disability(BLIND, sources) + if(!has_disability(BLIND)) + adjust_blindness(-1) + +/mob/living/proc/become_blind(source) + if(!has_disability(BLIND)) + blind_eyes(1) + add_disability(BLIND, source) + +/mob/living/proc/cure_nearsighted(list/sources) + remove_disability(NEARSIGHT, sources) + if(!has_disability(NEARSIGHT)) + clear_fullscreen("nearsighted") + +/mob/living/proc/become_nearsighted(source) + if(!has_disability(NEARSIGHT)) + overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) + add_disability(NEARSIGHT, source) + +/mob/living/proc/cure_husk(list/sources) + remove_disability(HUSK, sources) + if(!has_disability(HUSK)) + status_flags &= ~DISFIGURED + update_body() + +/mob/living/proc/become_husk(source) + if(!has_disability(HUSK)) + status_flags |= DISFIGURED //makes them unknown + update_body() + add_disability(HUSK, source) \ No newline at end of file diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index edbf11654b..ecbaea015f 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -32,7 +32,6 @@ var/obj/machinery/machine = null var/other_mobs = null - var/disabilities = 0 //Carbon var/atom/movable/pulling = null var/grab_state = 0 diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index 80ab6929d5..8dfadf70f5 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -160,8 +160,12 @@ overlay_fullscreen("blind", /obj/screen/fullscreen/blind) else if(eye_blind) var/blind_minimum = 0 - if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND)) + if((stat != CONSCIOUS && stat != SOFT_CRIT)) blind_minimum = 1 + if(isliving(src)) + var/mob/living/L = src + if(L.has_disability(BLIND)) + blind_minimum = 1 eye_blind = max(eye_blind+amount, blind_minimum) if(!eye_blind) clear_alert("blind") @@ -177,8 +181,12 @@ overlay_fullscreen("blind", /obj/screen/fullscreen/blind) else if(eye_blind) var/blind_minimum = 0 - if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND)) + if(stat != CONSCIOUS && stat != SOFT_CRIT) blind_minimum = 1 + if(isliving(src)) + var/mob/living/L = src + if(L.has_disability(BLIND)) + blind_minimum = 1 eye_blind = blind_minimum if(!eye_blind) clear_alert("blind") @@ -227,31 +235,6 @@ /mob/proc/set_disgust(amount) return -/////////////////////////////////// BLIND DISABILITY //////////////////////////////////// - -/mob/proc/cure_blind() //when we want to cure the BLIND disability only. - return - -/mob/proc/become_blind() - return - -/////////////////////////////////// NEARSIGHT DISABILITY //////////////////////////////////// - -/mob/proc/cure_nearsighted() - return - -/mob/proc/become_nearsighted() - return - - -//////////////////////////////// HUSK DISABILITY ///////////////////////////: - -/mob/proc/cure_husk() - return - -/mob/proc/become_husk() - return - diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 1fb1846f4c..00fbcdc6f7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -93,7 +93,7 @@ return if(ishuman(usr)) var/mob/living/carbon/human/H = usr - if(H.disabilities & CLUMSY && prob(25)) + if(H.has_disability(CLUMSY) && prob(25)) to_chat(H, "You cut yourself on the paper! Ahhhh! Ahhhhh!") H.damageoverlaytemp = 9001 H.update_damage_hud() @@ -317,7 +317,7 @@ to_chat(user, "You stamp the paper with your rubber stamp.") if(P.is_hot()) - if(user.disabilities & CLUMSY && prob(10)) + if(user.has_disability(CLUMSY) && prob(10)) user.visible_message("[user] accidentally ignites themselves!", \ "You miss the paper and accidentally light yourself on fire!") user.dropItemToGround(P) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index 2d5fcc6e3a..17e2fe2a00 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -65,7 +65,7 @@ update_icon() else if(P.is_hot()) - if(user.disabilities & CLUMSY && prob(10)) + if(user.has_disability(CLUMSY) && prob(10)) user.visible_message("[user] accidentally ignites themselves!", \ "You miss [src] and accidentally light yourself on fire!") user.dropItemToGround(P) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 42e1352b2d..e93f298999 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -158,7 +158,7 @@ //Exclude lasertag guns from the CLUMSY check. if(clumsy_check) if(istype(user)) - if (user.disabilities & CLUMSY && prob(40)) + if (user.has_disability(CLUMSY) && prob(40)) to_chat(user, "You shoot yourself in the foot with [src]!") var/shot_leg = pick("l_leg", "r_leg") process_fire(user,user,0,params, zone_override = shot_leg) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 4dafbc3f3c..aeceb041c6 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -351,7 +351,7 @@ clumsy_check = 0 /obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user) - if((user.disabilities & CLUMSY) || (user.mind && user.mind.assigned_role == "Clown")) + if((user.has_disability(CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown")) return ..() if(process_fire(user, user, 0, zone_override = "head")) user.visible_message("[user] somehow manages to shoot [user.p_them()]self in the face!", "You somehow shoot yourself in the face! How the hell?!") diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index faf7de9010..6cbe2de450 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -129,7 +129,7 @@ // A gun with ultra-honk pin is useful for clown and useless for everyone else. /obj/item/device/firing_pin/clown/ultra/pin_auth(mob/living/user) playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) - if(!(user.disabilities & CLUMSY) && !(user.mind && user.mind.assigned_role == "Clown")) + if(!(user.has_disability(CLUMSY)) && !(user.mind && user.mind.assigned_role == "Clown")) return 0 return 1 diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index b62afb80c0..b164fc0696 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -70,7 +70,7 @@ //nothing if(21 to INFINITY) if(prob(current_cycle-10)) - M.cure_nearsighted() + M.cure_nearsighted(list(EYE_DAMAGE)) ..() return diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index ddb08db032..03134784a4 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -44,7 +44,7 @@ M.adjustToxLoss(-5, 0) M.hallucination = 0 M.setBrainLoss(0) - M.disabilities = 0 + M.remove_all_disabilities() M.set_blurriness(0) M.set_blindness(0) M.SetKnockdown(0, 0) @@ -667,16 +667,16 @@ var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) if (!eyes) return - if(M.disabilities & BLIND) + if(M.has_disability(BLIND, EYE_DAMAGE)) if(prob(20)) to_chat(M, "Your vision slowly returns...") - M.cure_blind() - M.cure_nearsighted() + M.cure_blind(EYE_DAMAGE) + M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(35) - else if(M.disabilities & NEARSIGHT) + else if(M.has_disability(NEARSIGHT, EYE_DAMAGE)) to_chat(M, "The blackness in your peripheral vision fades.") - M.cure_nearsighted() + M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) else if(M.eye_blind || M.eye_blurry) M.set_blindness(0) @@ -765,7 +765,7 @@ M.visible_message("[M]'s body convulses a bit, and then falls still once more.") return M.visible_message("[M]'s body convulses a bit.") - if(!M.suiciding && !(M.disabilities & NOCLONE) && !M.hellbound) + if(!M.suiciding && !(M.has_disability(NOCLONE)) && !M.hellbound) if(!M) return if(M.notify_ghost_cloning(source = M)) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 711c333896..13986f5bf8 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -141,7 +141,7 @@ taste_description = "mint" /datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M) - if(M.disabilities & FAT) + if(M.has_disability(FAT)) M.gib() return ..() diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index ca6a534ee0..8e9b4fb1e4 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -209,12 +209,14 @@ to_chat(target, "A freezing darkness surrounds you...") target.playsound_local(get_turf(target), 'sound/hallucinations/i_see_you1.ogg', 50, 1) user.playsound_local(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1) - target.adjust_blindness(5) + target.become_blind("abyssal_gaze") addtimer(CALLBACK(src, .proc/cure_blindness, target), 40) target.bodytemperature -= 200 /obj/effect/proc_holder/spell/targeted/abyssal_gaze/proc/cure_blindness(mob/target) - target.adjust_blindness(-5) + if(isliving(target)) + var/mob/living/L = target + L.cure_blind(BLIND, "abyssal_gaze") /obj/effect/proc_holder/spell/targeted/dominate name = "Dominate" diff --git a/code/modules/spells/spell_types/genetic.dm b/code/modules/spells/spell_types/genetic.dm index c6945dab50..0982f8a01f 100644 --- a/code/modules/spells/spell_types/genetic.dm +++ b/code/modules/spells/spell_types/genetic.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/effect/proc_holder/spell/targeted/genetic name = "Genetic" desc = "This spell inflicts a set of mutations and disabilities upon the target." @@ -23,10 +24,39 @@ for(var/A in mutations) target.dna.add_mutation(A) target.disabilities |= disabilities +======= +/obj/effect/proc_holder/spell/targeted/genetic + name = "Genetic" + desc = "This spell inflicts a set of mutations and disabilities upon the target." + + var/list/disabilities = list() //disabilities + var/list/mutations = list() //mutation strings + var/duration = 100 //deciseconds + /* + Disabilities + 1st bit - ? + 2nd bit - ? + 3rd bit - ? + 4th bit - ? + 5th bit - ? + 6th bit - ? + */ + +/obj/effect/proc_holder/spell/targeted/genetic/cast(list/targets,mob/user = usr) + playMagSound() + for(var/mob/living/carbon/target in targets) + if(!target.dna) + continue + for(var/A in mutations) + target.dna.add_mutation(A) + for(var/A in disabilities) + target.add_disability(A, GENETICS_SPELL) +>>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) addtimer(CALLBACK(src, .proc/remove, target), duration) /obj/effect/proc_holder/spell/targeted/genetic/proc/remove(mob/living/carbon/target) if(!QDELETED(target)) for(var/A in mutations) target.dna.remove_mutation(A) - target.disabilities &= ~disabilities + for(var/A in disabilities) + target.remove_disability(A, GENETICS_SPELL) \ No newline at end of file diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 790942d897..474075591f 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -217,7 +217,7 @@ C = owner no_update = 0 - if(C.disabilities & HUSK) + if(C.has_disability(HUSK)) species_id = "husk" //overrides species_id dmg_overlay_type = "" //no damage overlay shown when husked should_draw_gender = FALSE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index f631400bee..464da21e44 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -61,7 +61,7 @@ C = owner real_name = C.real_name - if(C.disabilities & HUSK) + if(C.has_disability(HUSK)) real_name = "Unknown" hair_style = "Bald" facial_hair_style = "Shaved" diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index c8a47d2096..00a9a99bb0 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -23,9 +23,9 @@ /datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.") - target.cure_blind() + target.cure_blind(list(EYE_DAMAGE)) target.set_blindness(0) - target.cure_nearsighted() + target.cure_nearsighted(list(EYE_DAMAGE)) target.blur_eyes(35) //this will fix itself slowly. target.set_eye_damage(0) return TRUE diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index 488f2e81b1..ba43a5cc3b 100644 --- a/code/modules/surgery/lipoplasty.dm +++ b/code/modules/surgery/lipoplasty.dm @@ -4,7 +4,7 @@ possible_locs = list("chest") /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target) - if(target.disabilities & FAT) + if(target.has_disability(FAT)) return 1 return 0 diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 98b2a84ac0..905f9c2e1f 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -25,7 +25,7 @@ return var/mob/living/carbon/C = owner // genetic deafness prevents the body from using the ears, even if healthy - if(C.disabilities & DEAF) + if(C.has_disability(DEAF)) deaf = max(deaf, 1) else if(C.ears && (C.ears.flags_2 & HEALS_EARS_2)) @@ -42,7 +42,7 @@ var/mob/living/carbon/C = owner - if(iscarbon(owner) && C.disabilities & DEAF) + if(iscarbon(owner) && C.has_disability(DEAF)) deaf = 1 /obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf) From 7c282037ba5b3d043f53590600ec295fa02bac98 Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 19 Dec 2017 10:32:21 +1300 Subject: [PATCH 006/132] Non movement keys pressed while moving no longer stop movement --- code/modules/keybindings/bindings_atom.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 code/modules/keybindings/bindings_atom.dm diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm new file mode 100644 index 0000000000..9738175d2d --- /dev/null +++ b/code/modules/keybindings/bindings_atom.dm @@ -0,0 +1,18 @@ +// You might be wondering why this isn't client level. If focus is null, we don't want you to move. +// Only way to do that is to tie the behavior into the focus's keyLoop(). + +/atom/movable/keyLoop(client/user) + if(!user.keys_held["Ctrl"]) + var/movement_dir = NONE + for(var/_key in user.keys_held) + movement_dir = movement_dir | GLOB.movement_keys[_key] + if(user.next_move_dir_add) + movement_dir |= user.next_move_dir_add + if(user.next_move_dir_sub) + movement_dir &= ~user.next_move_dir_sub + // Sanity checks in case you hold left and right and up to make sure you only go up + if((movement_dir & NORTH) && (movement_dir & SOUTH)) + movement_dir &= ~(NORTH|SOUTH) + if((movement_dir & EAST) && (movement_dir & WEST)) + movement_dir &= ~(EAST|WEST) + user.Move(get_step(src, movement_dir), movement_dir) \ No newline at end of file From 13dd125e28fd64b8c4610762da05573141fe1cfb Mon Sep 17 00:00:00 2001 From: XDTM Date: Mon, 18 Dec 2017 23:09:48 +0100 Subject: [PATCH 007/132] [HIGH PRIORITY]Hotfix for the monkeylike disability --- code/modules/mob/living/carbon/human/human_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index d1d657652b..386d1f98e6 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -103,7 +103,7 @@ /mob/living/carbon/human/IsAdvancedToolUser() - if(disabilities & MONKEYLIKE) + if(has_disability(MONKEYLIKE)) return FALSE return TRUE//Humans can use guns and such From 9ccdb75e5757eec0ac518c034cf6cf297398641b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:23:52 -0600 Subject: [PATCH 009/132] Update stat.dm --- code/__DEFINES/stat.dm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 208970ff9f..ce84d27765 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -10,18 +10,6 @@ //mob disabilities stat -<<<<<<< HEAD -#define BLIND 1 -#define MUTE 2 -#define DEAF 4 -#define NEARSIGHT 8 -#define FAT 32 -#define HUSK 64 -#define NOCLONE 128 -#define CLUMSY 256 -#define DUMB 512 -#define MONKEYLIKE 1024 //sets IsAdvancedToolUser to FALSE -======= #define BLIND "blind" #define MUTE "mute" #define DEAF "deaf" @@ -44,7 +32,6 @@ #define STASIS_MUTE "stasis" #define GENETICS_SPELL "genetics_spell" #define TRAUMA_DISABILITY "trauma" ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) // bitflags for machine stat variable #define BROKEN 1 From 6c50ca9157c42aee8050b1cf97c2986201cd40a6 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:24:02 -0600 Subject: [PATCH 010/132] Update item_attack.dm --- code/_onclick/item_attack.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 134e33224f..8718751d81 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -58,11 +58,8 @@ SendSignal(COMSIG_ITEM_ATTACK, M, user) if(flags_1 & NOBLUDGEON_1) return -<<<<<<< HEAD -======= if(user.has_disability(PACIFISM)) return ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(!force) playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) else if(hitsound) From b1669b81798768ac4d59f238c060a76ed180a576 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:24:16 -0600 Subject: [PATCH 011/132] Update severe.dm --- code/datums/brain_damage/severe.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index a36d4b9fb8..381515e42e 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -165,8 +165,6 @@ /datum/brain_trauma/severe/discoordination/on_lose() owner.remove_disability(MONKEYLIKE, TRAUMA_DISABILITY) ..() -<<<<<<< HEAD -======= /datum/brain_trauma/severe/pacifism name = "Traumatic Non-Violence" @@ -182,4 +180,3 @@ /datum/brain_trauma/severe/pacifism/on_lose() owner.remove_disability(PACIFISM, TRAUMA_DISABILITY) ..() ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) From 0b7555781657958e5c290a4ac9abc7d114bc8fea Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:24:28 -0600 Subject: [PATCH 012/132] Update shields.dm --- code/game/objects/items/shields.dm | 145 ----------------------------- 1 file changed, 145 deletions(-) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index a746ed1778..113bc9755c 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -1,147 +1,3 @@ -<<<<<<< HEAD -/obj/item/shield - name = "shield" - block_chance = 50 - armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 80, acid = 70) - -/obj/item/shield/riot - name = "riot shield" - desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "riot" - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' - slot_flags = SLOT_BACK - force = 10 - throwforce = 5 - throw_speed = 2 - throw_range = 3 - w_class = WEIGHT_CLASS_BULKY - materials = list(MAT_GLASS=7500, MAT_METAL=1000) - attack_verb = list("shoved", "bashed") - var/cooldown = 0 //shield bash cooldown. based on world.time - - -/obj/item/shield/riot/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/melee/baton)) - if(cooldown < world.time - 25) - user.visible_message("[user] bashes [src] with [W]!") - playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) - cooldown = world.time - else - return ..() - -/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(attack_type == THROWN_PROJECTILE_ATTACK) - final_block_chance += 30 - if(attack_type == LEAP_ATTACK) - final_block_chance = 100 - return ..() - -/obj/item/shield/riot/roman - name = "roman shield" - desc = "Bears an inscription on the inside: \"Romanes venio domus\"." - icon_state = "roman_shield" - item_state = "roman_shield" - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' - -/obj/item/shield/riot/buckler - name = "wooden buckler" - desc = "A medieval wooden buckler." - icon_state = "buckler" - item_state = "buckler" - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' - materials = list() - resistance_flags = FLAMMABLE - block_chance = 30 - -/obj/item/shield/energy - name = "energy combat shield" - desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "eshield0" // eshield1 for expanded - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' - force = 3 - throwforce = 3 - throw_speed = 3 - throw_range = 5 - w_class = WEIGHT_CLASS_TINY - attack_verb = list("shoved", "bashed") - var/active = 0 - -/obj/item/shield/energy/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 0 - -/obj/item/shield/energy/IsReflect() - return (active) - -/obj/item/shield/energy/attack_self(mob/living/carbon/human/user) - if(user.disabilities & CLUMSY && prob(50)) - to_chat(user, "You beat yourself in the head with [src].") - user.take_bodypart_damage(5) - active = !active - icon_state = "eshield[active]" - - if(active) - force = 10 - throwforce = 8 - throw_speed = 2 - w_class = WEIGHT_CLASS_BULKY - playsound(user, 'sound/weapons/saberon.ogg', 35, 1) - to_chat(user, "[src] is now active.") - else - force = 3 - throwforce = 3 - throw_speed = 3 - w_class = WEIGHT_CLASS_TINY - playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) - to_chat(user, "[src] can now be concealed.") - add_fingerprint(user) - -/obj/item/shield/riot/tele - name = "telescopic shield" - desc = "An advanced riot shield made of lightweight materials that collapses for easy storage." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "teleriot0" - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' - slot_flags = null - force = 3 - throwforce = 3 - throw_speed = 3 - throw_range = 4 - w_class = WEIGHT_CLASS_NORMAL - var/active = 0 - -/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(active) - return ..() - return 0 - -/obj/item/shield/riot/tele/attack_self(mob/living/user) - active = !active - icon_state = "teleriot[active]" - playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) - - if(active) - force = 8 - throwforce = 5 - throw_speed = 2 - w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK - to_chat(user, "You extend \the [src].") - else - force = 3 - throwforce = 3 - throw_speed = 3 - w_class = WEIGHT_CLASS_NORMAL - slot_flags = null - to_chat(user, "[src] can now be concealed.") - add_fingerprint(user) -======= /obj/item/shield name = "shield" block_chance = 50 @@ -284,4 +140,3 @@ slot_flags = null to_chat(user, "[src] can now be concealed.") add_fingerprint(user) ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) From f650d8bb5ef990649a668e59ea82515d22355b80 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:24:42 -0600 Subject: [PATCH 013/132] Update mousetrap.dm --- code/modules/assembly/mousetrap.dm | 145 ----------------------------- 1 file changed, 145 deletions(-) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index ca697cdbf6..d1b88e68e1 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -1,147 +1,3 @@ -<<<<<<< HEAD -/obj/item/device/assembly/mousetrap - name = "mousetrap" - desc = "A handy little spring-loaded trap for catching pesty rodents." - icon_state = "mousetrap" - materials = list(MAT_METAL=100) - attachable = 1 - var/armed = 0 - - -/obj/item/device/assembly/mousetrap/examine(mob/user) - ..() - if(armed) - to_chat(user, "The mousetrap is armed!") - else - to_chat(user, "The mousetrap is not armed.") - -/obj/item/device/assembly/mousetrap/activate() - if(..()) - armed = !armed - if(!armed) - if(ishuman(usr)) - var/mob/living/carbon/human/user = usr - if((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY && prob(50)) - to_chat(user, "Your hand slips, setting off the trigger!") - pulse(0) - update_icon() - if(usr) - playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) - -/obj/item/device/assembly/mousetrap/describe() - return "The pressure switch is [armed?"primed":"safe"]." - -/obj/item/device/assembly/mousetrap/update_icon() - if(armed) - icon_state = "mousetraparmed" - else - icon_state = "mousetrap" - if(holder) - holder.update_icon() - -/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet") - if(!armed) - return - var/obj/item/bodypart/affecting = null - if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(PIERCEIMMUNE in H.dna.species.species_traits) - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) - armed = 0 - update_icon() - pulse(0) - return 0 - switch(type) - if("feet") - if(!H.shoes) - affecting = H.get_bodypart(pick("l_leg", "r_leg")) - H.Knockdown(60) - if("l_hand", "r_hand") - if(!H.gloves) - affecting = H.get_bodypart(type) - H.Stun(60) - if(affecting) - if(affecting.receive_damage(1, 0)) - H.update_damage_overlays() - else if(ismouse(target)) - var/mob/living/simple_animal/mouse/M = target - visible_message("SPLAT!") - M.splat() - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) - armed = 0 - update_icon() - pulse(0) - - -/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user) - if(!armed) - to_chat(user, "You arm [src].") - else - if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50)) - var/which_hand = "l_hand" - if(!(user.active_hand_index % 2)) - which_hand = "r_hand" - triggered(user, which_hand) - user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") - return - to_chat(user, "You disarm [src].") - armed = !armed - update_icon() - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) - - -/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user) - if(armed) - if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50)) - var/which_hand = "l_hand" - if(!(user.active_hand_index % 2)) - which_hand = "r_hand" - triggered(user, which_hand) - user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") - return - ..() - - -/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj) - if(armed) - if(ismob(AM)) - var/mob/MM = AM - if(!(MM.movement_type & FLYING)) - if(ishuman(AM)) - var/mob/living/carbon/H = AM - if(H.m_intent == MOVE_INTENT_RUN) - triggered(H) - H.visible_message("[H] accidentally steps on [src].", \ - "You accidentally step on [src]") - else if(ismouse(MM)) - triggered(MM) - else if(AM.density) // For mousetrap grenades, set off by anything heavy - triggered(AM) - ..() - - -/obj/item/device/assembly/mousetrap/on_found(mob/finder) - if(armed) - finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") - triggered(finder, (finder.active_hand_index % 2 == 0) ? "r_hand" : "l_hand") - return 1 //end the search! - return 0 - - -/obj/item/device/assembly/mousetrap/hitby(A as mob|obj) - if(!armed) - return ..() - visible_message("[src] is triggered by [A].") - triggered(null) - - -/obj/item/device/assembly/mousetrap/armed - icon_state = "mousetraparmed" - armed = TRUE -======= /obj/item/device/assembly/mousetrap name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." @@ -284,4 +140,3 @@ /obj/item/device/assembly/mousetrap/armed icon_state = "mousetraparmed" armed = 1 ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) From fa0bcde791ac4f5e8883d9c2f236f77f0f47dd64 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:24:49 -0600 Subject: [PATCH 014/132] Update disease_outbreak.dm --- code/modules/events/disease_outbreak.dm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index db2b1ee561..3085f1bcce 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -41,16 +41,6 @@ continue var/datum/disease/D -<<<<<<< HEAD - if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. - if(!H.dna || (H.disabilities & BLIND)) //A blindness disease would be the worst. - continue - D = new virus_type() - var/datum/disease/dnaspread/DS = D - DS.strain_data["name"] = H.real_name - DS.strain_data["UI"] = H.dna.uni_identity - DS.strain_data["SE"] = H.dna.struc_enzymes -======= if(!advanced_virus) if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. if(!H.dna || (H.has_disability(BLIND))) //A blindness disease would be the worst. @@ -62,9 +52,8 @@ DS.strain_data["SE"] = H.dna.struc_enzymes else D = new virus_type() ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) else D = new virus_type() D.carrier = TRUE H.AddDisease(D) - break \ No newline at end of file + break From 10eaeed06b7060d6bda2b50db739f196bb1c8b6e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:25:09 -0600 Subject: [PATCH 015/132] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 4b2a6f64d5..23decdd59f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -157,11 +157,8 @@ if(!throwable_mob.buckled) thrown_thing = throwable_mob stop_pulling() -<<<<<<< HEAD -======= if(has_disability(PACIFISM)) to_chat(src, "You gently let go of [throwable_mob].") ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/end_T = get_turf(target) if(start_T && end_T) @@ -173,13 +170,10 @@ thrown_thing = I dropItemToGround(I) -<<<<<<< HEAD -======= if(has_disability(PACIFISM) && I.throwforce) to_chat(src, "You set [I] down gently on the ground.") return ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(thrown_thing) visible_message("[src] has thrown [thrown_thing].") add_logs(src, thrown_thing, "has thrown") From e4d6f4110f8a0b964e9e65a9c24a74bf83c13232 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:25:33 -0600 Subject: [PATCH 016/132] Update human_defense.dm --- code/modules/mob/living/carbon/human/human_defense.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 7cdcad35bb..cdb714156a 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -140,13 +140,8 @@ return ..() /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0) -<<<<<<< HEAD - if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling)) - vore_attack(user, pulling) -======= if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (has_disability(FAT)) && ismonkey(pulling)) devour_mob(pulling) ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) else ..() From 078c8744e05c738974e633706791a3a9a1520fe3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:25:47 -0600 Subject: [PATCH 017/132] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1f30562dcf..329e59e305 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1315,12 +1315,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) -<<<<<<< HEAD -======= if(user.has_disability(PACIFISM)) to_chat(user, "You don't want to harm [target]!") return FALSE ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(target.check_block()) target.visible_message("[target] blocks [user]'s attack!") return 0 From 8b56d1ccdd495381b2c45016c90e0605659680bf Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:26:01 -0600 Subject: [PATCH 018/132] Update combat.dm --- code/modules/mob/living/carbon/monkey/combat.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index 089a242347..bd88714fd4 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -120,15 +120,10 @@ /mob/living/carbon/monkey/proc/should_target(var/mob/living/L) if(L == src) -<<<<<<< HEAD - return 0 -======= return FALSE if(has_disability(PACIFISM)) return FALSE ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) - if(enemies[L]) return 1 From 0d137f82d43fa9464eca46792124c7de1a93c1c3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:26:10 -0600 Subject: [PATCH 019/132] Update life.dm --- code/modules/mob/living/life.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index b8423cdc46..41c4572103 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -137,12 +137,9 @@ eye_blurry = max(eye_blurry-1, 0) if(client && !eye_blurry) clear_fullscreen("blurry") -<<<<<<< HEAD -======= if(has_disability(PACIFISM) && a_intent == INTENT_HARM) to_chat(src, "You don't feel like harming anybody.") a_intent_change(INTENT_HELP) ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) /mob/living/proc/update_damage_hud() return From 64f003d3b1b304a85ee297be34040cc36d60ed19 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:26:25 -0600 Subject: [PATCH 020/132] Update living.dm --- code/modules/mob/living/living.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 24985f54a6..bd6b00dea7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -811,12 +811,9 @@ if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser()) to_chat(src, "You don't have the dexterity to do this!") return FALSE -<<<<<<< HEAD -======= if(has_disability(PACIFISM)) to_chat(src, "You don't want to risk harming anyone!") return FALSE ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) return TRUE /mob/living/carbon/proc/update_stamina() @@ -1059,4 +1056,4 @@ /mob/living/onTransitZ(old_z,new_z) ..() - update_z(new_z) \ No newline at end of file + update_z(new_z) From 8fef308d0aea3fa00cf3b06853a833a8948395bd Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:27:04 -0600 Subject: [PATCH 021/132] Update living_defense.dm --- code/modules/mob/living/living_defense.dm | 24 ----------------------- 1 file changed, 24 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index d99ce1b014..4dc2b6d076 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -134,16 +134,11 @@ if(!(status_flags & CANPUSH)) to_chat(user, "[src] can't be grabbed more aggressively!") -<<<<<<< HEAD - return 0 -======= return FALSE if(user.has_disability(PACIFISM)) to_chat(user, "You don't want to risk hurting [src]!") return FALSE - ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) grippedby(user) //proc to upgrade a simple pull into a more aggressive grab. @@ -197,13 +192,9 @@ M.Feedstop() return // can't attack while eating! -<<<<<<< HEAD -======= if(has_disability(PACIFISM)) to_chat(M, "You don't want to hurt anyone!") return FALSE - ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if (stat != DEAD) add_logs(M, src, "attacked") M.do_attack_animation(src) @@ -217,13 +208,9 @@ M.visible_message("\The [M] [M.friendly] [src]!") return 0 else -<<<<<<< HEAD -======= if(M.has_disability(PACIFISM)) to_chat(M, "You don't want to hurt anyone!") return FALSE - ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) M.do_attack_animation(src) @@ -239,13 +226,9 @@ return 0 if (M.a_intent == INTENT_HARM) -<<<<<<< HEAD -======= if(M.has_disability(PACIFISM)) to_chat(M, "You don't want to hurt anyone!") return FALSE - ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH)) to_chat(M, "You can't bite with your mouth covered!") return 0 @@ -268,13 +251,9 @@ return 0 else -<<<<<<< HEAD -======= if(L.has_disability(PACIFISM)) to_chat(L, "You don't want to hurt anyone!") return - ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) L.do_attack_animation(src) if(prob(90)) add_logs(L, src, "attacked") @@ -297,12 +276,9 @@ grabbedby(M) return 0 if("harm") -<<<<<<< HEAD -======= if(M.has_disability(PACIFISM)) to_chat(M, "You don't want to hurt anyone!") return FALSE ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) M.do_attack_animation(src) return 1 if("disarm") From cfeea088e8cc1f8af3362ff7a760cdbfaa0304b3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 17:27:12 -0600 Subject: [PATCH 022/132] Update genetic.dm --- code/modules/spells/spell_types/genetic.dm | 30 +--------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/code/modules/spells/spell_types/genetic.dm b/code/modules/spells/spell_types/genetic.dm index 0982f8a01f..1b60800458 100644 --- a/code/modules/spells/spell_types/genetic.dm +++ b/code/modules/spells/spell_types/genetic.dm @@ -1,30 +1,3 @@ -<<<<<<< HEAD -/obj/effect/proc_holder/spell/targeted/genetic - name = "Genetic" - desc = "This spell inflicts a set of mutations and disabilities upon the target." - - var/disabilities = 0 //bits - var/list/mutations = list() //mutation strings - var/duration = 100 //deciseconds - /* - Disabilities - 1st bit - ? - 2nd bit - ? - 3rd bit - ? - 4th bit - ? - 5th bit - ? - 6th bit - ? - */ - -/obj/effect/proc_holder/spell/targeted/genetic/cast(list/targets,mob/user = usr) - playMagSound() - for(var/mob/living/carbon/target in targets) - if(!target.dna) - continue - for(var/A in mutations) - target.dna.add_mutation(A) - target.disabilities |= disabilities -======= /obj/effect/proc_holder/spell/targeted/genetic name = "Genetic" desc = "This spell inflicts a set of mutations and disabilities upon the target." @@ -51,7 +24,6 @@ target.dna.add_mutation(A) for(var/A in disabilities) target.add_disability(A, GENETICS_SPELL) ->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055) addtimer(CALLBACK(src, .proc/remove, target), duration) /obj/effect/proc_holder/spell/targeted/genetic/proc/remove(mob/living/carbon/target) @@ -59,4 +31,4 @@ for(var/A in mutations) target.dna.remove_mutation(A) for(var/A in disabilities) - target.remove_disability(A, GENETICS_SPELL) \ No newline at end of file + target.remove_disability(A, GENETICS_SPELL) From 55ee64940f7dc316652fd02a5fa66fccd4fd20b2 Mon Sep 17 00:00:00 2001 From: Armhulen Date: Mon, 18 Dec 2017 18:50:35 -0800 Subject: [PATCH 023/132] code improvements from mso and co --- code/_onclick/hud/parallax.dm | 2 -- code/modules/client/client_procs.dm | 4 ++++ code/modules/client/preferences.dm | 10 ++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index ff38107bfb..c03cfe76f5 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -60,8 +60,6 @@ var/pref = C.prefs.parallax if (isnull(pref)) pref = PARALLAX_HIGH - if (C.byond_version < 511) - pref = PARALLAX_DISABLE switch(C.prefs.parallax) if (PARALLAX_INSANE) C.parallax_throttle = FALSE diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index cb1712dff5..da5a1846f7 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -199,9 +199,13 @@ GLOBAL_LIST(external_rsc_urls) prefs.parent = src prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning +<<<<<<< HEAD if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps) vars["fps"] = prefs.clientfps sethotkeys(1) //set hoykeys from preferences (from_pref = 1) +======= + fps = prefs.clientfps +>>>>>>> e72cfeb... code improvements from mso and co (#33485) log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[byond_version]") var/alert_mob_dupe_login = FALSE diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 175a23c91e..d0d8eb7aed 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1282,16 +1282,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) preferred_map = maplist[pickedmap] if ("clientfps") - var/version_message - if (user.client && user.client.byond_version < 511) - version_message = "\nYou need to be using byond version 511 or later to take advantage of this feature, your version of [user.client.byond_version] is too low" - if (world.byond_version < 511) - version_message += "\nThis server does not currently support client side fps. You can set now for when it does." - var/desiredfps = input(user, "Choose your desired fps.[version_message]\n(0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num + var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num if (!isnull(desiredfps)) clientfps = desiredfps - if (world.byond_version >= 511 && user.client && user.client.byond_version >= 511) - user.client.vars["fps"] = clientfps + parent.fps = desiredfps if("ui") var/pickedui = input(user, "Choose your UI style.", "Character Preference") as null|anything in list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Clockwork") if(pickedui) From 11856db2fb8fb99426b6f3d958f65502c619294b Mon Sep 17 00:00:00 2001 From: coiax Date: Tue, 19 Dec 2017 03:16:59 +0000 Subject: [PATCH 024/132] Golems can wear labcoats --- code/modules/clothing/suits/labcoat.dm | 54 +++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index f50f6eaf6a..7b794e9e09 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/item/clothing/suit/toggle/labcoat name = "labcoat" desc = "A suit that protects against minor chemical spills." @@ -45,4 +46,55 @@ /obj/item/clothing/suit/toggle/labcoat/science name = "scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." - icon_state = "labcoat_tox" \ No newline at end of file + icon_state = "labcoat_tox" +======= +/obj/item/clothing/suit/toggle/labcoat + name = "labcoat" + desc = "A suit that protects against minor chemical spills." + icon_state = "labcoat" + item_state = "labcoat" + blood_overlay_type = "coat" + body_parts_covered = CHEST|ARMS + allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/device/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0, fire = 50, acid = 50) + togglename = "buttons" + species_exception = list(/datum/species/golem) + +/obj/item/clothing/suit/toggle/labcoat/cmo + name = "chief medical officer's labcoat" + desc = "Bluer than the standard model." + icon_state = "labcoat_cmo" + item_state = "labcoat_cmo" + +/obj/item/clothing/suit/toggle/labcoat/emt + name = "EMT's jacket" + desc = "A dark blue jacket with reflective strips for emergency medical technicians." + icon_state = "labcoat_emt" + item_state = "labcoat_cmo" + +/obj/item/clothing/suit/toggle/labcoat/mad + name = "\improper The Mad's labcoat" + desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + icon_state = "labgreen" + item_state = "labgreen" + +/obj/item/clothing/suit/toggle/labcoat/genetics + name = "geneticist labcoat" + desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." + icon_state = "labcoat_gen" + +/obj/item/clothing/suit/toggle/labcoat/chemist + name = "chemist labcoat" + desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." + icon_state = "labcoat_chem" + +/obj/item/clothing/suit/toggle/labcoat/virologist + name = "virologist labcoat" + desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." + icon_state = "labcoat_vir" + +/obj/item/clothing/suit/toggle/labcoat/science + name = "scientist labcoat" + desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." + icon_state = "labcoat_tox" +>>>>>>> 67f633f... Golems can wear labcoats (#33639) From a3323c1b9520caf35d75a1f9c5a694cc9d627464 Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Thu, 21 Dec 2017 01:01:51 -0500 Subject: [PATCH 025/132] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues --- .../clock_cult/clock_mobs/_eminence.dm | 32 ++++++++++++++++++- .../ark_of_the_clockwork_justicar.dm | 2 +- .../clock_structures/eminence_spire.dm | 5 +++ code/game/turfs/simulated/wall/misc_walls.dm | 4 +++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index cc91feeb98..3728520e82 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -1,3 +1,7 @@ +//Helper proc to get an Eminence mob if it exists +/proc/get_eminence() + return locate(/mob/camera/eminence) in servants_and_ghosts() + //The Eminence is a unique mob that functions like the leader of the cult. It's incorporeal but can interact with the world in several ways. /mob/camera/eminence name = "\the Emininence" @@ -37,9 +41,23 @@ if(prob(166 - (get_dist(src, T) * 33))) T.ratvar_act() //Causes moving to leave a swath of proselytized area behind the Eminence +/mob/camera/eminence/Process_Spacemove(movement_dir = 0) + return TRUE + /mob/camera/eminence/Login() ..() add_servant_of_ratvar(src, TRUE) +<<<<<<< HEAD +======= + var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) + if(C && C.clock_team) + if(C.clock_team.eminence) + remove_servant_of_ratvar(src,TRUE) + qdel(src) + return + else + C.clock_team.eminence = src +>>>>>>> 3b37dae... (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634) to_chat(src, "You have been selected as the Eminence!") to_chat(src, "As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.") to_chat(src, "Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.") @@ -55,6 +73,12 @@ E.Grant(src) /mob/camera/eminence/say(message) + if(client) + if(client.prefs.muted & MUTE_IC) + to_chat(src, "You cannot send IC messages (muted).") + return + if(client.handle_spam_prevention(message,MUTE_IC)) + return message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) if(!message) return @@ -62,7 +86,13 @@ if(GLOB.ratvar_awakens) visible_message("You feel light slam into your mind and form words: \"[capitalize(message)]\"") playsound(src, 'sound/machines/clockcult/ark_scream.ogg', 50, FALSE) - hierophant_message("The Eminence: \"[message]\"") + message = "The [GLOB.ratvar_awakens ? "Radiance" : "Eminence"]: \"[message]\"" + for(var/mob/M in servants_and_ghosts()) + if(isobserver(M)) + var/link = FOLLOW_LINK(M, src) + to_chat(M, "[link] [message]") + else + to_chat(M, message) /mob/camera/eminence/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) if(z == ZLEVEL_CITYOFCOGS || is_servant_of_ratvar(speaker) || GLOB.ratvar_approaches || GLOB.ratvar_awakens) //Away from Reebe, the Eminence can't hear anything diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 63fea1eeb6..21d1159541 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -113,7 +113,7 @@ /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/mass_recall() for(var/V in SSticker.mode.servants_of_ratvar) var/datum/mind/M = V - if(!M.current.stat) + if(M.current.stat != DEAD) M.current.forceMove(get_turf(src)) M.current.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) M.current.clear_fullscreen("flash", 5) diff --git a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm index 8d4e936658..a5bc62f554 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm @@ -34,7 +34,12 @@ /obj/structure/destructible/clockwork/eminence_spire/attack_ghost(mob/user) if(!IsAdminGhost(user)) return +<<<<<<< HEAD if(SSticker.mode.eminence) +======= + var/datum/antagonist/clockcult/random_cultist = locate() in GLOB.antagonists //if theres no cultists new team without eminence will be created anyway. + if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence) +>>>>>>> 3b37dae... (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634) to_chat(user, "There's already an Eminence - too late!") return if(!GLOB.servants_active) diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index ecc389af88..0dab10ff92 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -70,6 +70,10 @@ if(realappearence) qdel(realappearence) realappearence = null + if(heated) + var/mob/camera/eminence/E = get_eminence() + if(E) + E.superheated_walls-- return ..() /turf/closed/wall/clockwork/ReplaceWithLattice() From c5485faee7f6196b2b59005111a8c12069f96ad8 Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Thu, 21 Dec 2017 07:36:58 -0500 Subject: [PATCH 026/132] Tiles blessed by holy water now block servant warp-in/Eminence snooping (#33584) * Blessing tiles blocks servant warp * Removes the color * Prevents the message from showing on the same turf --- .../gamemodes/clock_cult/clock_mobs/_eminence.dm | 14 +++++++++++++- code/game/machinery/computer/camera_advanced.dm | 3 +++ code/game/turfs/simulated/floor/misc_floor.dm | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 8416e4651d..baf149093c 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -12,6 +12,7 @@ layer = FLY_LAYER faction = list("ratvar") lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + var/turf/last_failed_turf var/static/superheated_walls = 0 /mob/camera/eminence/CanPass(atom/movable/mover, turf/target) @@ -20,7 +21,18 @@ /mob/camera/eminence/Move(NewLoc, direct) var/OldLoc = loc if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void)) - forceMove(get_turf(NewLoc)) + var/turf/T = get_turf(NewLoc) + if(T.flags_1 & NOJAUNT_1) + if(last_failed_turf != T) + T.visible_message("[T] suddenly emits a ringing sound!", ignore_mob = src) + playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE) + last_failed_turf = T + to_chat(src, "This turf is consecrated and can't be crossed!") + return + if(istype(get_area(T), /area/chapel)) + to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!") + return + forceMove(T) Moved(OldLoc, direct) if(GLOB.ratvar_awakens) for(var/turf/T in range(5, src)) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 44d6d5abe4..786deaa56a 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -300,6 +300,9 @@ else if(isspaceturf(T)) to_chat(user, "[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]") return + else if(T.flags_1 & NOJAUNT_1) + to_chat(user, "This tile is blessed by holy water and deflects the warp.") + return var/area/AR = get_area(T) if(!AR.clockwork_warp_allowed) to_chat(user, "[AR.clockwork_warp_fail]") diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 3e7540cdf6..634767c98b 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -146,6 +146,9 @@ var/uses_overlay = TRUE var/obj/effect/clockwork/overlay/floor/realappearence +/turf/open/floor/clockwork/Bless() //Who needs holy blessings when you have DADDY RATVAR? + return + /turf/open/floor/clockwork/Initialize() . = ..() if(uses_overlay) From f56edf2f1fed1f329636cffe44a69d688fabc025 Mon Sep 17 00:00:00 2001 From: awesine Date: Thu, 21 Dec 2017 20:23:04 -0500 Subject: [PATCH 028/132] adds mining scanners to the gulag (#33711) * Add files via upload * Add files via upload --- _maps/map_files/Mining/Lavaland.dmm | 46 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index bbf998aaba..7eade308ce 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -111,6 +111,7 @@ /obj/item/pickaxe, /obj/item/device/flashlight, /obj/item/clothing/glasses/meson, +/obj/item/device/mining_scanner, /turf/open/floor/plasteel, /area/mine/laborcamp) "av" = ( @@ -119,6 +120,7 @@ /obj/item/device/flashlight, /obj/item/pickaxe, /obj/item/clothing/glasses/meson, +/obj/item/device/mining_scanner, /turf/open/floor/plasteel, /area/mine/laborcamp) "aw" = ( @@ -21563,7 +21565,7 @@ am am am am -ao +ai ab ab ab @@ -22070,7 +22072,7 @@ am am am am -ao +ai ab ab ai @@ -22854,7 +22856,7 @@ ab ab ab ab -ao +ai ab ab ab @@ -24644,7 +24646,7 @@ am am am am -ao +ai ab ab ab @@ -24901,7 +24903,7 @@ am am am am -ao +ai ab ab ab @@ -25178,7 +25180,7 @@ ab ab ab ab -ao +ai am am ai @@ -25422,7 +25424,7 @@ ab ab ab ai -ao +ai ab ab ab @@ -25672,7 +25674,7 @@ am am am am -ao +ai ab ab ab @@ -25956,7 +25958,7 @@ am am am am -ao +ai ab ab ab @@ -26199,7 +26201,7 @@ ab ab ab ab -ao +ai am am am @@ -26213,7 +26215,7 @@ am am am am -ao +ai ab ab ab @@ -26972,7 +26974,7 @@ ab ab ab ab -ao +ai am am am @@ -28511,7 +28513,7 @@ ab ab ab ai -ao +ai ab ab ab @@ -29021,7 +29023,7 @@ ab ab ab ab -ao +ai ab ab ai @@ -29030,13 +29032,13 @@ am am am am -ao +ai ab ab ab ab -ao -ao +ai +ai ab ab ab @@ -29278,8 +29280,8 @@ ab ab ab ab -ao -ao +ai +ai ab ai am @@ -30060,8 +30062,8 @@ ab ab ab ab -ao -ao +ai +ai ab ab ab @@ -30573,7 +30575,7 @@ ai ai ab ab -ao +ai am am am From 4e8898d55f4a1df30b12a6331caa37cffc83ef4b Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 22 Dec 2017 14:26:29 +1300 Subject: [PATCH 030/132] Merge pull request #33714 from lzimann/icon Job landmarks now show the mob with the proper job outfit. --- code/game/objects/effects/landmarks.dm | 51 ++++++++++++++++++++----- code/modules/admin/verbs/mapping.dm | 31 ++++++++++++++- icons/mob/landmarks.dmi | Bin 0 -> 25137 bytes 3 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 icons/mob/landmarks.dmi diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index caeb1f168c..2708e78535 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -16,7 +16,7 @@ /obj/effect/landmark/start name = "start" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/mob/landmarks.dmi' icon_state = "x" anchored = TRUE var/jobspawn_override = FALSE @@ -40,9 +40,9 @@ // START LANDMARKS FOLLOW. Don't change the names unless // you are refactoring shitty landmark code. - /obj/effect/landmark/start/assistant name = "Assistant" + icon_state = "Assistant" /obj/effect/landmark/start/assistant/override jobspawn_override = TRUE @@ -50,102 +50,135 @@ /obj/effect/landmark/start/janitor name = "Janitor" + icon_state = "Janitor" /obj/effect/landmark/start/cargo_technician name = "Cargo Technician" + icon_state = "Cargo Technician" /obj/effect/landmark/start/bartender name = "Bartender" + icon_state = "Bartender" /obj/effect/landmark/start/clown name = "Clown" + icon_state = "Clown" /obj/effect/landmark/start/mime name = "Mime" + icon_state = "Mime" /obj/effect/landmark/start/quartermaster name = "Quartermaster" + icon_state = "Quartermaster" /obj/effect/landmark/start/atmospheric_technician name = "Atmospheric Technician" + icon_state = "Atmospheric Technician" /obj/effect/landmark/start/cook name = "Cook" + icon_state = "Cook" /obj/effect/landmark/start/shaft_miner name = "Shaft Miner" + icon_state = "Shaft Miner" /obj/effect/landmark/start/security_officer name = "Security Officer" + icon_state = "Security Officer" /obj/effect/landmark/start/botanist name = "Botanist" + icon_state = "Botanist" /obj/effect/landmark/start/head_of_security name = "Head of Security" - -/obj/effect/landmark/start/ai - name = "AI" - delete_after_roundstart = FALSE + icon_state = "Head of Security" /obj/effect/landmark/start/captain name = "Captain" + icon_state = "Captain" /obj/effect/landmark/start/detective name = "Detective" + icon_state = "Detective" /obj/effect/landmark/start/warden name = "Warden" + icon_state = "Warden" /obj/effect/landmark/start/chief_engineer name = "Chief Engineer" - -/obj/effect/landmark/start/cyborg - name = "Cyborg" + icon_state = "Chief Engineer" /obj/effect/landmark/start/head_of_personnel name = "Head of Personnel" + icon_state = "Head of Personnel" /obj/effect/landmark/start/librarian name = "Curator" + icon_state = "Curator" /obj/effect/landmark/start/lawyer name = "Lawyer" + icon_state = "Lawyer" /obj/effect/landmark/start/station_engineer name = "Station Engineer" + icon_state = "Station Engineer" /obj/effect/landmark/start/medical_doctor name = "Medical Doctor" + icon_state = "Medical Doctor" /obj/effect/landmark/start/scientist name = "Scientist" + icon_state = "Scientist" /obj/effect/landmark/start/chemist name = "Chemist" + icon_state = "Chemist" /obj/effect/landmark/start/roboticist name = "Roboticist" + icon_state = "Roboticist" /obj/effect/landmark/start/research_director name = "Research Director" + icon_state = "Research Director" /obj/effect/landmark/start/geneticist name = "Geneticist" + icon_state = "Geneticist" /obj/effect/landmark/start/chief_medical_officer name = "Chief Medical Officer" + icon_state = "Chief Medical Officer" /obj/effect/landmark/start/virologist name = "Virologist" + icon_state = "Virologist" /obj/effect/landmark/start/chaplain name = "Chaplain" + icon_state = "Chaplain" + +/obj/effect/landmark/start/cyborg + name = "Cyborg" + icon_state = "Cyborg" + +/obj/effect/landmark/start/ai + name = "AI" + icon_state = "AI" + delete_after_roundstart = FALSE + //Department Security spawns /obj/effect/landmark/start/depsec name = "department_sec" + icon_state = "Security Officer" /obj/effect/landmark/start/depsec/New() ..() diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 5d0c2fe833..dcb9137416 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -45,7 +45,8 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( /client/proc/manipulate_organs, /client/proc/start_line_profiling, /client/proc/stop_line_profiling, - /client/proc/show_line_profiling + /client/proc/show_line_profiling, + /client/proc/create_mapping_job_icons )) /obj/effect/debugging/mapfix_marker @@ -265,3 +266,31 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) message_admins("[src.ckey] used 'Disable all communication verbs', killing all communication methods.") else message_admins("[src.ckey] used 'Disable all communication verbs', restoring all communication methods.") + +//This generates the icon states for job starting location landmarks. +/client/proc/create_mapping_job_icons() + set name = "Generate job landmarks icons" + set category = "Mapping" + var/icon/final = icon() + var/mob/living/carbon/human/dummy/D = new(locate(1,1,1)) //spawn on 1,1,1 so we don't have runtimes when items are deleted + D.setDir(SOUTH) + for(var/job in subtypesof(/datum/job)) + var/datum/job/JB = new job + switch(JB.title) + if("AI") + final.Insert(icon('icons/mob/ai.dmi', "ai", SOUTH, 1), "AI") + if("Cyborg") + final.Insert(icon('icons/mob/robots.dmi', "robot", SOUTH, 1), "Cyborg") + else + for(var/obj/item/I in D) + qdel(I) + randomize_human(D) + JB.equip(D, TRUE, FALSE) + COMPILE_OVERLAYS(D) + var/icon/I = icon(getFlatIcon(D), frame = 1) + final.Insert(I, JB.title) + qdel(D) + //Also add the x + for(var/x_number in 1 to 4) + final.Insert(icon('icons/mob/screen_gen.dmi', "x[x_number == 1 ? "" : x_number]"), "x[x_number == 1 ? "" : x_number]") + fcopy(final, "icons/mob/landmarks.dmi") \ No newline at end of file diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..120745ed4437fb81639f00cae0f2399a042748d4 GIT binary patch literal 25137 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
    $V&F`=JW?-QRTYg+v?2bqjpW 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 O2vSqlR;pL9iTED_BLJ@e literal 0 HcmV?d00001 From a89435ac33d34bd295833c9b85db9f65aa638795 Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 22 Dec 2017 14:32:35 +1300 Subject: [PATCH 032/132] Merge pull request #32433 from kevinz000/vector_projectiles [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections --- code/datums/actions/beam_rifle.dm | 12 + code/datums/actions/flightsuit.dm | 2 - code/datums/position_point_vector.dm | 239 ++++++++++++++++ .../temporary_visuals/projectile_beam.dm | 70 +++++ code/game/objects/structures/reflector.dm | 6 +- code/game/turfs/simulated/walls.dm | 2 +- code/modules/projectiles/gun.dm | 3 +- code/modules/projectiles/guns/beam_rifle.dm | 268 +++++------------- code/modules/projectiles/projectile.dm | 148 ++++++---- .../space_transition/space_transition.dm | 14 +- tgstation.dme | 3 + 11 files changed, 498 insertions(+), 269 deletions(-) create mode 100644 code/datums/actions/beam_rifle.dm create mode 100644 code/datums/position_point_vector.dm create mode 100644 code/game/objects/effects/temporary_visuals/projectile_beam.dm diff --git a/code/datums/actions/beam_rifle.dm b/code/datums/actions/beam_rifle.dm new file mode 100644 index 0000000000..783b93fbdb --- /dev/null +++ b/code/datums/actions/beam_rifle.dm @@ -0,0 +1,12 @@ + +/datum/action/item_action/zoom_speed_action + name = "Toggle Zooming Speed" + icon_icon = 'icons/mob/actions/actions_spells.dmi' + button_icon_state = "projectile" + background_icon_state = "bg_tech" + +/datum/action/item_action/zoom_lock_action + name = "Switch Zoom Mode" + icon_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "zoom_mode" + background_icon_state = "bg_tech" diff --git a/code/datums/actions/flightsuit.dm b/code/datums/actions/flightsuit.dm index 3e78fa5332..cf249fed31 100644 --- a/code/datums/actions/flightsuit.dm +++ b/code/datums/actions/flightsuit.dm @@ -1,5 +1,3 @@ - - /datum/action/item_action/flightsuit icon_icon = 'icons/mob/actions/actions_flightsuit.dmi' diff --git a/code/datums/position_point_vector.dm b/code/datums/position_point_vector.dm new file mode 100644 index 0000000000..635ae0bbec --- /dev/null +++ b/code/datums/position_point_vector.dm @@ -0,0 +1,239 @@ +//Designed for things that need precision trajectories like projectiles. +//Don't use this for anything that you don't absolutely have to use this with (like projectiles!) because it isn't worth using a datum unless you need accuracy down to decimal places in pixels. + +#define RETURN_PRECISE_POSITION(A) new /datum/position(A) +#define RETURN_PRECISE_POINT(A) new /datum/point(A) + +/datum/position //For positions with map x/y/z and pixel x/y so you don't have to return lists. Could use addition/subtraction in the future I guess. + var/x = 0 + var/y = 0 + var/z = 0 + var/pixel_x = 0 + var/pixel_y = 0 + +/datum/position/proc/valid() + return x && y && z && !isnull(pixel_x) && !isnull(pixel_y) + +/datum/position/New(_x = 0, _y = 0, _z = 0, _pixel_x = 0, _pixel_y = 0) //first argument can also be a /datum/point. + if(istype(_x, /datum/point)) + var/datum/point/P = _x + var/turf/T = P.return_turf() + _x = T.x + _y = T.y + _z = T.z + _pixel_x = P.return_px() + _pixel_y = P.return_py() + else if(isatom(_x)) + var/atom/A = _x + _x = A.x + _y = A.y + _z = A.z + _pixel_x = A.pixel_x + _pixel_y = A.pixel_y + x = _x + y = _y + z = _z + pixel_x = _pixel_x + pixel_y = _pixel_y + +/datum/position/proc/return_turf() + return locate(x, y, z) + +/datum/position/proc/return_px() + return pixel_x + +/datum/position/proc/return_py() + return pixel_y + +/datum/position/proc/return_point() + return new /datum/point(src) + +/proc/point_midpoint_points(datum/point/a, datum/point/b) //Obviously will not support multiZ calculations! Same for the two below. + var/datum/point/P = new + P.x = round(a.x + (b.x - a.x) / 2, 1) + P.y = round(a.y + (b.y - a.y) / 2, 1) + P.z = a.z + return P + +/proc/pixel_length_between_points(datum/point/a, datum/point/b) + return sqrt(((b.x - a.x) ** 2) + ((b.y - a.y) ** 2)) + +/proc/angle_between_points(datum/point/a, datum/point/b) + return ATAN2((b.y - a.y), (b.x - a.x)) + +/datum/point //A precise point on the map in absolute pixel locations based on world.icon_size. Pixels are FROM THE EDGE OF THE MAP! + var/x = 0 + var/y = 0 + var/z = 0 + +/datum/point/proc/valid() + return x && y && z + +/datum/point/proc/copy_to(datum/point/p = new) + p.x = x + p.y = y + p.z = z + return p + +/datum/point/New(_x, _y, _z, _pixel_x = 0, _pixel_y = 0) //first argument can also be a /datum/position or /atom. + if(istype(_x, /datum/position)) + var/datum/position/P = _x + _x = P.x + _y = P.y + _z = P.z + _pixel_x = P.pixel_x + _pixel_y = P.pixel_y + else if(istype(_x, /atom)) + var/atom/A = _x + _x = A.x + _y = A.y + _z = A.z + _pixel_x = A.pixel_x + _pixel_y = A.pixel_y + initialize_location(_x, _y, _z, _pixel_x, _pixel_y) + +/datum/point/proc/initialize_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0) + if(!isnull(tile_x)) + x = ((tile_x - 1) * world.icon_size) + world.icon_size / 2 + p_x + if(!isnull(tile_y)) + y = ((tile_y - 1) * world.icon_size) + world.icon_size / 2+ p_y + if(!isnull(tile_z)) + z = tile_z + +/datum/point/proc/return_turf() + return locate(CEILING(x / world.icon_size, 1), CEILING(y / world.icon_size, 1), z) + +/datum/point/proc/return_coordinates() //[turf_x, turf_y, z] + return list(CEILING(x / world.icon_size, 1), CEILING(y / world.icon_size, 1), z) + +/datum/point/proc/return_position() + return new /datum/position(src) + +/datum/point/proc/return_px() + return MODULUS(x, world.icon_size) - 16 + +/datum/point/proc/return_py() + return MODULUS(y, world.icon_size) - 16 + +/datum/point/proc/mapcheck() + . = FALSE + var/maxx = world.icon_size * world.maxx + var/maxy = world.icon_size * world.maxy + var/move_zx = 0 + var/move_zy = 0 + if(x < 0) + x += maxx + move_zx -= 1 + if(y < 0) + y += maxy + move_zy -= 1 + if(x > maxx) + x -= maxx + move_zx += 1 + if(y > maxy) + y -= maxy + move_zy += 1 + var/datum/space_level/S = GLOB.z_levels_list["[z]"] + if(move_zx != 0) + var/datum/space_level/L = S.neigbours["[move_zx < 0? WEST : EAST]"] + z = L.z_value + . = TRUE + if(move_zy != 0) + var/datum/space_level/L = S.neigbours["[move_zy < 0? SOUTH : NORTH]"] + z = L.z_value + . = TRUE + +/datum/point/vector + var/speed = 32 //pixels per iteration + var/iteration = 0 + var/angle = 0 + var/mpx = 0 //calculated x/y movement amounts to prevent having to do trig every step. + var/mpy = 0 + var/starting_x = 0 //just like before, pixels from EDGE of map! This is set in initialize_location(). + var/starting_y = 0 + var/starting_z = 0 + +/datum/point/vector/New(_x, _y, _z, _pixel_x = 0, _pixel_y = 0, _angle, _speed) + ..() + initialize_trajectory(_speed, _angle) + +/datum/point/vector/initialize_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0) + . = ..() + starting_x = x + starting_y = y + starting_z = z + +/datum/point/vector/copy_to(datum/point/vector/v = new) + ..(v) + v.speed = speed + v.iteration = iteration + v.angle = angle + v.mpx = mpx + v.mpy = mpy + v.starting_x = starting_x + v.starting_y = starting_y + v.starting_z = starting_z + return v + +/datum/point/vector/proc/initialize_trajectory(pixel_speed, new_angle) + if(!isnull(pixel_speed)) + speed = pixel_speed + set_angle(new_angle) + +/datum/point/vector/proc/set_angle(new_angle) //calculations use "byond angle" where north is 0 instead of 90, and south is 180 instead of 270. + if(isnull(angle)) + return + angle = new_angle + update_offsets() + +/datum/point/vector/proc/update_offsets() + mpx = sin(angle) * speed + mpy = cos(angle) * speed + +/datum/point/vector/proc/set_speed(new_speed) + if(isnull(new_speed) || speed == new_speed) + return + speed = new_speed + update_offsets() + +/datum/point/vector/proc/increment(multiplier = 1) + iteration++ + x += mpx * 1 + y += mpy * 1 + if(mapcheck()) + on_z_change() + +/datum/point/vector/proc/return_vector_after_increments(amount = 7, multiplier = 1, force_simulate = FALSE) + var/datum/point/vector/v = copy_to() + if(force_simulate) + for(var/i in 1 to amount) + v.increment(multiplier) + else + v.increment(multiplier * amount) + return v + +/datum/point/vector/proc/on_z_change() + return + +/datum/point/vector/processed //pixel_speed is per decisecond. + var/last_process = 0 + var/last_move = 0 + var/paused = FALSE + +/datum/point/vector/processed/Destroy() + STOP_PROCESSING(SSprojectiles, src) + +/datum/point/vector/processed/proc/start() + last_process = world.time + last_move = world.time + START_PROCESSING(SSprojectiles, src) + +/datum/point/vector/processed/process() + if(paused) + last_move += world.time - last_process + last_process = world.time + return + var/needed_time = world.time - last_move + last_process = world.time + last_move = world.time + increment(needed_time) diff --git a/code/game/objects/effects/temporary_visuals/projectile_beam.dm b/code/game/objects/effects/temporary_visuals/projectile_beam.dm new file mode 100644 index 0000000000..8918dc8e27 --- /dev/null +++ b/code/game/objects/effects/temporary_visuals/projectile_beam.dm @@ -0,0 +1,70 @@ +/proc/generate_projectile_beam_between_points(datum/point/starting, datum/point/ending, beam_type, color, qdel_in = 5) //Do not pass z-crossing points as that will not be properly (and likely will never be properly until it's absolutely needed) supported! + if(!istype(starting) || !istype(ending) || !ispath(beam_type)) + return + var/datum/point/midpoint = point_midpoint_points(starting, ending) + var/obj/effect/projectile_beam/PB = new beam_type + PB.apply_vars(angle_between_points(starting, ending), midpoint.return_px(), midpoint.return_py(), color, pixel_length_between_points(starting, ending) / world.icon_size, midpoint.return_turf(), 0) + . = PB + if(qdel_in) + QDEL_IN(PB, qdel_in) + +/obj/effect/projectile_beam + icon = 'icons/obj/projectiles.dmi' + layer = ABOVE_MOB_LAYER + anchored = TRUE + light_power = 1 + light_range = 2 + light_color = "#00ffff" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + flags_1 = ABSTRACT_1 + appearance_flags = 0 + +/obj/effect/projectile_beam/singularity_pull() + return + +/obj/effect/projectile_beam/singularity_act() + return + +/obj/effect/projectile_beam/proc/scale_to(nx,ny,override=TRUE) + var/matrix/M + if(!override) + M = transform + else + M = new + M.Scale(nx,ny) + transform = M + +/obj/effect/projectile_beam/proc/turn_to(angle,override=TRUE) + var/matrix/M + if(!override) + M = transform + else + M = new + M.Turn(angle) + transform = M + +/obj/effect/projectile_beam/New(angle_override, p_x, p_y, color_override, scaling = 1) + if(angle_override && p_x && p_y && color_override && scaling) + apply_vars(angle_override, p_x, p_y, color_override, scaling) + return ..() + +/obj/effect/projectile_beam/proc/apply_vars(angle_override, p_x = 0, p_y = 0, color_override, scaling = 1, new_loc, increment = 0) + var/mutable_appearance/look = new(src) + look.pixel_x = p_x + look.pixel_y = p_y + if(color_override) + look.color = color_override + appearance = look + scale_to(1,scaling, FALSE) + turn_to(angle_override, FALSE) + if(!isnull(new_loc)) //If you want to null it just delete it... + forceMove(new_loc) + for(var/i in 1 to increment) + pixel_x += round((sin(angle_override)+16*sin(angle_override)*2), 1) + pixel_y += round((cos(angle_override)+16*cos(angle_override)*2), 1) + +/obj/effect/projectile_beam/tracer + icon_state = "tracer_beam" + +/obj/effect/projectile_beam/tracer/aiming + icon_state = "gbeam" diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 1ae513f847..a8ca42bff5 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -202,7 +202,7 @@ var/new_angle = WRAP(rotation_angle + norm_inc, 180, -180) if(ISINRANGE_EX(norm_inc, -90, 90)) return FALSE - P.Angle = new_angle + P.setAngle(new_angle) return ..() //DOUBLE @@ -229,7 +229,7 @@ var/new_angle = WRAP(rotation_angle + norm_inc, 180, -180) if(ISINRANGE_EX(norm_inc, -90, 90)) new_angle += 180 - P.Angle = new_angle + P.setAngle(new_angle) return ..() //BOX @@ -251,7 +251,7 @@ anchored = TRUE /obj/structure/reflector/box/auto_reflect(obj/item/projectile/P) - P.Angle = rotation_angle + P.setAngle(rotation_angle) return ..() /obj/structure/reflector/ex_act() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 00377e4f3f..14b7ef74b5 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -61,7 +61,7 @@ new_angle_s -= 360 while(new_angle_s < -180) new_angle_s += 360 - P.Angle = new_angle_s + P.setAngle(new_angle_s) return TRUE /turf/closed/wall/proc/dismantle_wall(devastated=0, explode=0) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ff7ed7653e..e9a78f7f6d 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -400,7 +400,8 @@ /obj/item/gun/dropped(mob/user) ..() - zoom(user,FALSE) + if(zoomed) + zoom(user,FALSE) if(azoom) azoom.Remove(user) if(alight) diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm index ee8036bf44..a2ea7dfb59 100644 --- a/code/modules/projectiles/guns/beam_rifle.dm +++ b/code/modules/projectiles/guns/beam_rifle.dm @@ -4,9 +4,6 @@ #define ZOOM_LOCK_CENTER_VIEW 2 #define ZOOM_LOCK_OFF 3 -#define ZOOM_SPEED_STEP 0 -#define ZOOM_SPEED_INSTANT 1 - #define AUTOZOOM_PIXEL_STEP_FACTOR 48 #define AIMING_BEAM_ANGLE_CHANGE_THRESHOLD 0.1 @@ -45,7 +42,7 @@ var/lastangle = 0 var/aiming_lastangle = 0 var/mob/current_user = null - var/obj/effect/projectile_beam/current_tracer + var/list/obj/effect/projectile_beam/current_tracers var/structure_piercing = 2 //Amount * 2. For some reason structures aren't respecting this unless you have it doubled. Probably with the objects in question's Bump() code instead of this but I'll deal with this later. var/structure_bleed_coeff = 0.7 @@ -69,9 +66,8 @@ //ZOOMING var/zoom_current_view_increase = 0 var/zoom_target_view_increase = 10 - var/zoom_speed = ZOOM_SPEED_STEP var/zooming = FALSE - var/zoom_lock = ZOOM_LOCK_AUTOZOOM_FREEMOVE + var/zoom_lock = ZOOM_LOCK_OFF var/zooming_angle var/current_zoom_x = 0 var/current_zoom_y = 0 @@ -80,7 +76,6 @@ var/static/image/charged_overlay = image(icon = 'icons/obj/guns/energy.dmi', icon_state = "esniper_charged") var/static/image/drained_overlay = image(icon = 'icons/obj/guns/energy.dmi', icon_state = "esniper_empty") - var/datum/action/item_action/zoom_speed_action/zoom_speed_action var/datum/action/item_action/zoom_lock_action/zoom_lock_action /obj/item/gun/energy/beam_rifle/debug @@ -103,15 +98,6 @@ . = ..() /obj/item/gun/energy/beam_rifle/ui_action_click(owner, action) - if(istype(action, /datum/action/item_action/zoom_speed_action)) - zoom_speed++ - if(zoom_speed > 1) - zoom_speed = ZOOM_SPEED_STEP - switch(zoom_speed) - if(ZOOM_SPEED_STEP) - to_chat(owner, "You switch [src]'s digital zoom to stepper mode.") - if(ZOOM_SPEED_INSTANT) - to_chat(owner, "You switch [src]'s digital zoom to instant mode.") if(istype(action, /datum/action/item_action/zoom_lock_action)) zoom_lock++ if(zoom_lock > 3) @@ -135,8 +121,6 @@ var/total_time = SSfastprocess.wait if(delay_override) total_time = delay_override - if(zoom_speed == ZOOM_SPEED_INSTANT) - total_time = 0 zoom_animating = total_time animate(current_user.client, pixel_x = current_zoom_x, pixel_y = current_zoom_y , total_time, SINE_EASING, ANIMATION_PARALLEL) zoom_animating = 0 @@ -150,18 +134,10 @@ /obj/item/gun/energy/beam_rifle/proc/handle_zooming() if(!zooming || !check_user()) return - if(zoom_speed == ZOOM_SPEED_INSTANT) - current_user.client.change_view(world.view + zoom_target_view_increase) - zoom_current_view_increase = zoom_target_view_increase - set_autozoom_pixel_offsets_immediate(zooming_angle) - smooth_zooming() - return - if(zoom_current_view_increase > zoom_target_view_increase) - return - zoom_current_view_increase++ - current_user.client.change_view(zoom_current_view_increase + world.view) + current_user.client.change_view(world.view + zoom_target_view_increase) + zoom_current_view_increase = zoom_target_view_increase set_autozoom_pixel_offsets_immediate(zooming_angle) - smooth_zooming(SSfastprocess.wait * zoom_target_view_increase * zoom_speed) + smooth_zooming() /obj/item/gun/energy/beam_rifle/proc/start_zooming() if(zoom_lock == ZOOM_LOCK_OFF) @@ -169,8 +145,9 @@ zooming = TRUE /obj/item/gun/energy/beam_rifle/proc/stop_zooming() - zooming = FALSE - reset_zooming() + if(zooming) + zooming = FALSE + reset_zooming() /obj/item/gun/energy/beam_rifle/proc/reset_zooming() if(!check_user(FALSE)) @@ -204,14 +181,14 @@ /obj/item/gun/energy/beam_rifle/Initialize() . = ..() + current_tracers = list() START_PROCESSING(SSprojectiles, src) - zoom_speed_action = new(src) zoom_lock_action = new(src) /obj/item/gun/energy/beam_rifle/Destroy() STOP_PROCESSING(SSfastprocess, src) set_user(null) - QDEL_NULL(current_tracer) + QDEL_LIST(current_tracers) return ..() /obj/item/gun/energy/beam_rifle/emp_act(severity) @@ -245,6 +222,7 @@ /obj/item/gun/energy/beam_rifle/process() if(!aiming) + last_process = world.time return check_user() handle_zooming() @@ -299,7 +277,7 @@ set waitfor = FALSE aiming_time_left = aiming_time aiming = FALSE - QDEL_NULL(current_tracer) + QDEL_LIST(current_tracers) stop_zooming() /obj/item/gun/energy/beam_rifle/proc/set_user(mob/user) @@ -341,7 +319,7 @@ sync_ammo() afterattack(M.client.mouseObject, M, FALSE, M.client.mouseParams, passthrough = TRUE) stop_aiming() - QDEL_NULL(current_tracer) + QDEL_LIST(current_tracers) return ..() /obj/item/gun/energy/beam_rifle/afterattack(atom/target, mob/living/user, flag, params, passthrough = FALSE) @@ -555,136 +533,103 @@ handle_impact(target) /obj/item/projectile/beam/beam_rifle/Collide(atom/target) - paused = TRUE if(check_pierce(target)) permutated += target return FALSE if(!QDELETED(target)) cached = get_turf(target) - paused = FALSE . = ..() /obj/item/projectile/beam/beam_rifle/on_hit(atom/target, blocked = FALSE) - paused = TRUE if(!QDELETED(target)) cached = get_turf(target) handle_hit(target) - paused = FALSE . = ..() /obj/item/projectile/beam/beam_rifle/hitscan icon_state = "" var/tracer_type = /obj/effect/projectile_beam/tracer - var/starting_z - var/starting_p_x - var/starting_p_y + var/list/beam_segments //assoc list of datum/point or datum/point/vector, start = end. var/constant_tracer = FALSE - var/travelled_p_x = 0 - var/travelled_p_y = 0 - var/tracer_spawned = FALSE + var/beam_index /obj/item/projectile/beam/beam_rifle/hitscan/Destroy() - paused = TRUE //STOP HITTING WHEN YOU'RE ALREADY BEING DELETED! - spawn_tracer(constant_tracer) + if(loc) + var/datum/point/pcache = trajectory.copy_to() + beam_segments[beam_index] = pcache + generate_tracers(constant_tracer) return ..() -/obj/item/projectile/beam/beam_rifle/hitscan/proc/spawn_tracer(put_in_rifle = FALSE) - if(tracer_spawned) - return - tracer_spawned = TRUE - //Remind me to port baystation trajectories so this shit isn't needed... - var/pixels_travelled = round(sqrt(travelled_p_x**2 + travelled_p_y**2),1) - var/scaling = pixels_travelled/world.icon_size - var/midpoint_p_x = round(starting_p_x + (travelled_p_x / 2)) - var/midpoint_p_y = round(starting_p_y + (travelled_p_y / 2)) - var/tracer_px = midpoint_p_x % world.icon_size - var/tracer_py = midpoint_p_y % world.icon_size - var/tracer_lx = (midpoint_p_x - tracer_px) / world.icon_size - var/tracer_ly = (midpoint_p_y - tracer_py) / world.icon_size - var/obj/effect/projectile_beam/PB = new tracer_type(src) - PB.apply_vars(Angle, tracer_px, tracer_py, color, scaling, locate(tracer_lx,tracer_ly,starting_z)) - if(put_in_rifle && istype(gun)) - if(gun.current_tracer) - QDEL_NULL(gun.current_tracer) - gun.current_tracer = PB - else - QDEL_IN(PB, 5) +/obj/item/projectile/beam/beam_rifle/hitscan/Collide(atom/target) + var/datum/point/pcache = trajectory.copy_to() + . = ..() + if(. && !QDELETED(src)) //successful touch and not destroyed. + beam_segments[beam_index] = pcache + beam_index = pcache + beam_segments[beam_index] = null -/obj/item/projectile/beam/beam_rifle/hitscan/proc/check_for_turf_edge(turf/T) - if(!istype(T)) - return TRUE - var/tx = T.x - var/ty = T.y - if(tx < 10 || tx > (world.maxx - 10) || ty < 10 || ty > (world.maxy-10)) - return TRUE - return FALSE +/obj/item/projectile/beam/beam_rifle/hitscan/before_z_change(turf/oldloc, turf/newloc) + var/datum/point/pcache = trajectory.copy_to() + beam_segments[beam_index] = pcache + beam_index = RETURN_PRECISE_POINT(newloc) + beam_segments[beam_index] = null + return ..() + +/obj/item/projectile/beam/beam_rifle/hitscan/proc/generate_tracers(highlander = FALSE, cleanup = TRUE) + set waitfor = FALSE + if(highlander && istype(gun)) + QDEL_LIST(gun.current_tracers) + for(var/datum/point/p in beam_segments) + gun.current_tracers += generate_projectile_beam_between_points(p, beam_segments[p], tracer_type, color, 0) + else + for(var/datum/point/p in beam_segments) + generate_projectile_beam_between_points(p, beam_segments[p], tracer_type, color, 5) + if(cleanup) + QDEL_LIST(beam_segments) + beam_segments = null + QDEL_NULL(beam_index) /obj/item/projectile/beam/beam_rifle/hitscan/fire(setAngle, atom/direct_target) //oranges didn't let me make this a var the first time around so copypasta time - set waitfor = 0 + set waitfor = FALSE + var/turf/starting = get_turf(src) + trajectory = new(starting.x, starting.y, starting.z, 0, 0, setAngle? setAngle : Angle, 33) if(!log_override && firer && original) add_logs(firer, original, "fired at", src, " [get_area(src)]") + fired = TRUE if(setAngle) Angle = setAngle - var/next_run = world.time - var/old_pixel_x = pixel_x - var/old_pixel_y = pixel_y var/safety = 0 //The code works fine, but... just in case... var/turf/c2 - var/starting_x = loc.x - var/starting_y = loc.y - starting_z = loc.z - starting_p_x = starting_x * world.icon_size + pixel_x - starting_p_y = starting_y * world.icon_size + pixel_y + beam_segments = list() //initialize segment list with the list for the first segment + beam_index = RETURN_PRECISE_POINT(src) + beam_segments[beam_index] = null //record start. + if(spread) + Angle += (rand() - 0.5) * spread while(loc) + if(paused || QDELETED(src)) + return if(++safety > (range * 3)) //If it's looping for way, way too long... + qdel(src) + stack_trace("WARNING: [type] projectile encountered infinite recursion in [__FILE__]/[__LINE__]!") return //Kill! - if(spread) - Angle += (rand() - 0.5) * spread var/matrix/M = new M.Turn(Angle) transform = M - var/Pixel_x=sin(Angle)+16*sin(Angle)*2 - var/Pixel_y=cos(Angle)+16*cos(Angle)*2 - travelled_p_x += Pixel_x - travelled_p_y += Pixel_y - var/pixel_x_offset = old_pixel_x + Pixel_x - var/pixel_y_offset = old_pixel_y + Pixel_y - var/new_x = x - var/new_y = y - while(pixel_x_offset > 16) - pixel_x_offset -= 32 - old_pixel_x -= 32 - new_x++// x++ - while(pixel_x_offset < -16) - pixel_x_offset += 32 - old_pixel_x += 32 - new_x-- - while(pixel_y_offset > 16) - pixel_y_offset -= 32 - old_pixel_y -= 32 - new_y++ - while(pixel_y_offset < -16) - pixel_y_offset += 32 - old_pixel_y += 32 - new_y-- - pixel_x = old_pixel_x - pixel_y = old_pixel_y - step_towards(src, locate(new_x, new_y, z)) - next_run += max(world.tick_lag, speed) - var/delay = next_run - world.time - if(delay <= world.tick_lag*2) - pixel_x = pixel_x_offset - pixel_y = pixel_y_offset + trajectory.increment() + var/turf/T = trajectory.return_turf() + if(T.z != loc.z) + before_z_change(loc, T) + trajectory_ignore_forcemove = TRUE + forceMove(T) + trajectory_ignore_forcemove = FALSE else - animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW) - old_pixel_x = pixel_x_offset - old_pixel_y = pixel_y_offset + step_towards(src, T) + animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 1, flags = ANIMATION_END_NOW) + if(can_hit_target(original, permutated)) Collide(original) - c2 = loc Range() - if(check_for_turf_edge(loc)) - spawn_tracer(constant_tracer) + c2 = get_turf(src) if(istype(c2)) cached = c2 @@ -704,76 +649,3 @@ /obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/on_hit() qdel(src) return FALSE - -/obj/effect/projectile_beam - icon = 'icons/obj/projectiles.dmi' - layer = ABOVE_MOB_LAYER - anchored = TRUE - light_power = 1 - light_range = 2 - light_color = "#00ffff" - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - flags_1 = ABSTRACT_1 - appearance_flags = 0 - -/obj/effect/projectile_beam/proc/scale_to(nx,ny,override=TRUE) - var/matrix/M - if(!override) - M = transform - else - M = new - M.Scale(nx,ny) - transform = M - -/obj/effect/projectile_beam/proc/turn_to(angle,override=TRUE) - var/matrix/M - if(!override) - M = transform - else - M = new - M.Turn(angle) - transform = M - -/obj/effect/projectile_beam/New(angle_override, p_x, p_y, color_override, scaling = 1) - if(angle_override && p_x && p_y && color_override && scaling) - apply_vars(angle_override, p_x, p_y, color_override, scaling) - return ..() - -/obj/effect/projectile_beam/proc/apply_vars(angle_override, p_x, p_y, color_override, scaling = 1, new_loc, increment = 0) - var/mutable_appearance/look = new(src) - look.pixel_x = p_x - look.pixel_y = p_y - if(color_override) - look.color = color_override - appearance = look - scale_to(1,scaling, FALSE) - turn_to(angle_override, FALSE) - if(!isnull(new_loc)) //If you want to null it just delete it... - forceMove(new_loc) - for(var/i in 1 to increment) - pixel_x += round((sin(angle_override)+16*sin(angle_override)*2), 1) - pixel_y += round((cos(angle_override)+16*cos(angle_override)*2), 1) - -/obj/effect/projectile_beam/tracer - icon_state = "tracer_beam" - -/obj/effect/projectile_beam/tracer/aiming - icon_state = "gbeam" - -/datum/action/item_action/zoom_speed_action - name = "Toggle Zooming Speed" - icon_icon = 'icons/mob/actions/actions_spells.dmi' - button_icon_state = "projectile" - background_icon_state = "bg_tech" - -/datum/action/item_action/zoom_lock_action - name = "Switch Zoom Mode" - icon_icon = 'icons/mob/actions/actions_items.dmi' - button_icon_state = "zoom_mode" - background_icon_state = "bg_tech" - -/obj/effect/projectile_beam/singularity_pull() - return - -/obj/effect/projectile_beam/singularity_act() - return diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 79e2fdf903..08142f1e8d 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -31,16 +31,11 @@ var/last_projectile_move = 0 var/last_process = 0 var/time_offset = 0 - var/old_pixel_x = 0 - var/old_pixel_y = 0 - var/pixel_x_increment = 0 - var/pixel_y_increment = 0 - var/pixel_x_offset = 0 - var/pixel_y_offset = 0 - var/new_x = 0 - var/new_y = 0 + var/datum/point/vector/trajectory + var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location! var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel + var/pixel_speed = 33 //pixels per move - DO NOT FUCK WITH THIS UNLESS YOU ABSOLUTELY KNOW WHAT YOU ARE DOING OR UNEXPECTED THINGS /WILL/ HAPPEN! var/Angle = 0 var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle var/spread = 0 //amount (in degrees) of projectile spread @@ -48,6 +43,9 @@ var/ricochets = 0 var/ricochets_max = 2 var/ricochet_chance = 30 + + var/colliding = FALSE //pause processing.. + var/ignore_source_check = FALSE var/damage = 10 @@ -168,20 +166,28 @@ /obj/item/projectile/proc/vol_by_damage() if(src.damage) - return CLAMP((src.damage) * 0.67, 30, 100)// Multiply projectile damage by 0.67, then clamp the value between 30 and 100 + return CLAMP((src.damage) * 0.67, 30, 100)// Multiply projectile damage by 0.67, then CLAMP the value between 30 and 100 else return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume +/obj/item/projectile/proc/on_ricochet(atom/A) + return + /obj/item/projectile/Collide(atom/A) + colliding = TRUE if(check_ricochet(A) && check_ricochet_flag(A) && ricochets < ricochets_max) ricochets++ if(A.handle_ricochet(src)) + on_ricochet(A) ignore_source_check = TRUE range = initial(range) - return FALSE + return TRUE if(firer && !ignore_source_check) if(A == firer || (A == firer.loc && ismecha(A))) //cannot shoot yourself or your mech - loc = A.loc + trajectory_ignore_forcemove = TRUE + forceMove(get_turf(A)) + trajectory_ignore_forcemove = FALSE + colliding = FALSE return FALSE var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. @@ -197,25 +203,32 @@ if(!prehit(A)) if(forcedodge) - loc = target_turf + trajectory_ignore_forcemove = TRUE + forceMove(target_turf) + trajectory_ignore_forcemove = FALSE + colliding = FALSE return FALSE var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null if(permutation == -1 || forcedodge)// the bullet passes through a dense object! - loc = target_turf + trajectory_ignore_forcemove = TRUE + forceMove(target_turf) + trajectory_ignore_forcemove = FALSE if(A) permutated.Add(A) + colliding = FALSE return FALSE else var/atom/alt = select_target(A) if(alt) if(!prehit(alt)) + colliding = FALSE return FALSE alt.bullet_act(src, def_zone) qdel(src) + colliding = FALSE return TRUE - /obj/item/projectile/proc/select_target(atom/A) //Selects another target from a wall if we hit a wall. if(!A || !A.density || (A.flags_1 & ON_BORDER_1) || ismob(A) || A == original) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs or machines/structures on that tile. return @@ -246,12 +259,30 @@ return TRUE return FALSE +/obj/item/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle) //I say predicted because there's no telling that the projectile won't change direction/location in flight. + if(!trajectory && isnull(forced_angle) && isnull(Angle)) + return FALSE + var/datum/point/vector/current = trajectory + if(!current) + var/turf/T = get_turf(src) + current = new(T.x, T.y, T.z, pixel_x, pixel_y, isnull(forced_angle)? Angle : forced_angle, pixel_speed) + var/datum/point/vector/v = current.return_vector_after_increments(moves) + return v.return_turf() + +/obj/item/projectile/proc/return_pathing_turfs_in_moves(moves, forced_angle) + var/turf/current = get_turf(src) + var/turf/ending = return_predicted_turf_after_moves(moves, forced_angle) + return getline(current, ending) + +/obj/item/projectile/proc/before_z_change(turf/oldloc, turf/newloc) + return + /obj/item/projectile/Process_Spacemove(var/movement_dir = 0) return TRUE //Bullets don't drift in space /obj/item/projectile/process() last_process = world.time - if(!loc || !fired) + if(!loc || !fired || !trajectory) fired = FALSE return PROCESS_KILL if(paused || !isturf(loc)) @@ -285,73 +316,70 @@ setAngle(angle) if(spread) setAngle(Angle + ((rand() - 0.5) * spread)) + var/turf/starting = get_turf(src) if(isnull(Angle)) //Try to resolve through offsets if there's no angle set. - var/turf/starting = get_turf(src) + if(isnull(xo) || isnull(yo)) + stack_trace("WARNING: Projectile [type] deleted due to being unable to resolve a target after angle was null!") + qdel(src) + return var/turf/target = locate(CLAMP(starting + xo, 1, world.maxx), CLAMP(starting + yo, 1, world.maxy), starting.z) setAngle(Get_Angle(src, target)) if(!nondirectional_sprite) var/matrix/M = new M.Turn(Angle) transform = M - old_pixel_x = pixel_x - old_pixel_y = pixel_y + trajectory = new(starting.x, starting.y, starting.z, 0, 0, Angle, pixel_speed) last_projectile_move = world.time fired = TRUE if(!isprocessing) START_PROCESSING(SSprojectiles, src) + pixel_move(1) //move it now! /obj/item/projectile/proc/setAngle(new_angle) //wrapper for overrides. Angle = new_angle - return TRUE - -/obj/item/projectile/proc/pixel_move(moves) if(!nondirectional_sprite) var/matrix/M = new M.Turn(Angle) transform = M + if(trajectory) + trajectory.set_angle(new_angle) + return TRUE - pixel_x_increment=round((sin(Angle)+16*sin(Angle)*2), 1) //round() is a floor operation when only one argument is supplied, we don't want that here - pixel_y_increment=round((cos(Angle)+16*cos(Angle)*2), 1) - pixel_x_offset = old_pixel_x + pixel_x_increment - pixel_y_offset = old_pixel_y + pixel_y_increment - new_x = x - new_y = y +/obj/item/projectile/forceMove(atom/target) + . = ..() + if(trajectory && !trajectory_ignore_forcemove && isturf(target)) + trajectory.initialize_location(target.x, target.y, target.z, 0, 0) - while(pixel_x_offset > 16) - pixel_x_offset -= 32 - old_pixel_x -= 32 - new_x++// x++ - while(pixel_x_offset < -16) - pixel_x_offset += 32 - old_pixel_x += 32 - new_x-- - while(pixel_y_offset > 16) - pixel_y_offset -= 32 - old_pixel_y -= 32 - new_y++ - while(pixel_y_offset < -16) - pixel_y_offset += 32 - old_pixel_y += 32 - new_y-- +/obj/item/projectile/proc/pixel_move(moves, trajectory_multiplier = 1) + if(!loc || !trajectory) + return + last_projectile_move = world.time + if(!nondirectional_sprite) + var/matrix/M = new + M.Turn(Angle) + transform = M + trajectory.increment(trajectory_multiplier) + var/turf/T = trajectory.return_turf() + if(T.z != loc.z) + before_z_change(loc, T) + trajectory_ignore_forcemove = TRUE + forceMove(T) + trajectory_ignore_forcemove = FALSE + pixel_x = trajectory.return_px() + pixel_y = trajectory.return_py() + else + step_towards(src, T) + pixel_x = trajectory.return_px() - trajectory.mpx * trajectory_multiplier + pixel_y = trajectory.return_py() - trajectory.mpy * trajectory_multiplier + animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 1, flags = ANIMATION_END_NOW) - step_towards(src, locate(new_x, new_y, z)) - pixel_x = old_pixel_x - pixel_y = old_pixel_y - animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = 1, flags = ANIMATION_END_NOW) - old_pixel_x = pixel_x_offset - old_pixel_y = pixel_y_offset if(can_hit_target(original, permutated)) Collide(original) Range() - last_projectile_move = world.time //Returns true if the target atom is on our current turf and above the right layer /obj/item/projectile/proc/can_hit_target(atom/target, var/list/passthrough) - if(target && (target.layer >= PROJECTILE_HIT_THRESHHOLD_LAYER) || ismob(target)) - if(loc == get_turf(target)) - if(!(target in passthrough)) - return TRUE - return FALSE + return (target && ((target.layer >= PROJECTILE_HIT_THRESHHOLD_LAYER) || ismob(target)) && (loc == get_turf(target)) && (!(target in passthrough))) /obj/item/projectile/proc/preparePixelProjectile(atom/target, atom/source, params, spread = 0) var/turf/curloc = get_turf(source) @@ -362,7 +390,8 @@ if(targloc || !params) yo = targloc.y - curloc.y xo = targloc.x - curloc.x - + setAngle(Get_Angle(src, targloc)) + if(isliving(source) && params) var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, params) p_x = calculated[2] @@ -372,8 +401,13 @@ setAngle(calculated[1] + spread) else setAngle(calculated[1]) - else + else if(targloc) + yo = targloc.y - curloc.y + xo = targloc.x - curloc.x setAngle(Get_Angle(src, targloc)) + else + stack_trace("WARNING: Projectile [type] fired without either mouse parameters, or a target atom to aim at!") + qdel(src) /proc/calculate_projectile_angle_and_pixel_offsets(mob/user, params) var/list/mouse_control = params2list(params) diff --git a/code/modules/space_transition/space_transition.dm b/code/modules/space_transition/space_transition.dm index 2a8be8a761..edcad9b620 100644 --- a/code/modules/space_transition/space_transition.dm +++ b/code/modules/space_transition/space_transition.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(z_levels_list) neigbours[A] = src /datum/space_level/proc/set_neigbours(list/L) - for(var/datum/point/P in L) + for(var/datum/space_transition_point/P in L) if(P.x == xi) if(P.y == yi+1) neigbours[TEXT_NORTH] = P.spl @@ -35,13 +35,13 @@ GLOBAL_LIST_EMPTY(z_levels_list) neigbours[TEXT_WEST] = P.spl P.spl.neigbours[TEXT_EAST] = src -/datum/point //this is explicitly utilitarian datum type made specially for the space map generation and are absolutely unusable for anything else +/datum/space_transition_point //this is explicitly utilitarian datum type made specially for the space map generation and are absolutely unusable for anything else var/list/neigbours = list() var/x var/y var/datum/space_level/spl -/datum/point/New(nx, ny, list/point_grid) +/datum/space_transition_point/New(nx, ny, list/point_grid) if(!point_grid) qdel(src) return @@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(z_levels_list) return point_grid[x][y] = src -/datum/point/proc/set_neigbours(list/grid) +/datum/space_transition_point/proc/set_neigbours(list/grid) var/max_X = grid.len var/list/max_Y = grid[1] max_Y = max_Y.len @@ -86,13 +86,13 @@ GLOBAL_LIST_EMPTY(z_levels_list) k++ var/list/point_grid[conf_set_len*2+1][conf_set_len*2+1] var/list/grid = list() - var/datum/point/P + var/datum/space_transition_point/P for(var/i = 1, i<=conf_set_len*2+1, i++) for(var/j = 1, j<=conf_set_len*2+1, j++) - P = new/datum/point(i,j, point_grid) + P = new/datum/space_transition_point(i,j, point_grid) point_grid[i][j] = P grid.Add(P) - for(var/datum/point/pnt in grid) + for(var/datum/space_transition_point/pnt in grid) pnt.set_neigbours(point_grid) P = point_grid[conf_set_len+1][conf_set_len+1] var/list/possible_points = list() diff --git a/tgstation.dme b/tgstation.dme index 139d4d00e3..c9e3ef2e0e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -306,6 +306,7 @@ #include "code\datums\mutable_appearance.dm" #include "code\datums\mutations.dm" #include "code\datums\outfit.dm" +#include "code\datums\position_point_vector.dm" #include "code\datums\profiling.dm" #include "code\datums\progressbar.dm" #include "code\datums\radiation_wave.dm" @@ -318,6 +319,7 @@ #include "code\datums\verbs.dm" #include "code\datums\weakrefs.dm" #include "code\datums\world_topic.dm" +#include "code\datums\actions\beam_rifle.dm" #include "code\datums\actions\flightsuit.dm" #include "code\datums\actions\ninja.dm" #include "code\datums\antagonists\abductor.dm" @@ -851,6 +853,7 @@ #include "code\game\objects\effects\temporary_visuals\clockcult.dm" #include "code\game\objects\effects\temporary_visuals\cult.dm" #include "code\game\objects\effects\temporary_visuals\miscellaneous.dm" +#include "code\game\objects\effects\temporary_visuals\projectile_beam.dm" #include "code\game\objects\effects\temporary_visuals\temporary_visual.dm" #include "code\game\objects\items\AI_modules.dm" #include "code\game\objects\items\airlock_painter.dm" From b9ec312d94bfe7e9084b22a6456e8caee613a41c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 22 Dec 2017 03:16:28 -0600 Subject: [PATCH 034/132] Update client_procs.dm --- code/modules/client/client_procs.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index da5a1846f7..c3a6995b7a 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -199,13 +199,7 @@ GLOBAL_LIST(external_rsc_urls) prefs.parent = src prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning -<<<<<<< HEAD - if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps) - vars["fps"] = prefs.clientfps - sethotkeys(1) //set hoykeys from preferences (from_pref = 1) -======= fps = prefs.clientfps ->>>>>>> e72cfeb... code improvements from mso and co (#33485) log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[byond_version]") var/alert_mob_dupe_login = FALSE From 6cfd346bddc54ec02544cfdb9a3b5e3cae58a497 Mon Sep 17 00:00:00 2001 From: WJohn Date: Fri, 22 Dec 2017 11:34:24 -0500 Subject: [PATCH 035/132] Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) --- _maps/map_files/BoxStation/BoxStation.dmm | 10 +- .../map_files/Deltastation/DeltaStation2.dmm | 10 +- _maps/map_files/MetaStation/MetaStation.dmm | 10 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 10 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 10 +- _maps/map_files/generic/CentCom.dmm | 1004 +++++++++-------- code/modules/shuttle/syndicate.dm | 4 +- 7 files changed, 591 insertions(+), 467 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 335393adac..12b9c297fc 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8973,14 +8973,14 @@ /area/maintenance/port/fore) "avT" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2852c76257..05a68f83ac 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3322,14 +3322,14 @@ /area/construction/mining/aux_base) "agO" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8ed9acf09f..e31bb2fc08 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -80597,14 +80597,14 @@ /area/shuttle/abandoned) "EDa" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_nw"; name = "northwest of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space/basic, /area/space/nearstation) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index ffda1f471d..4fc42569fa 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -34669,14 +34669,14 @@ /area/space/nearstation) "sws" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_sw"; name = "southwest of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 7eb9a7ac7a..54e01bc923 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3137,14 +3137,14 @@ /area/maintenance/department/crew_quarters/dorms) "ajA" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 27198fe072..804e2c7a9a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -7568,11 +7568,16 @@ }, /area/shuttle/syndicate/hallway) "uc" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 4 +/obj/structure/chair{ + dir = 4; + name = "tactical chair" }, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/syndicate/hallway) +/obj/effect/turf_decal/bot_white, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) "ud" = ( /obj/machinery/door/poddoor/shutters{ id = "nukeop_ready"; @@ -14641,6 +14646,125 @@ }, /turf/open/floor/plasteel, /area/tdome/arena) +"Mt" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"Mu" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"Mv" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"Mw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"Mx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"My" = ( +/obj/docking_port/stationary{ + area_type = /area/syndicate_mothership; + baseturf_type = /turf/open/floor/plating/asteroid/snow; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + id = "syndicate_away"; + name = "syndicate recon outpost"; + turf_type = /turf/open/floor/plating/asteroid/snow; + width = 23 + }, +/obj/machinery/door/poddoor{ + id = "smindicate"; + name = "outer blast door" + }, +/obj/machinery/button/door{ + id = "smindicate"; + name = "external door control"; + pixel_x = 0; + pixel_y = 26; + req_access_txt = "150" + }, +/obj/docking_port/mobile{ + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; + hidden = 1; + id = "syndicate"; + movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + name = "syndicate infiltrator"; + port_direction = 4; + roundstart_move = null; + width = 23 + }, +/obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"Mz" = ( +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"MA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"MB" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/shuttle/syndicate/airlock) +"MC" = ( +/obj/structure/rack, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/airlock) +"MD" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'FOURTH WALL'."; + name = "\improper FOURTH WALL"; + pixel_x = -32 + }, +/turf/open/floor/plating/asteroid/snow/airless, +/area/syndicate_mothership) (1,1,1) = {" aa @@ -26361,38 +26485,38 @@ hl hl hl hh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh aa aa aa @@ -26617,41 +26741,41 @@ hl hl hl hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +kt +MD +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +hl hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh +aa +aa aa aa aa @@ -26887,27 +27011,25 @@ hl hl hl hl +kt +kt +kt +kt +kt +kt +kt +yc +yd +yd +yd +yd +yd +yd +yd +yd +yd +kt hl -hl -hl -hl -hl -hl -hl -we -hl -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt hh aa aa @@ -26977,6 +27099,8 @@ aa aa aa aa +aa +aa "} (49,1,1) = {" aa @@ -27144,27 +27268,25 @@ hl hl hl hl -hl -hl -hl -kt kt +tY +tZ +tZ +tZ +tZ +tZ +yd +yL +zs +yL +AC +Bj +BT +Cj +CS +Di kt hl -hl -hl -hl -yc -yd -yd -yd -yd -yd -yd -yd -yd -yd -kt hh aa aa @@ -27234,6 +27356,8 @@ aa aa aa aa +aa +aa "} (50,1,1) = {" aa @@ -27401,27 +27525,25 @@ hl hl hl hl -hl -hl -hl -hl -tY -tZ -tZ -tZ -tZ -tZ -yd -yL -zs -yL -AC -Bj -BT -Cj -CS -Di kt +tZ +uG +vo +vo +vo +xA +yd +yM +zt +zR +zR +Bk +zR +Ck +CS +Dj +kt +hl hh aa aa @@ -27491,6 +27613,8 @@ aa aa aa aa +aa +aa "} (51,1,1) = {" aa @@ -27652,33 +27776,31 @@ hl hl hl hl -hl -hl -hl -hl -hl -hl -hl -hl -hl +kt +kt +kt +kt +kt +kt kt tZ -uG -vo -vo -vo -xA -yd -yM +uH +uH +uH +uH +uH +ye +yN zt -zR -zR -Bk -zR -Ck +zS +AD +Bl +BU +Cl CS -Dj +Dk kt +hl hh aa aa @@ -27748,6 +27870,8 @@ aa aa aa aa +aa +aa "} (52,1,1) = {" aa @@ -27909,33 +28033,31 @@ hl hl my hl -hl -kt -kt +oS +oT +oT +oT +oT hl hl -hl -hl -hl -hl -kt tZ uH uH uH uH uH -ye -yN +yd +yO zt -zS -AD -Bl -BU -Cl -CS -Dk +zT +AE +Bm +yf +yd +yd +Dl kt +hl hh aa aa @@ -28005,6 +28127,8 @@ aa aa aa aa +aa +aa "} (53,1,1) = {" aa @@ -28166,33 +28290,31 @@ hl hl hl hl -hl -kt -hl -oS oT +px +pR +qI oT -oT -oT -hl +rY hl tZ -uH -uH -uH -uH -uH +uI +vp +wf +wR +xB yd -yO +yP zt zT AE -Bm -yf +Bn yd -yd -Dl +hl +hl kt +kt +hl hh aa aa @@ -28262,6 +28384,8 @@ aa aa aa aa +aa +aa "} (54,1,1) = {" aa @@ -28423,33 +28547,31 @@ hl hl hl hl -hl -kt -hl -oT -px -pR +oU +py +pS qI oT -rY -hl +rZ +rZ tZ -uI -vp -wf -wR -xB +tZ +tZ +tZ +wS +xC +yf +yQ +yQ +zU +yQ yd -yP -zt -zT -AE -Bn yd +rZ +rZ +kt hl hl -kt -kt hh aa aa @@ -28519,6 +28641,8 @@ aa aa aa aa +aa +aa "} (55,1,1) = {" aa @@ -28680,31 +28804,29 @@ hl hl hl nx -hl -kt -hl oU -py -pS +pz +pT qI -oT -rZ -rZ -tZ -tZ -tZ -tZ -wS -xC -yf -yQ -yQ -zU -yQ -yd -yd -rZ -rZ +rb +sa +sY +ua +sY +sY +wg +sb +sb +sb +sb +zu +zV +AF +Bo +BV +Cm +CT +kt hl hl hh @@ -28776,6 +28898,8 @@ aa aa aa aa +aa +aa "} (56,1,1) = {" aa @@ -28937,31 +29061,29 @@ hl hl hl hl -hl -kt -hl oU -pz -pT +pA +pU qI -rb -sa -sY -ua -sY -sY -wg +rc sb +sZ +sZ +sZ sb +wh sb -sb -zu +sZ +sZ +sZ +sZ zV AF Bo -BV +BW Cm -CT +CU +kt hl hl hh @@ -29033,6 +29155,8 @@ aa aa aa aa +aa +aa "} (57,1,1) = {" aa @@ -29194,31 +29318,29 @@ hl my hl hl -hl -kt -hl oU -pA -pU +pB +pT qI -rc +oT +sc +ta +ub +ta +ta +wg sb -sZ -sZ -sZ sb -wh sb -sZ -sZ -sZ -sZ +sb +zv zV AF Bo -BW +BV Cm -CU +CV +kt hl hl hh @@ -29290,6 +29412,8 @@ aa aa aa aa +aa +aa "} (58,1,1) = {" aa @@ -29451,31 +29575,29 @@ hl hl hl hl -hl -kt -hl oU -pB -pT +pC +pV qI oT -sc -ta -ub -ta -ta -wg -sb -sb -sb -sb -zv -zV -AF -Bo -BV -Cm -CV +rZ +rZ +rZ +rZ +vq +vq +wT +xD +yg +yR +yR +zW +yR +yh +yh +rZ +rZ +kt hl hl hh @@ -29547,6 +29669,8 @@ aa aa aa aa +aa +aa "} (59,1,1) = {" aa @@ -29708,32 +29832,30 @@ hl hl hl hl -hl -kt -hl -oU -pC -pV +oT +pD +pW qI oT -rZ -rZ -uc -rZ -vq -vq -wT -xD -yg -yR -yR -zW -yR -yh -yh -rZ -rZ +sd hl +vq +Mt +Mv +uc +Mz +MB +yh +yS +zw +zX +AG +Bp +yh +hl +hl +kt +kt hl hh aa @@ -29804,6 +29926,8 @@ aa aa aa aa +aa +aa "} (60,1,1) = {" aa @@ -29965,33 +30089,31 @@ hl hl hl hl -hl -kt -hl +oV oT -pD -pW -qI oT -sd -tb -ng -nz +oT +oT +hl +hl vq -wi wU -xE +wU +wU +wU +wU yh -yS +yT zw zX AG -Bp +Bq +yg yh -hl -hl -kt +yh +Dm kt +hl hh aa aa @@ -30061,6 +30183,8 @@ aa aa aa aa +aa +aa "} (61,1,1) = {" aa @@ -30222,33 +30346,31 @@ hl mz hl my -hl kt -hl -oV -oT -oT -oT -oT -hl -tc -ll -uJ -vr -wj +kt +kt +kt +kt +kt +kt +vq wU -xE -yh -yT +wU +wU +wU +wU +yi +yU zw -zX -AG -Bq -yg -yh -yh -Dm +zY +AH +Br +zZ +Cn +CW +Dn kt +hl hh aa aa @@ -30318,6 +30440,8 @@ aa aa aa aa +aa +aa "} (62,1,1) = {" aa @@ -30480,32 +30604,30 @@ mA hl hl hl +hl +hl +nx +hl +hl kt -kt -kt -kt -kt -kt -kt -kt -tc -ll -uK -vs -wk -wU -xF -yi -yU +vq +Mu +Mw +Mx +MA +MC +yh +yV zw -zY -AH -Br zZ -Cn +zZ +Bs +zZ +Co CW -Dn +Do kt +hl hh aa aa @@ -30575,6 +30697,8 @@ aa aa aa aa +aa +aa "} (63,1,1) = {" aa @@ -30737,32 +30861,30 @@ hl hl hl hl -my hl hl hl hl -nx hl kt -tc -ll -tc -vt +yj vq vq +My +vs vq yh -yV +yW zw -zZ -zZ -Bs -zZ -Co +Aa +AI +Bt +BX +Cn CW -Do +Dp kt +hl hh aa aa @@ -30832,6 +30954,8 @@ aa aa aa aa +aa +aa "} (64,1,1) = {" aa @@ -30999,27 +31123,25 @@ hl hl hl hl -hl -hl kt -tc -ll -tc -hl -hl -hl -vq +kt +kt +uK +uJ +uK +kt +yj +yh +yh +yh +yh +yh +yh +yh +yh yh -yW -zw -Aa -AI -Bt -BX -Cn -CW -Dp kt +hl hh aa aa @@ -31089,6 +31211,8 @@ aa aa aa aa +aa +aa "} (65,1,1) = {" aa @@ -31250,7 +31374,7 @@ kt hl hl hl -mz +hl hl hl hl @@ -31262,21 +31386,19 @@ kt tc ll tc -hl -hl -hl -hl -yj -yh -yh -yh -yh -yh -yh -yh -yh -yh kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +hl hh aa aa @@ -31346,6 +31468,8 @@ aa aa aa aa +aa +aa "} (66,1,1) = {" aa @@ -31514,26 +31638,24 @@ hl kt kt kt -rd kt -td -ll -td +kt +tc +uJ +tc kt rd kt kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt -kt +hl +hl +hl +hl +hl +hl +hl +hl +hl hh aa aa @@ -31603,6 +31725,8 @@ aa aa aa aa +aa +aa "} (67,1,1) = {" aa @@ -31789,8 +31913,6 @@ hl hl hl hl -hl -hl hh aa aa @@ -31860,6 +31982,8 @@ aa aa aa aa +aa +aa "} (68,1,1) = {" aa @@ -32046,8 +32170,6 @@ hl hl hl hl -hl -hl hh aa aa @@ -32117,6 +32239,8 @@ aa aa aa aa +aa +aa "} (69,1,1) = {" aa @@ -32303,8 +32427,6 @@ hl hl BY hl -hl -hl hh aa aa @@ -32374,6 +32496,8 @@ aa aa aa aa +aa +aa "} (70,1,1) = {" aa @@ -32560,8 +32684,6 @@ hl BY Cp BY -hl -hl hh aa aa @@ -32631,6 +32753,8 @@ aa aa aa aa +aa +aa "} (71,1,1) = {" aa @@ -32817,8 +32941,6 @@ hl hl BY hl -hl -hl hh aa aa @@ -32888,6 +33010,8 @@ aa aa aa aa +aa +aa "} (72,1,1) = {" aa @@ -33074,8 +33198,6 @@ hl hl hl hl -hl -hl hh aa aa @@ -33145,6 +33267,8 @@ aa aa aa aa +aa +aa "} (73,1,1) = {" aa @@ -33332,8 +33456,8 @@ hh hh hh hh -hh -hh +aa +aa aa aa aa diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 283ac0f35c..ee5a435a86 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -56,8 +56,8 @@ shuttlePortName = "custom location" jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1) view_range = 13 - x_offset = -4 - y_offset = -2 + x_offset = -7 + y_offset = -1 see_hidden = TRUE #undef SYNDICATE_CHALLENGE_TIMER \ No newline at end of file From 734ed742a9d54165a879170964c1b79a55d1dbc6 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 22 Dec 2017 11:38:21 -0500 Subject: [PATCH 037/132] Fixes CODEOWNER wildcards (#33722) --- .github/CODEOWNERS | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2df370e6ea..7a38745e0e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,10 +6,10 @@ /code/__DEFINES/clockcult.dm @ChangelingRain /code/datums/antagonists/datum_clockcult.dm @ChangelingRain -/code/game/gamemodes/blob/* @ChangelingRain -/code/game/gamemodes/clock_cult/* @ChangelingRain -/code/game/gamemodes/miniantags/revenant* @ChangelingRain -/code/game/objects/effects/temporary_visuals/* @ChangelingRain +/code/game/gamemodes/blob/ @ChangelingRain +/code/game/gamemodes/clock_cult/ @ChangelingRain +/code/game/gamemodes/miniantags/revenant/ @ChangelingRain +/code/game/objects/effects/temporary_visuals/ @ChangelingRain /code/modules/reagents/chemistry/reagents/blob_reagents.dm @ChangelingRain # Cyberboss @@ -22,26 +22,26 @@ /code/controllers/subsystem/mapping.dm @Cyberboss /code/controllers/globals.dm @Cyberboss /code/datums/helper_datums/getrev.dm @Cyberboss -/code/datums/components/* @Cyberboss +/code/datums/components/ @Cyberboss /code/datums/map_config.dm @Cyberboss /code/datums/forced_movement.dm @Cyberboss /code/datums/holocall.dm @Cyberboss /code/modules/admin/verbs/adminhelp.dm @Cyberboss /code/modules/admin/verbs/adminpm.dm @Cyberboss -/code/modules/server_tools/* @Cyberboss -/code/modules/mapping/* @Cyberboss +/code/modules/server_tools/ @Cyberboss +/code/modules/mapping/ @Cyberboss # duncathan /code/__DEFINES/atmospherics.dm @duncathan /code/controllers/subsystem/air.dm @duncathan -/code/modules/atmospherics/* @duncathan +/code/modules/atmospherics/ @duncathan # Jordie0608 -/SQL/* @Jordie0608 +/SQL/ @Jordie0608 /code/controllers/subsystem/dbcore.dm @Jordie0608 -/tools/SQLAlertEmail/* @Jordie0608 +/tools/SQLAlertEmail/ @Jordie0608 # MrStonedOne @@ -57,10 +57,10 @@ # ninjanomnom /code/controllers/subsystem/shuttle.dm @ninjanomnom -/code/modules/shuttle/* @ninjanomnom +/code/modules/shuttle/ @ninjanomnom # ShizCalev -/_maps/* @ShizCalev -/icons/* @ShizCalev -/sound/* @ShizCalev +/_maps/ @ShizCalev +/icons/ @ShizCalev +/sound/ @ShizCalev From 716e4da53e1ffbeb8739c594b855b2dd1c14aa3f Mon Sep 17 00:00:00 2001 From: Armhulen Date: Fri, 22 Dec 2017 08:38:04 -0800 Subject: [PATCH 039/132] cool beans, partner (#33713) --- code/modules/mob/living/carbon/human/human_defense.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index e3e1271132..4d70af857b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -44,7 +44,10 @@ if(mind.martial_art && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles! if(prob(mind.martial_art.deflection_chance)) if(!lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it - visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!") + if(mind.martial_art.deflection_chance >= 100) //if they can NEVER be hit, lets clue sec in ;) + visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!") + else + visible_message("[src] deflects the projectile!", "You deflect the projectile!") playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) return 0 From 454c073d22d6ad0030034048cd5559f209945553 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 22 Dec 2017 08:40:15 -0800 Subject: [PATCH 041/132] Fixes message spam when proccalls are delayed due to another admin's proccalls running (#33732) * Fixes proccall block message spam * One thread --- code/modules/admin/verbs/debug.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index e2bb78c9ec..daa1d58de5 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -107,6 +107,8 @@ GLOBAL_VAR(LastAdminCalledTarget) GLOBAL_PROTECT(LastAdminCalledTarget) GLOBAL_VAR(LastAdminCalledProc) GLOBAL_PROTECT(LastAdminCalledProc) +GLOBAL_LIST_EMPTY(AdminProcCallSpamPrevention) +GLOBAL_PROTECT(AdminProcCallSpamPrevention) /proc/WrapAdminProcCall(target, procname, list/arguments) var/current_caller = GLOB.AdminProcCaller @@ -114,9 +116,14 @@ GLOBAL_PROTECT(LastAdminCalledProc) if(!ckey) CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]") if(current_caller && current_caller != ckey) - to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") - UNTIL(!GLOB.AdminProcCaller) - to_chat(usr, "Running your proc") + if(!GLOB.AdminProcCallSpamPrevention[ckey]) + to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") + GLOB.AdminProcCallSpamPrevention[ckey] = TRUE + UNTIL(!GLOB.AdminProcCaller) + to_chat(usr, "Running your proc") + GLOB.AdminProcCallSpamPrevention -= ckey + else + UNTIL(!GLOB.AdminProcCaller) GLOB.LastAdminCalledProc = procname if(target != GLOBAL_PROC) GLOB.LastAdminCalledTargetRef = "[REF(target)]" From f20622cc54a5c9624f3e91dfb88bc76b062e0a53 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 22 Dec 2017 11:43:03 -0500 Subject: [PATCH 043/132] Adds round ID to Show Server Revision (#33723) --- code/datums/helper_datums/getrev.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index ec39bcec67..c4ccc4c1fb 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -45,6 +45,8 @@ set name = "Show Server Revision" set desc = "Check the current server code revision" + if(GLOB.round_id) + to_chat(src, "Round ID: [GLOB.round_id]") if(GLOB.revdata.originmastercommit) to_chat(src, "Server revision compiled on: [GLOB.revdata.date]") var/prefix = "" From 48b54819606d497d9d8239cf4df42b757c6e3637 Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Fri, 22 Dec 2017 11:47:12 -0500 Subject: [PATCH 045/132] re-implements issue template hiding and improves wording/structure (#33724) --- .github/ISSUE_TEMPLATE.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 10f60767bb..949f1c4c44 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,9 +1,9 @@ -[Directions]: # (If you discovered this issue from playing tgstation hosted servers +[Round ID]: # (If you discovered this issue from playing tgstation hosted servers:) +[Round ID]: # (**INCLUDE THE ROUND ID**) +[Round ID]: # (It can be found in the Status panel or retrieved from https://atlantaned.space/statbus/round.php ! The round id let's us look up valuable information and logs for the round the bug happened.) +[Testmerges]: # (If you believe the issue to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead.) -INCLUDE THE ROUND ID +[Reproduction]: # (Explain your issue in detail, including the steps to reproduce it. Issues without proper reproduction steps or explanation are open to being ignored/closed by maintainers.) - -from the Status panel or retrieve it from https://atlantaned.space/statbus/round.php ! If you believe the issue to be caused by a test merge [OOC tab -> Show Server Revision], report it in the pull request's comment section instead. Explain your issue in detail, including the steps to reproduce it.) - -[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.) +[For Admins]: # (Oddities induced by var-edits and other admin tools are not necessarily bugs. Verify that your issues occur under regular circumstances before reporting them.) \ No newline at end of file From bec20087c25be3f682eb995a5e7916c0ee19a36c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 22 Dec 2017 08:57:02 -0800 Subject: [PATCH 047/132] [READY]Clownborgs - ADMIN SPAWN ONLY --- code/datums/action.dm | 13 ++++++ code/game/objects/items/cosmetics.dm | 6 --- code/game/objects/items/pneumaticCannon.dm | 25 ++++++++-- code/game/objects/items/robot/robot_items.dm | 3 ++ code/game/objects/items/signs.dm | 20 ++++++-- .../food_and_drinks/food/snacks_pie.dm | 8 +++- .../modules/mob/living/silicon/robot/robot.dm | 3 ++ .../mob/living/silicon/robot/robot_modules.dm | 31 ++++++++++++ .../chemistry/reagents/drink_reagents.dm | 16 +++++++ .../reagents/reagent_containers/borghydro.dm | 12 +++++ .../reagents/reagent_containers/spray.dm | 44 +++++++++++++++++- icons/mob/robots.dmi | Bin 93673 -> 97565 bytes 12 files changed, 161 insertions(+), 20 deletions(-) diff --git a/code/datums/action.dm b/code/datums/action.dm index f941a00a54..ede0fa75a2 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -344,6 +344,19 @@ /datum/action/item_action/change name = "Change" +/datum/action/item_action/nano_picket_sign + name = "Retext Nano Picket Sign" + var/obj/item/picket_sign/S + +/datum/action/item_action/nano_picket_sign/New(Target) + ..() + if(istype(Target, /obj/item/picket_sign)) + S = Target + +/datum/action/item_action/nano_picket_sign/Trigger() + if(istype(S)) + S.retext(owner) + /datum/action/item_action/adjust /datum/action/item_action/adjust/New(Target) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index a3ad685406..0277ec5371 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -8,7 +8,6 @@ var/colour = "red" var/open = FALSE - /obj/item/lipstick/purple name = "purple lipstick" colour = "purple" @@ -22,7 +21,6 @@ name = "black lipstick" colour = "black" - /obj/item/lipstick/random name = "lipstick" icon_state = "random_lipstick" @@ -33,8 +31,6 @@ colour = pick("red","purple","lime","black","green","blue","white") name = "[colour] lipstick" - - /obj/item/lipstick/attack_self(mob/user) cut_overlays() to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") @@ -103,7 +99,6 @@ else ..() - /obj/item/razor name = "electric razor" desc = "The latest and greatest power razor born from the science of shaving." @@ -112,7 +107,6 @@ flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_TINY - /obj/item/razor/proc/shave(mob/living/carbon/human/H, location = "mouth") if(location == "mouth") H.facial_hair_style = "Shaved" diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 8baeee3550..2b3f8f42a0 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -125,14 +125,14 @@ loadedWeightClass += I.w_class return TRUE -/obj/item/pneumatic_cannon/afterattack(atom/target, mob/living/carbon/human/user, flag, params) +/obj/item/pneumatic_cannon/afterattack(atom/target, mob/living/user, flag, params) if(flag && user.a_intent == INTENT_HARM) //melee attack return if(!istype(user)) return Fire(user, target) -/obj/item/pneumatic_cannon/proc/Fire(mob/living/carbon/human/user, var/atom/target) +/obj/item/pneumatic_cannon/proc/Fire(mob/living/user, var/atom/target) if(!istype(user) && !target) return var/discharge = 0 @@ -147,9 +147,16 @@ if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") return +<<<<<<< HEAD if(user.disabilities & CLUMSY && prob(75) && clumsyCheck) user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") user.dropItemToGround(src, TRUE) +======= + if(user.has_disability(CLUMSY) && prob(75) && clumsyCheck && iscarbon(user)) + var/mob/living/carbon/C = user + C.visible_message("[C] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") + C.dropItemToGround(src, TRUE) +>>>>>>> 6ce550d... Clownborgs (#33590) if(prob(10)) target = get_turf(user) else @@ -163,9 +170,10 @@ var/turf/T = get_target(target, get_turf(src)) playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 50, 1) fire_items(T, user) - if(pressureSetting >= 3 && user) - user.visible_message("[user] is thrown down by the force of the cannon!", "[src] slams into your shoulder, knocking you down!") - user.Knockdown(60) + if(pressureSetting >= 3 && iscarbon(user)) + var/mob/living/carbon/C = user + C.visible_message("[C] is thrown down by the force of the cannon!", "[src] slams into your shoulder, knocking you down!") + C.Knockdown(60) /obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user) if(fire_mode == PCANNON_FIREALL) @@ -271,3 +279,10 @@ selfcharge = TRUE charge_type = /obj/item/reagent_containers/food/snacks/pie/cream maxWeightClass = 60 //20 pies. + +/obj/item/pneumatic_cannon/pie/selfcharge/cyborg + name = "low velocity pie cannon" + automatic = FALSE + charge_type = /obj/item/reagent_containers/food/snacks/pie/cream/nostun + maxWeightClass = 6 //2 pies + charge_ticks = 2 //4 second/pie diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index d2f1d2a31b..6c1cf93295 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -355,6 +355,9 @@ var/hitdamage = 0 var/emaggedhitdamage = 3 +/obj/item/borg/lollipop/clown + emaggedhitdamage = 0 + /obj/item/borg/lollipop/equipped() check_amount() diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 350daa0fc3..65716f2f30 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -10,13 +10,23 @@ var/label = "" var/last_wave = 0 +/obj/item/picket_sign/cyborg + name = "metallic nano-sign" + desc = "A high tech picket sign used by silicons that can reprogram its surface at will. Probably hurts to get hit by, too." + force = 13 + resistance_flags = NONE + actions_types = list(/datum/action/item_action/nano_picket_sign) + +/obj/item/picket_sign/proc/retext(mob/user) + var/txt = stripped_input(user, "What would you like to write on the sign?", "Sign Label", null , 30) + if(txt && Adjacent(user)) + label = txt + name = "[label] sign" + desc = "It reads: [label]" + /obj/item/picket_sign/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon)) - var/txt = stripped_input(user, "What would you like to write on the sign?", "Sign Label", null , 30) - if(txt) - label = txt - src.name = "[label] sign" - desc = "It reads: [label]" + retext(user) else return ..() diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 977bd60da1..1ec5bb3499 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -27,6 +27,7 @@ list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) tastes = list("pie" = 1) foodtype = GRAIN | DAIRY | SUGAR + var/stunning = TRUE /obj/item/reagent_containers/food/snacks/pie/cream/throw_impact(atom/hit_atom) . = ..() @@ -46,15 +47,18 @@ creamoverlay.icon_state = "creampie_lizard" else creamoverlay.icon_state = "creampie_human" - H.Knockdown(20) //splat! + if(stunning) + H.Knockdown(20) //splat! H.adjust_blurriness(1) H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!") playsound(H, "desceration", 50, TRUE) - if (!H.creamed) // one layer at a time + if(!H.creamed) // one layer at a time H.add_overlay(creamoverlay) H.creamed = TRUE qdel(src) +/obj/item/reagent_containers/food/snacks/pie/cream/nostun + stunning = FALSE /obj/item/reagent_containers/food/snacks/pie/berryclafoutis name = "berry clafoutis" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index db10f4a81c..4f4c364fe8 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -827,6 +827,9 @@ /mob/living/silicon/robot/modules/security set_module = /obj/item/robot_module/security +/mob/living/silicon/robot/modules/clown + set_module = /obj/item/robot_module/clown + /mob/living/silicon/robot/modules/peacekeeper set_module = /obj/item/robot_module/peacekeeper diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 26e455106b..2f1eb7d378 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -513,6 +513,37 @@ if(CL) CL.reagents.add_reagent("lube", 2 * coeff) +/obj/item/robot_module/clown + name = "Clown" + basic_modules = list( + /obj/item/device/assembly/flash/cyborg, + /obj/item/toy/crayon/rainbow, + /obj/item/device/instrument/bikehorn, + /obj/item/stamp/clown, + /obj/item/bikehorn, + /obj/item/bikehorn/airhorn, + /obj/item/paint/anycolor, + /obj/item/soap/nanotrasen, + /obj/item/pneumatic_cannon/pie/selfcharge/cyborg, + /obj/item/razor, //killbait material + /obj/item/lipstick/purple, + /obj/item/reagent_containers/spray/waterflower/cyborg, + /obj/item/borg/cyborghug/peacekeeper, + /obj/item/borg/lollipop/clown, + /obj/item/picket_sign/cyborg, + /obj/item/reagent_containers/borghypo/clown, + /obj/item/extinguisher/mini) + emag_modules = list( + /obj/item/reagent_containers/borghypo/clown/hacked, + /obj/item/reagent_containers/spray/waterflower/cyborg/hacked) + ratvar_modules = list( + /obj/item/clockwork/slab/cyborg, + /obj/item/clockwork/weapon/ratvarian_spear, + /obj/item/clockwork/replica_fabricator/cyborg) + moduleselect_icon = "service" + cyborg_base_icon = "clown" + hat_offset = -2 + /obj/item/robot_module/butler name = "Service" basic_modules = list( diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index b62afb80c0..e3de96e0b4 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -172,6 +172,22 @@ M.emote("laugh") ..() +/datum/reagent/consumable/superlaughter + name = "Super Laughter" + id = "superlaughter" + description = "Funny until you're the one laughing." + metabolization_rate = 1.5 * REAGENTS_METABOLISM + color = "#FF4DD2" + taste_description = "laughter" + +/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/M) + if(!iscarbon(M)) + return + if(prob(30)) + M.visible_message("[M] bursts out into a fit of uncontrollable laughter!", "You burst out in a fit of uncontrollable laughter!") + M.Stun(5) + ..() + /datum/reagent/consumable/potato_juice name = "Potato Juice" id = "potato" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 0a99d9da6e..e736c344db 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -130,6 +130,18 @@ Borg Hypospray reagent_ids = list ("facid", "mutetoxin", "cyanide", "sodium_thiopental", "heparin", "lexorin") accepts_reagent_upgrades = FALSE +/obj/item/reagent_containers/borghypo/clown + name = "laughter injector" + desc = "Keeps the crew happy and productive!" + reagent_ids = list("laughter") + accepts_reagent_upgrades = FALSE + +/obj/item/reagent_containers/borghypo/clown/hacked + name = "laughter injector" + desc = "Keeps the crew so happy they don't work!" + reagent_ids = list("superlaughter") + accepts_reagent_upgrades = FALSE + /obj/item/reagent_containers/borghypo/syndicate name = "syndicate cyborg hypospray" desc = "An experimental piece of Syndicate technology used to produce powerful restorative nanites used to very quickly restore injuries of all types. Also metabolizes potassium iodide, for radiation poisoning, and morphine, for offense." diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 2e34e39f8f..f79418eee5 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -18,16 +18,16 @@ var/spray_range = 3 //the range of tiles the sprayer will reach when in spray mode. var/stream_range = 1 //the range of tiles the sprayer will reach when in stream mode. var/stream_amount = 10 //the amount of reagents transfered when in stream mode. + var/can_fill_from_container = TRUE amount_per_transfer_from_this = 5 volume = 250 possible_transfer_amounts = list(5,10,15,20,25,30,50,100) - /obj/item/reagent_containers/spray/afterattack(atom/A, mob/user) if(istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics)) return - if((A.is_drainable() && !A.is_refillable()) && get_dist(src,A) <= 1) + if((A.is_drainable() && !A.is_refillable()) && get_dist(src,A) <= 1 && can_fill_from_container) if(!A.reagents.total_volume) to_chat(user, "[A] is empty.") return @@ -205,6 +205,46 @@ /obj/item/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays return +/obj/item/reagent_containers/spray/waterflower/cyborg + container_type = NONE + volume = 100 + list_reagents = list("water" = 100) + var/generate_amount = 5 + var/generate_type = "water" + var/last_generate = 0 + var/generate_delay = 10 //deciseconds + can_fill_from_container = FALSE + +/obj/item/reagent_containers/spray/waterflower/cyborg/hacked + name = "nova flower" + desc = "This doesn't look safe at all..." + list_reagents = list("clf3" = 3) + volume = 3 + generate_type = "clf3" + generate_amount = 1 + generate_delay = 40 //deciseconds + +/obj/item/reagent_containers/spray/waterflower/cyborg/Initialize() + . = ..() + START_PROCESSING(SSfastprocess, src) + +/obj/item/reagent_containers/spray/waterflower/cyborg/Destroy() + STOP_PROCESSING(SSfastprocess, src) + return ..() + +/obj/item/reagent_containers/spray/waterflower/cyborg/process() + if(world.time > last_generate + generate_delay) + return + last_generate = world.time + generate_reagents() + +/obj/item/reagent_containers/spray/waterflower/cyborg/empty() + to_chat(usr, "You can not empty this!") + return + +/obj/item/reagent_containers/spray/waterflower/cyborg/proc/generate_reagents() + reagents.add_reagent(generate_type, generate_amount) + //chemsprayer /obj/item/reagent_containers/spray/chemsprayer name = "chem sprayer" diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 5d8bfa629b1a585450433994df3855acc1b50306..fd145092a75380611ccc075a701e0fd75f78971d 100644 GIT binary patch delta 13323 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 NR1`GiOXbW%{}+PLHH!cM delta 9401 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 JOwJ_ue*i%{$+!Rj From f40d74e52f6af7fbf8eb1963eb82957576aa42d4 Mon Sep 17 00:00:00 2001 From: coiax Date: Sat, 23 Dec 2017 00:02:42 +0000 Subject: [PATCH 048/132] Gibber rebalance (#33737) :cl: coiax balance: The kitchen gibber must be anchored in order to use. balance: The gibber requires bodies to have no external items or equipment. /:cl: Unanchoring the gibber, running around with it, ebowing people, then shoving them in is not fun. As a double check, you REALLY should be stripping them of all that cloth, it'll jam up the gears. - Removes the abiotic() proc, it's literally used only in the gibber. --- .../kitchen_machinery/gibber.dm | 24 ++++++++++++------- .../mob/living/carbon/human/human_helpers.dm | 11 --------- code/modules/mob/mob_helpers.dm | 5 ---- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 372c085adb..99a3de90e1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -1,4 +1,3 @@ - /obj/machinery/gibber name = "gibber" desc = "The name isn't descriptive enough?" @@ -12,10 +11,10 @@ circuit = /obj/item/circuitboard/machine/gibber var/operating = FALSE //Is it on? - var/dirty = 0 // Does it need cleaning? + var/dirty = FALSE // Does it need cleaning? var/gibtime = 40 // Time from starting until meat appears var/meat_produced = 0 - var/ignore_clothing = 0 + var/ignore_clothing = FALSE /obj/machinery/gibber/Initialize() @@ -30,7 +29,7 @@ gib_time -= 5 * M.rating gibtime = gib_time if(M.rating >= 2) - ignore_clothing = 1 + ignore_clothing = TRUE /obj/machinery/gibber/update_icon() cut_overlays() @@ -61,6 +60,10 @@ to_chat(user, "It's locked and running.") return + if(!anchored) + to_chat(user, "[src] cannot be used unless bolted to the ground.") + return + if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) var/mob/living/L = user.pulling if(!iscarbon(L)) @@ -70,12 +73,17 @@ if(C.buckled ||C.has_buckled_mobs()) to_chat(user, "[C] is attached to something!") return - if(C.abiotic(1) && !ignore_clothing) - to_chat(user, "Subject may not have abiotic items on.") - return + + if(!ignore_clothing) + for(var/obj/item/I in C.held_items + C.get_equipped_items()) + if(!(I.flags_1 & NODROP_1)) + to_chat(user, "Subject may not have abiotic items on.") + return user.visible_message("[user] starts to put [C] into the gibber!") - src.add_fingerprint(user) + + add_fingerprint(user) + if(do_after(user, gibtime, target = src)) if(C && user.pulling == C && !C.buckled && !C.has_buckled_mobs() && !occupant) user.visible_message("[user] stuffs [C] into the gibber!") diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index d1d657652b..41875b7d91 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -91,17 +91,6 @@ return wear_id.GetID() -/mob/living/carbon/human/abiotic(full_body = 0) - var/abiotic_hands = FALSE - for(var/obj/item/I in held_items) - if(!(I.flags_1 & NODROP_1)) - abiotic_hands = TRUE - break - if(full_body && abiotic_hands && ((back && !(back.flags_1&NODROP_1)) || (wear_mask && !(wear_mask.flags_1&NODROP_1)) || (head && !(head.flags_1&NODROP_1)) || (shoes && !(shoes.flags_1&NODROP_1)) || (w_uniform && !(w_uniform.flags_1&NODROP_1)) || (wear_suit && !(wear_suit.flags_1&NODROP_1)) || (glasses && !(glasses.flags_1&NODROP_1)) || (ears && !(ears.flags_1&NODROP_1)) || (gloves && !(gloves.flags_1&NODROP_1)) ) ) - return TRUE - return abiotic_hands - - /mob/living/carbon/human/IsAdvancedToolUser() if(disabilities & MONKEYLIKE) return FALSE diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 747d589c05..10c9a04a6e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -285,11 +285,6 @@ It's fairly easy to fix if dealing with single letters but not so much with comp firstname.Find(real_name) return firstname.match -/mob/proc/abiotic(full_body = 0) - for(var/obj/item/I in held_items) - if(!(I.flags_1 & NODROP_1)) - return 1 - return 0 //change a mob's act-intent. Input the intent as a string such as "help" or use "right"/"left /mob/verb/a_intent_change(input as text) From e0118067ec3fffb0e0d38bdf42333c0e4a5d661d Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sat, 23 Dec 2017 01:50:41 +0100 Subject: [PATCH 050/132] 2 borg metal fixes for the price of one (#33738) --- code/game/objects/items/stacks/stack.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 5e80353db9..cef25a0a36 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -109,7 +109,7 @@ if (recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list)) var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist] recipe_list = srl.recipes - var/t1 = "Amount Left: [amount]
    " + var/t1 = "Amount Left: [get_amount()]
    " for(var/i in 1 to length(recipe_list)) var/E = recipe_list[i] if (isnull(E)) @@ -161,8 +161,8 @@ if (href_list["sublist"] && !href_list["make"]) interact(usr, text2num(href_list["sublist"])) if (href_list["make"]) - if (get_amount() < 1) - qdel(src) //Never should happen + if (get_amount() < 1 && !is_cyborg) + qdel(src) var/list/recipes_list = recipes if (href_list["sublist"]) From 937fc2421cdca4a75431cbd00d002d0b425b54cb Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 23 Dec 2017 02:42:50 -0500 Subject: [PATCH 052/132] Add a single whitespace (#33746) --- code/game/world.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/world.dm b/code/game/world.dm index 2853bb2ef6..39d48d28ac 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -251,3 +251,4 @@ GLOBAL_PROTECT(security_mode) hub_password = "kMZy3U5jJHSiBQjr" else hub_password = "SORRYNOPASSWORD" + From bede61c0ee0ba96f94935dbede627173b2552f93 Mon Sep 17 00:00:00 2001 From: Robustin Date: Sat, 23 Dec 2017 02:45:52 -0500 Subject: [PATCH 054/132] Fixed empty HUD_List breaking alternate_appearances (#33742) * Alt Appearance works on empty HUD lists * Fixes empty list runtime --- code/game/alternate_appearance.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm index 901a8610a6..712b3425e0 100644 --- a/code/game/alternate_appearance.dm +++ b/code/game/alternate_appearance.dm @@ -78,6 +78,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances) QDEL_NULL(ghost_appearance) /datum/atom_hud/alternate_appearance/basic/add_to_hud(atom/A) + LAZYINITLIST(A.hud_list) A.hud_list[appearance_key] = theImage . = ..() From 17267781b5330677802e8b5c935cfc1121de7a7b Mon Sep 17 00:00:00 2001 From: Robustin Date: Sat, 23 Dec 2017 04:18:24 -0500 Subject: [PATCH 056/132] Reworked EMP doorshocking (#33741) --- code/game/machinery/doors/door.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 30ae436289..c7a21bf31b 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -195,7 +195,7 @@ /obj/machinery/door/emp_act(severity) if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) ) INVOKE_ASYNC(src, .proc/open) - if(prob(40/severity)) + if(prob(severity*10 - 20)) if(secondsElectrified == 0) secondsElectrified = -1 shockedby += "\[[time_stamp()]\]EM Pulse" From 34b749d2ca96061303e42e309a652fb2b9162ed3 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 23 Dec 2017 15:13:05 +0100 Subject: [PATCH 058/132] Fixes eminence login --- code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 8416e4651d..825ad90057 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -30,6 +30,7 @@ /mob/camera/eminence/Login() ..() var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) +<<<<<<< HEAD if(!C) add_servant_of_ratvar(src, TRUE) C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) @@ -39,6 +40,15 @@ qdel(src) else C.clock_team.eminence = src +======= + if(C && C.clock_team) + if(C.clock_team.eminence && C.clock_team.eminence != src) + remove_servant_of_ratvar(src,TRUE) + qdel(src) + return + else + C.clock_team.eminence = src +>>>>>>> 619a83f... Fixes eminence login (#33752) to_chat(src, "You have been selected as the Eminence!") to_chat(src, "As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.") to_chat(src, "Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.") From 2a80a2d6fbf5c23e23cd8639ec04ad34d5e94679 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 23 Dec 2017 09:26:23 -0500 Subject: [PATCH 059/132] Merge pull request #33728 from kevinz000/patch-408 Fixes biodegrading handcuffs --- code/game/gamemodes/changeling/powers/biodegrade.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm index dbb0e3a88a..4a34de151e 100644 --- a/code/game/gamemodes/changeling/powers/biodegrade.dm +++ b/code/game/gamemodes/changeling/powers/biodegrade.dm @@ -55,12 +55,14 @@ /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O) if(O && user.handcuffed == O) user.visible_message("[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.") + user.uncuff() new /obj/effect/decal/cleanable/greenglow(O.drop_location()) qdel(O) /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S) if(S && user.wear_suit == S) user.visible_message("[S] dissolves into a puddle of sizzling goop.") + user.uncuff() new /obj/effect/decal/cleanable/greenglow(S.drop_location()) qdel(S) From 7bcf4d466a51c2801b5dd367e0e2d764541e7383 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 23 Dec 2017 09:30:31 -0500 Subject: [PATCH 061/132] Merge pull request #33784 from octareenroon91/patch-56 Fix file path to aimalf.ogg --- code/game/gamemodes/malfunction/Malf_Modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 1c17893a28..9e2e889047 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( sleep(30) if(!owner || QDELETED(owner)) return - priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/AI/aimalf.ogg') + priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/ai/aimalf.ogg') set_security_level("delta") var/obj/machinery/doomsday_device/DOOM = new(owner_AI) owner_AI.nuking = TRUE From af1f13e114cd84be04c28aa9dbd5f434b1f5dad3 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 23 Dec 2017 09:35:34 -0500 Subject: [PATCH 063/132] Merge pull request #33306 from coiax/replace-clean-flag-with-component Replaces CLEAN_ON_MOVE_1 flag with cleaning component --- code/__DEFINES/flags.dm | 2 +- code/datums/components/cleaning.dm | 40 +++++++++++++++++++ code/game/atoms_movable.dm | 32 --------------- .../modules/mob/living/silicon/robot/robot.dm | 4 +- code/modules/vehicles/pimpin_ride.dm | 5 ++- tgstation.dme | 1 + 6 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 code/datums/components/cleaning.dm diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 965ee51502..8b3e74b96e 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define ON_BORDER_1 512 // item has priority to check when entering or leaving #define NOSLIP_1 1024 //prevents from slipping on wet floors, in space etc -#define CLEAN_ON_MOVE_1 2048 +#define _UNUSED_1 2048 // BLOCK_GAS_SMOKE_EFFECT_1 only used in masks at the moment. #define BLOCK_GAS_SMOKE_EFFECT_1 4096 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! diff --git a/code/datums/components/cleaning.dm b/code/datums/components/cleaning.dm new file mode 100644 index 0000000000..5d9d5992e2 --- /dev/null +++ b/code/datums/components/cleaning.dm @@ -0,0 +1,40 @@ +/datum/component/cleaning + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS + +/datum/component/cleaning/Initialize() + if(!ismovableatom(parent)) + . = COMPONENT_INCOMPATIBLE + CRASH("[type] added to a [parent.type]") + RegisterSignal(list(COMSIG_MOVABLE_MOVED), .proc/Clean) + +/datum/component/cleaning/proc/Clean() + var/atom/movable/AM = parent + var/turf/tile = AM.loc + if(!isturf(tile)) + return + + tile.clean_blood() + for(var/A in tile) + if(is_cleanable(A)) + qdel(A) + else if(istype(A, /obj/item)) + var/obj/item/cleaned_item = A + cleaned_item.clean_blood() + else if(ishuman(A)) + var/mob/living/carbon/human/cleaned_human = A + if(cleaned_human.lying) + if(cleaned_human.head) + cleaned_human.head.clean_blood() + cleaned_human.update_inv_head() + if(cleaned_human.wear_suit) + cleaned_human.wear_suit.clean_blood() + cleaned_human.update_inv_wear_suit() + else if(cleaned_human.w_uniform) + cleaned_human.w_uniform.clean_blood() + cleaned_human.update_inv_w_uniform() + if(cleaned_human.shoes) + cleaned_human.shoes.clean_blood() + cleaned_human.update_inv_shoes() + cleaned_human.clean_blood() + cleaned_human.wash_cream() + to_chat(cleaned_human, "[AM] cleans your face!") diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index ddb768488a..08568660fd 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -132,44 +132,12 @@ if (orbiting) orbiting.Check() - if(flags_1 & CLEAN_ON_MOVE_1) - clean_on_move() - var/datum/proximity_monitor/proximity_monitor = src.proximity_monitor if(proximity_monitor) proximity_monitor.HandleMove() return 1 -/atom/movable/proc/clean_on_move() - var/turf/tile = loc - if(isturf(tile)) - tile.clean_blood() - for(var/A in tile) - if(is_cleanable(A)) - qdel(A) - else if(istype(A, /obj/item)) - var/obj/item/cleaned_item = A - cleaned_item.clean_blood() - else if(ishuman(A)) - var/mob/living/carbon/human/cleaned_human = A - if(cleaned_human.lying) - if(cleaned_human.head) - cleaned_human.head.clean_blood() - cleaned_human.update_inv_head() - if(cleaned_human.wear_suit) - cleaned_human.wear_suit.clean_blood() - cleaned_human.update_inv_wear_suit() - else if(cleaned_human.w_uniform) - cleaned_human.w_uniform.clean_blood() - cleaned_human.update_inv_w_uniform() - if(cleaned_human.shoes) - cleaned_human.shoes.clean_blood() - cleaned_human.update_inv_shoes() - cleaned_human.clean_blood() - cleaned_human.wash_cream() - to_chat(cleaned_human, "[src] cleans your face!") - /atom/movable/Destroy(force) var/inform_admins = (flags_2 & INFORM_ADMINS_ON_RELOCATE_2) var/stationloving = (flags_2 & STATIONLOVING_2) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index db10f4a81c..2788413ee9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1029,9 +1029,9 @@ status_flags &= ~CANPUSH if(module.clean_on_move) - flags_1 |= CLEAN_ON_MOVE_1 + AddComponent(/datum/component/cleaning) else - flags_1 &= ~CLEAN_ON_MOVE_1 + qdel(GetComponent(/datum/component/cleaning)) hat_offset = module.hat_offset diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index 3925b863ff..88524366a6 100644 --- a/code/modules/vehicles/pimpin_ride.dm +++ b/code/modules/vehicles/pimpin_ride.dm @@ -13,6 +13,9 @@ var/datum/component/riding/D = LoadComponent(/datum/component/riding) D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 7), TEXT_EAST = list(-12, 7), TEXT_WEST = list( 12, 7))) + if(floorbuffer) + AddComponent(/datum/component/cleaning) + /obj/vehicle/ridden/janicart/Destroy() if(mybag) qdel(mybag) @@ -47,7 +50,7 @@ floorbuffer = TRUE qdel(I) to_chat(user, "You upgrade [src] with the floor buffer.") - flags_1 |= CLEAN_ON_MOVE_1 + AddComponent(/datum/component/cleaning) update_icon() else return ..() diff --git a/tgstation.dme b/tgstation.dme index aadf2bf1b8..4b6ba31e8b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -345,6 +345,7 @@ #include "code\datums\components\archaeology.dm" #include "code\datums\components\caltrop.dm" #include "code\datums\components\chasm.dm" +#include "code\datums\components\cleaning.dm" #include "code\datums\components\decal.dm" #include "code\datums\components\infective.dm" #include "code\datums\components\jousting.dm" From 709d55bc4a6080c67450115cde476c75be12721a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 23 Dec 2017 13:50:48 -0600 Subject: [PATCH 065/132] Update pneumaticCannon.dm --- code/game/objects/items/pneumaticCannon.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 2b3f8f42a0..dc0a2fe286 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -147,16 +147,10 @@ if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") return -<<<<<<< HEAD - if(user.disabilities & CLUMSY && prob(75) && clumsyCheck) - user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") - user.dropItemToGround(src, TRUE) -======= if(user.has_disability(CLUMSY) && prob(75) && clumsyCheck && iscarbon(user)) var/mob/living/carbon/C = user C.visible_message("[C] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") C.dropItemToGround(src, TRUE) ->>>>>>> 6ce550d... Clownborgs (#33590) if(prob(10)) target = get_turf(user) else From aec1142ca1b40c467f88f0848eff2a48c234caf7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 24 Dec 2017 02:38:37 -0600 Subject: [PATCH 066/132] Update _eminence.dm --- code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 3728520e82..f232ba3def 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -47,8 +47,6 @@ /mob/camera/eminence/Login() ..() add_servant_of_ratvar(src, TRUE) -<<<<<<< HEAD -======= var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) if(C && C.clock_team) if(C.clock_team.eminence) @@ -57,7 +55,6 @@ return else C.clock_team.eminence = src ->>>>>>> 3b37dae... (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634) to_chat(src, "You have been selected as the Eminence!") to_chat(src, "As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.") to_chat(src, "Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.") From b0671ed78a3df033b2aa367dda35015601cd1c32 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 24 Dec 2017 02:38:47 -0600 Subject: [PATCH 067/132] Update eminence_spire.dm --- .../gamemodes/clock_cult/clock_structures/eminence_spire.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm index a5bc62f554..0eb8084feb 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm @@ -34,12 +34,8 @@ /obj/structure/destructible/clockwork/eminence_spire/attack_ghost(mob/user) if(!IsAdminGhost(user)) return -<<<<<<< HEAD - if(SSticker.mode.eminence) -======= var/datum/antagonist/clockcult/random_cultist = locate() in GLOB.antagonists //if theres no cultists new team without eminence will be created anyway. if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence) ->>>>>>> 3b37dae... (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634) to_chat(user, "There's already an Eminence - too late!") return if(!GLOB.servants_active) From a11167982145381cc5836ba6746c3a071abd6083 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 24 Dec 2017 14:52:31 -0500 Subject: [PATCH 068/132] Merge pull request #33801 from AutomaticFrenzy/patch/download Fix download objective always greentexting --- 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 46f96961c9..ef307c95a0 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -524,7 +524,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/list/otherwise = M.GetAllContents() for(var/obj/item/disk/tech_disk/TD in otherwise) TD.stored_research.copy_research_to(checking) - return checking.researched_nodes.len >= target + return checking.researched_nodes.len >= target_amount /datum/objective/capture From d9f3c74607636b59ee27fe9d98c9b1a0f3d9be3a Mon Sep 17 00:00:00 2001 From: Armhulen Date: Sat, 23 Dec 2017 10:45:21 -0800 Subject: [PATCH 070/132] pride and satisfaction --- code/datums/diseases/gbs.dm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index 71e4064676..6d77acd3ae 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -1,6 +1,6 @@ /datum/disease/gbs name = "GBS" - max_stages = 5 + max_stages = 4 spread_text = "On contact" spread_flags = VIRUS_SPREAD_BLOOD | VIRUS_SPREAD_CONTACT_SKIN | VIRUS_SPREAD_CONTACT_FLUIDS cure_text = "Synaptizine & Sulfur" @@ -16,25 +16,15 @@ ..() switch(stage) if(2) - if(prob(45)) - affected_mob.adjustToxLoss(5) - affected_mob.updatehealth() - if(prob(1)) - affected_mob.emote("sneeze") - if(3) if(prob(5)) affected_mob.emote("cough") - else if(prob(5)) + if(3) + if(prob(5)) affected_mob.emote("gasp") if(prob(10)) - to_chat(affected_mob, "You're starting to feel very weak...") + to_chat(affected_mob, "Your body hurts all over!") if(4) - if(prob(10)) - affected_mob.emote("cough") - affected_mob.adjustToxLoss(5) - affected_mob.updatehealth() - if(5) - to_chat(affected_mob, "Your body feels as if it's trying to rip itself open...") + to_chat(affected_mob, "Your body feels as if it's trying to rip itself apart!") if(prob(50)) affected_mob.gib() else From d1d8687a63771845b286773aa2349877b0a6b115 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 24 Dec 2017 13:56:50 -0500 Subject: [PATCH 072/132] Merge pull request #33765 from MoreRobustThanYou/patch-33 Make airlocks use VARSET_CALLBACK --- code/game/machinery/doors/airlock.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 775c9dd894..3d659f104b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -251,16 +251,13 @@ note = null update_icon() -/obj/machinery/door/airlock/proc/unzap() //for addtimer - justzap = FALSE - /obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(isElectrified()) if(!justzap) if(shock(user, 100)) justzap = TRUE - addtimer(CALLBACK(src, .proc/unzap), 10) + addtimer(VARSET_CALLBACK(src, justzap, FALSE) , 10) return else return From 0068bb2ed26346c9c3d9fdf19a39c3b934cfa775 Mon Sep 17 00:00:00 2001 From: FrozenGuy5 <31222036+praisenarsie@users.noreply.github.com> Date: Sat, 23 Dec 2017 18:31:11 +0000 Subject: [PATCH 074/132] adds world.realtime to soapstone --- code/modules/library/soapstone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index cee4665f07..fd75ba4351 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -142,7 +142,7 @@ hidden_message = newmessage creator_name = user.real_name creator_key = user.ckey - realdate = world.timeofday + realdate = world.realtime map = SSmapping.config.map_name update_icon() From 95354a388fecf3dd8bc1b302128fb6aa43531113 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 24 Dec 2017 11:45:04 -0500 Subject: [PATCH 076/132] Vending TGUI --- code/game/machinery/vending.dm | 278 ++++++++++++--------------------- tgui/assets/tgui.css | 2 +- 2 files changed, 98 insertions(+), 182 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d3598d4866..427ffa119a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -25,8 +25,8 @@ integrity_failure = 100 armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) circuit = /obj/item/circuitboard/machine/vendor - var/active = 1 //No sales pitches if off! - var/vend_ready = 1 //Are we ready to vend?? Is it time?? + var/active = TRUE //No sales pitches if off! + var/vend_ready = TRUE //Are we ready to vend?? Is it time?? // To be filled out at compile time var/list/products = list() //For each, use the following pattern: @@ -227,15 +227,15 @@ if(!allowed(user) && !emagged && scan_id) to_chat(user, "[src]'s chef compartment blinks red: Access denied.") req_access_txt = "0" - return 0 + return FALSE req_access_txt = "0" - return 1 + return TRUE /obj/machinery/vending/snack/proc/iscompartmentfull(mob/user) if(contents.len >= 30) // no more than 30 dishes can fit inside to_chat(user, "[src]'s chef compartment is full.") - return 1 - return 0 + return TRUE + return FALSE /obj/machinery/vending/snack/proc/food_load(obj/item/reagent_containers/food/snacks/S) if(dish_quants[S.name]) @@ -350,180 +350,6 @@ /obj/machinery/vending/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/vending/attack_hand(mob/user) - var/dat = "" - if(panel_open && !isAI(user)) - return wires.interact(user) - else - if(stat & (BROKEN|NOPOWER)) - return - - dat += "

    Select an item

    " - dat += "
    " - if(product_records.len == 0) - dat += "No product loaded!" - else - var/list/display_records = product_records - if(extended_inventory) - display_records = product_records + hidden_records - if(coin || bill) - display_records = product_records + coin_records - if((coin || bill) && extended_inventory) - display_records = product_records + hidden_records + coin_records - dat += "
      " - for (var/datum/data/vending_product/R in display_records) - dat += "
    • " - if(R.amount > 0) - dat += "Vend " - else - dat += "Sold out " - dat += "[sanitize(R.product_name)]:" - dat += " [R.amount]" - dat += "
      • " - dat += "
    " - dat += "
    " - if(premium.len > 0) - dat += "Change Return: " - if (coin || bill) - dat += "[(coin ? coin : "")][(bill ? bill : "")]  Remove" - else - dat += "No money  Remove" - if(istype(src, /obj/machinery/vending/snack)) - dat += "

    Chef's Food Selection

    " - dat += "
    " - for (var/O in dish_quants) - if(dish_quants[O] > 0) - var/N = dish_quants[O] - dat += "Dispense " - dat += "[capitalize(O)]: [N]
    " - dat += "
    " - user.set_machine(src) - if(seconds_electrified && !(stat & NOPOWER)) - if(shock(user, 100)) - return - - var/datum/browser/popup = new(user, "vending", (name)) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) - popup.open() - - -/obj/machinery/vending/Topic(href, href_list) - if(..()) - return - - if(href_list["remove_coin"]) - if(!(coin || bill)) - to_chat(usr, "There is no money in this machine.") - return - if(coin) - if(!usr.get_active_held_item()) - usr.put_in_hands(coin) - else - coin.forceMove(get_turf(src)) - to_chat(usr, "You remove [coin] from [src].") - coin = null - if(bill) - if(!usr.get_active_held_item()) - usr.put_in_hands(bill) - else - bill.forceMove(get_turf(src)) - to_chat(usr, "You remove [bill] from [src].") - bill = null - - - usr.set_machine(src) - - if((href_list["dispense"]) && (vend_ready)) - var/N = href_list["dispense"] - if(dish_quants[N] <= 0) // Sanity check, there are probably ways to press the button when it shouldn't be possible. - return - vend_ready = 0 - use_power(5) - - dish_quants[N] = max(dish_quants[N] - 1, 0) - for(var/obj/O in contents) - if(O.name == N) - O.forceMove(drop_location()) - break - vend_ready = 1 - updateUsrDialog() - return - - if((href_list["vend"]) && (vend_ready)) - if(panel_open) - to_chat(usr, "The vending machine cannot dispense products while its service panel is open!") - return - - if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH - to_chat(usr, "Access denied." ) - flick(icon_deny,src) - return - - vend_ready = 0 //One thing at a time!! - - var/datum/data/vending_product/R = locate(href_list["vend"]) - if(!R || !istype(R) || !R.product_path) - vend_ready = 1 - return - - if(R in hidden_records) - if(!extended_inventory) - vend_ready = 1 - return - else if(R in coin_records) - if(!(coin || bill)) - to_chat(usr, "You need to insert money to get this item!") - vend_ready = 1 - return - if(coin && coin.string_attached) - if(prob(50)) - if(usr.put_in_hands(coin)) - to_chat(usr, "You successfully pull [coin] out before [src] could swallow it.") - coin = null - else - to_chat(usr, "You couldn't pull [coin] out because your hands are full!") - QDEL_NULL(coin) - else - to_chat(usr, "You weren't able to pull [coin] out fast enough, the machine ate it, string and all!") - QDEL_NULL(coin) - else - QDEL_NULL(coin) - QDEL_NULL(bill) - - else if (!(R in product_records)) - vend_ready = 1 - message_admins("Vending machine exploit attempted by [key_name(usr, usr.client)]!") - return - - if (R.amount <= 0) - to_chat(usr, "Sold out.") - vend_ready = 1 - return - else - R.amount-- - - if(((last_reply + 200) <= world.time) && vend_reply) - speak(vend_reply) - last_reply = world.time - - use_power(5) - if(icon_vend) //Show the vending animation if needed - flick(icon_vend,src) - new R.product_path(get_turf(src)) - SSblackbox.record_feedback("nested tally", "vending_machine_usage", 1, list("[type]", "[R.product_path]")) - vend_ready = 1 - return - - updateUsrDialog() - return - - else if(href_list["togglevoice"] && panel_open) - shut_up = !shut_up - - updateUsrDialog() - - /obj/machinery/vending/process() if(stat & (BROKEN|NOPOWER)) return @@ -605,6 +431,96 @@ else return FALSE +/obj/machinery/vending/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "vending", name, 350, 475, master_ui, state) + ui.open() + +/obj/machinery/vending/ui_data() + var/list/data = list() + var/list/listed_products = list() + var/list/display_records = product_records + if(extended_inventory) + display_records += hidden_records + if(coin) + display_records += coin_records + for(var/key = 1 to display_records.len) + var/datum/data/vending_product/I = display_records[key] + listed_products.Add(list(list( + "key" = key, + "name" = I.product_name, + "color" = I.display_color, + "amount" = I.amount))) + data["products"] = listed_products + if(!isnull(coin)) + data["coin"] = coin.name + data["coinslot"] = premium.len + data["canvend"] = vend_ready + + return data + +/obj/machinery/vending/ui_act(action, params) + if(..()) + return + if(!vend_ready) + return + switch(action) + if("vend") + if(!allowed(usr) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH + to_chat(usr, "Access denied.") + flick(icon_deny,src) + return + vend_ready = FALSE + addtimer(VARSET_CALLBACK(src, vend_ready, TRUE), 10) + var/key = text2num(params["key"]) + var/datum/data/vending_product/R = product_records[key] + if(R in hidden_records) + if(!extended_inventory) + return + else if(R in coin_records) + if(!coin) + to_chat(usr, "You need to insert a coin to get this item!") + return + if(coin.string_attached) + if(prob(50)) + if(usr.put_in_hands(coin)) + to_chat(usr, "You successfully pull [coin] out before [src] could swallow it.") + coin = null + else + to_chat(usr, "You couldn't pull [coin] out because your hands are full!") + QDEL_NULL(coin) + else + to_chat(usr, "You weren't able to pull [coin] out fast enough, the machine ate it, string and all!") + QDEL_NULL(coin) + else + QDEL_NULL(coin) + else if (!(R in product_records)) + return + + + + if (R.amount <= 0) + to_chat(usr, "Sold out.") + return + R.amount-- + if(((last_reply + 200) <= world.time) && vend_reply) + speak(vend_reply) + last_reply = world.time + use_power(5) + if(icon_vend) //Show the vending animation if needed + flick(icon_vend,src) + new R.product_path(drop_location()) + return TRUE + if("eject") + if(!coin) + to_chat(usr, "There is no coin in this machine.") + return + usr.put_in_hands(coin) + to_chat(usr, "You remove [coin] from [src].") + coin = null + /* * Vending machine types */ @@ -1195,4 +1111,4 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C #undef STANDARD_CHARGE #undef CONTRABAND_CHARGE -#undef COIN_CHARGE \ No newline at end of file +#undef COIN_CHARGE diff --git a/tgui/assets/tgui.css b/tgui/assets/tgui.css index 256b53c106..c73fc2adfa 100644 --- a/tgui/assets/tgui.css +++ b/tgui/assets/tgui.css @@ -1 +1 @@ -@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.clockwork{background:linear-gradient(180deg,#b18b25 0,#5f380e);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffb18b25",endColorstr="#ff5f380e",GradientType=0)}body.clockwork .normal{color:#b18b25}body.clockwork .good{color:#cfba47}body.clockwork .average{color:#896b19}body.clockwork .bad{color:#5f380e}body.clockwork .highlight{color:#b18b25}body.clockwork main{display:block;margin-top:32px;padding:2px 6px 0}body.clockwork hr{height:2px;background-color:#b18b25;border:none}body.clockwork .hidden{display:none}body.clockwork .bar .barText,body.clockwork span.button{color:#b18b25;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.clockwork .bold{font-weight:700}body.clockwork .italic{font-style:italic}body.clockwork [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.clockwork div[data-tooltip],body.clockwork span[data-tooltip]{position:relative}body.clockwork div[data-tooltip]:after,body.clockwork span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #170800;background-color:#2d1400}body.clockwork div[data-tooltip]:hover:after,body.clockwork span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.clockwork div[data-tooltip].tooltip-top:after,body.clockwork span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-top:hover:after,body.clockwork span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:after,body.clockwork span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:hover:after,body.clockwork span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-left:after,body.clockwork span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-left:hover:after,body.clockwork span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:after,body.clockwork span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:hover:after,body.clockwork span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #170800;background:#2d1400}body.clockwork .bar .barText{position:absolute;top:0;right:3px}body.clockwork .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#b18b25}body.clockwork .bar .barFill.good{background-color:#cfba47}body.clockwork .bar .barFill.average{background-color:#896b19}body.clockwork .bar .barFill.bad{background-color:#5f380e}body.clockwork span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #170800}body.clockwork span.button .fa{padding-right:2px}body.clockwork span.button.normal{transition:background-color .5s;background-color:#5f380e}body.clockwork span.button.normal.active:focus,body.clockwork span.button.normal.active:hover{transition:background-color .25s;background-color:#704211;outline:0}body.clockwork span.button.disabled{transition:background-color .5s;background-color:#2d1400}body.clockwork span.button.disabled.active:focus,body.clockwork span.button.disabled.active:hover{transition:background-color .25s;background-color:#441e00;outline:0}body.clockwork span.button.selected{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.selected.active:focus,body.clockwork span.button.selected.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.toggle{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.toggle.active:focus,body.clockwork span.button.toggle.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.caution{transition:background-color .5s;background-color:#be6209}body.clockwork span.button.caution.active:focus,body.clockwork span.button.caution.active:hover{transition:background-color .25s;background-color:#cd6a0a;outline:0}body.clockwork span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.clockwork span.button.danger.active:focus,body.clockwork span.button.danger.active:hover{transition:background-color .25s;background-color:#abaf00;outline:0}body.clockwork span.button.gridable{width:125px;margin:2px 0}body.clockwork span.button.gridable.center{text-align:center;width:75px}body.clockwork span.button+span:not(.button),body.clockwork span:not(.button)+span.button{margin-left:5px}body.clockwork div.display{width:100%;padding:4px;margin:6px 0;background-color:#2d1400;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400);background-color:rgba(45,20,0,.9);box-shadow:inset 0 0 5px rgba(0,0,0,.3)}body.clockwork div.display.tabular{padding:0;margin:0}body.clockwork div.display header,body.clockwork div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#cfba47;border-bottom:2px solid #b18b25}body.clockwork div.display header .buttonRight,body.clockwork div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.clockwork div.display article,body.clockwork div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.clockwork input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#b18b25;background-color:#cfba47;border:1px solid #272727}body.clockwork input.number{width:35px}body.clockwork input:-ms-input-placeholder{color:#999}body.clockwork input::placeholder{color:#999}body.clockwork input::-ms-clear{display:none}body.clockwork svg.linegraph{overflow:hidden}body.clockwork div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#2d1400;font-weight:700;font-style:italic;background-color:#000;background-image:repeating-linear-gradient(-45deg,#000,#000 10px,#170800 0,#170800 20px)}body.clockwork div.notice .label{color:#2d1400}body.clockwork div.notice .content:only-of-type{padding:0}body.clockwork div.notice hr{background-color:#896b19}body.clockwork div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #5f380e;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.clockwork section .cell,body.clockwork section .content,body.clockwork section .label,body.clockwork section .line,body.nanotrasen section .cell,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.clockwork section{display:table-row;width:100%}body.clockwork section:not(:first-child){padding-top:4px}body.clockwork section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.clockwork section .label{width:1%;padding-right:32px;white-space:nowrap;color:#b18b25}body.clockwork section .content:not(:last-child){padding-right:16px}body.clockwork section .line{width:100%}body.clockwork section .cell:not(:first-child){text-align:center;padding-top:0}body.clockwork section .cell span.button{width:75px}body.clockwork section:not(:last-child){padding-right:4px}body.clockwork div.subdisplay{width:100%;margin:0}body.clockwork header.titlebar .close,body.clockwork header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#cfba47}body.clockwork header.titlebar .close:hover,body.clockwork header.titlebar .minimize:hover{color:#d1bd50}body.clockwork header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#5f380e;border-bottom:1px solid #170800;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.clockwork header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.clockwork header.titlebar .title{position:absolute;top:6px;left:46px;color:#cfba47;font-size:16px;white-space:nowrap}body.clockwork header.titlebar .minimize{position:absolute;top:6px;right:46px}body.clockwork header.titlebar .close{position:absolute;top:4px;right:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgNDI1IDIwMCIgb3BhY2l0eT0iLjMzIj4NCiAgPHBhdGggZD0ibSAxNzguMDAzOTksMC4wMzg2OSAtNzEuMjAzOTMsMCBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTYuNzYxMzQsNi4wMjU1NSBsIDAsMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM0LDYuMDI1NTQgbCA1My4xMDcyLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xMDEuNTQ0MDE4IDcyLjIxNjI4LDEwNC42OTkzOTggYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDUuNzYwMTUsMi44NzAxNiBsIDczLjU1NDg3LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xODcuODcxNDcgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM1LC02LjAyNTU1IGwgLTU0LjcxNjQ0LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTMzLDYuMDI1NTUgbCAwLDEwMi42MTkzNSBMIDE4My43NjQxMywyLjkwODg2IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNS43NjAxNCwtMi44NzAxNyB6IiAvPg0KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPg0KICA8cGF0aCBkPSJtIDQyMC4xNTUzNSwxNzcuODkxMTkgYSAxMy40MTIwMzgsMTIuNTAxODQyIDAgMCAxIC04LjYzMjk1LDIyLjA2OTUxIGwgLTY2LjExODMyLDAgYSA1LjM2NDgxNTIsNS4wMDA3MzcgMCAwIDEgLTUuMzY0ODIsLTUuMDAwNzQgbCAwLC03OS44NzkzMSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.toggle{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.toggle.active:focus,body.nanotrasen span.button.toggle.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button.gridable.center{text-align:center;width:75px}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display.tabular{padding:0;margin:0}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input.number{width:35px}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .cell,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen section .cell:not(:first-child){text-align:center;padding-top:0}body.nanotrasen section .cell span.button{width:75px}body.nanotrasen section:not(:last-child){padding-right:4px}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgMjAwIDI4OS43NDIiIG9wYWNpdHk9Ii4zMyI+DQogIDxwYXRoIGQ9Im0gOTMuNTM3Njc3LDAgYyAtMTguMTEzMTI1LDAgLTM0LjIyMDEzMywzLjExMTY0IC00OC4zMjM0ODQsOS4zMzQzNyAtMTMuOTY1MDkyLDYuMjIxNjcgLTI0LjYxMjQ0MiwxNS4wNzExNCAtMzEuOTQwNjUxLDI2LjU0NzEgLTcuMTg5OTM5OCwxMS4zMzc4OSAtMTAuMzAxMjI2NiwyNC43NDkxMSAtMTAuMzAxMjI2Niw0MC4yMzQ3OCAwLDEwLjY0NjYyIDIuNzI1MDAyNiwyMC40NjQ2NSA4LjE3NTExMTYsMjkuNDUyNTggNS42MTUyNzcsOC45ODY4NiAxNC4wMzgyNzcsMTcuMzUyMDQgMjUuMjY4ODIxLDI1LjA5NDM2IDExLjIzMDU0NCw3LjYwNTMxIDI2LjUwNzQyMSwxNS40MTgzNSA0NS44MzA1MTQsMjMuNDM3ODIgMTkuOTgzNzQ4LDguMjk1NTcgMzQuODQ4ODQ4LDE1LjU1NDcxIDQ0LjU5Mjk5OCwyMS43NzYzOCA5Ljc0NDE0LDYuMjIyNzMgMTYuNzYxNywxMi44NTg1IDIxLjA1NTcyLDE5LjkwOTUxIDQuMjk0MDQsNy4wNTIwOCA2LjQ0MTkzLDE1Ljc2NDA4IDYuNDQxOTMsMjYuMTM0NTkgMCwxNi4xNzcwMiAtNS4yMDE5NiwyOC40ODIyMiAtMTUuNjA2NzMsMzYuOTE2ODIgLTEwLjIzOTYsOC40MzQ3IC0yNS4wMjIwMywxMi42NTIzIC00NC4zNDUxNjksMTIuNjUyMyAtMTQuMDM4MTcxLDAgLTI1LjUxNTI0NywtMS42NTk0IC0zNC40MzM2MTgsLTQuOTc3NyAtOC45MTgzNywtMy40NTY2IC0xNi4xODU1NzIsLTguNzExMyAtMjEuODAwODM5LC0xNS43NjMzIC01LjYxNTI3NywtNy4wNTIxIC0xMC4wNzQ3OTUsLTE2LjY2MDg4IC0xMy4zNzc4OTksLTI4LjgyODEyIGwgLTI0Ljc3MzE2MjYyOTM5NDUsMCAwLDU2LjgyNjMyIEMgMzMuODU2NzY5LDI4Ni4wNzYwMSA2My43NDkwNCwyODkuNzQyMDEgODkuNjc4MzgzLDI4OS43NDIwMSBjIDE2LjAyMDAyNywwIDMwLjcxOTc4NywtMS4zODI3IDQ0LjA5NzMzNywtNC4xNDc5IDEzLjU0MjcyLC0yLjkwNDMgMjUuMTA0MSwtNy40Njc2IDM0LjY4MzA5LC0xMy42ODkzIDkuNzQ0MTMsLTYuMzU5NyAxNy4zNDA0MiwtMTQuNTE5NSAyMi43OTA1MiwtMjQuNDc0OCA1LjQ1MDEsLTEwLjA5MzMyIDguMTc1MTEsLTIyLjM5OTU5IDguMTc1MTEsLTM2LjkxNjgyIDAsLTEyLjk5NzY0IC0zLjMwMjEsLTI0LjMzNTM5IC05LjkwODI5LC0zNC4wMTQ2IC02LjQ0MTA1LC05LjgxNzI1IC0xNS41MjU0NSwtMTguNTI3MDcgLTI3LjI1MTQ2LC0yNi4xMzEzMyAtMTEuNTYwODUsLTcuNjA0MjcgLTI3LjkxMDgzLC0xNS44MzE0MiAtNDkuMDUwNjYsLTI0LjY4MDIyIC0xNy41MDY0NCwtNy4xOTAxMiAtMzAuNzE5NjY4LC0xMy42ODk0OCAtMzkuNjM4MDM4LC0xOS40OTcwMSAtOC45MTgzNzEsLTUuODA3NTIgLTE4LjYwNzQ3NCwtMTIuNDM0MDkgLTI0LjA5NjUyNCwtMTguODc0MTcgLTUuNDI2MDQzLC02LjM2NjE2IC05LjY1ODgyNiwtMTUuMDcwMDMgLTkuNjU4ODI2LC0yNC44ODcyOSAwLC05LjI2NDAxIDIuMDc1NDE0LC0xNy4yMTM0NSA2LjIyMzQ1NCwtMjMuODUwMzMgMTEuMDk4Mjk4LC0xNC4zOTc0OCA0MS4yODY2MzgsLTEuNzk1MDcgNDUuMDc1NjA5LDI0LjM0NzYyIDQuODM5MzkyLDYuNzc0OTEgOC44NDkzNSwxNi4yNDcyOSAxMi4wMjk1MTUsMjguNDE1NiBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNC40NzgyNSwtNS45MjQ0OCAtOS45NTQ4OCwtMTAuNjMyMjIgLTE1LjkwODM3LC0xNC4zNzQxMSAxLjY0MDU1LDAuNDc5MDUgMy4xOTAzOSwxLjAyMzc2IDQuNjM4NjUsMS42NDAyNCA2LjQ5ODYxLDIuNjI2MDcgMTIuMTY3OTMsNy4zMjc0NyAxNy4wMDczLDE0LjEwMzQ1IDQuODM5MzksNi43NzQ5MSA4Ljg0OTM1LDE2LjI0NTY3IDEyLjAyOTUyLDI4LjQxMzk3IDAsMCA4LjQ4MTI4LC0wLjEyODk0IDguNDg5NzgsLTAuMDAyIDAuNDE3NzYsNi40MTQ5NCAtMS43NTMzOSw5LjQ1Mjg2IC00LjEyMzQyLDEyLjU2MTA0IC0yLjQxNzQsMy4xNjk3OCAtNS4xNDQ4Niw2Ljc4OTczIC00LjAwMjc4LDEzLjAwMjkgMS41MDc4Niw4LjIwMzE4IDEwLjE4MzU0LDEwLjU5NjQyIDE0LjYyMTk0LDkuMzExNTQgLTMuMzE4NDIsLTAuNDk5MTEgLTUuMzE4NTUsLTEuNzQ5NDggLTUuMzE4NTUsLTEuNzQ5NDggMCwwIDEuODc2NDYsMC45OTg2OCA1LjY1MTE3LC0xLjM1OTgxIC0zLjI3Njk1LDAuOTU1NzEgLTEwLjcwNTI5LC0wLjc5NzM4IC0xMS44MDEyNSwtNi43NjMxMyAtMC45NTc1MiwtNS4yMDg2MSAwLjk0NjU0LC03LjI5NTE0IDMuNDAxMTMsLTEwLjUxNDgyIDIuNDU0NjIsLTMuMjE5NjggNS4yODQyNiwtNi45NTgzMSA0LjY4NDMsLTE0LjQ4ODI0IGwgMC4wMDMsMC4wMDIgOC45MjY3NiwwIDAsLTU1Ljk5OTY3IGMgLTE1LjA3MTI1LC0zLjg3MTY4IC0yNy42NTMxNCwtNi4zNjA0MiAtMzcuNzQ2NzEsLTcuNDY1ODYgLTkuOTU1MzEsLTEuMTA3NTUgLTIwLjE4ODIzLC0xLjY1OTgxIC0zMC42OTY2MTMsLTEuNjU5ODEgeiBtIDcwLjMyMTYwMywxNy4zMDg5MyAwLjIzODA1LDQwLjMwNDkgYyAxLjMxODA4LDEuMjI2NjYgMi40Mzk2NSwyLjI3ODE1IDMuMzQwODEsMy4xMDYwMiA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNCwxNi4yNDU2NiAxMi4wMjk1MSwyOC40MTM5NyBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNi42NzczMSwtNC41OTM4MSAtMTkuODM2NDMsLTEwLjQ3MzA5IC0zNi4xNDA3MSwtMTUuODI1MjIgeiBtIC0yOC4xMjA0OSw1LjYwNTUxIDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzcsLTYuNDY2OTcgLTEzLjg0Njc4LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDUsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gMTUuMjIxOTUsMjQuMDA4NDggOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzOCwtNi40NjY5NyAtMTMuODQ2NzksLTkuNzE3MjYgLTguNTY0NzksLTE3LjcxNjU1IHogbSAyMi43OTcwNCwwIGMgMi43NzE1LDcuOTk5MjkgMS43ODc0MSwxMS4yNDk1OCAtNC40OTM1NCwxNy43MTY1NSBsIDQuNDkzNTQsLTE3LjcxNjU1IHogbSAtOTkuMTEzODQsMi4yMDc2NCA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM4MiwtNi40NjY5NyAtMTMuODQ2NzgyLC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk1NDIsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff750000",endColorstr="#ff340404",GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.toggle{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.toggle.active:focus,body.syndicate span.button.toggle.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button.gridable.center{text-align:center;width:75px}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display.tabular{padding:0;margin:0}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input.number{width:35px}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate section .cell:not(:first-child){text-align:center;padding-top:0}body.syndicate section .cell span.button{width:75px}body.syndicate section:not(:last-child){padding-right:4px}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"} \ No newline at end of file +@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.clockwork{background:linear-gradient(180deg,#b18b25 0,#5f380e);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffb18b25",endColorstr="#ff5f380e",GradientType=0)}body.clockwork .normal{color:#b18b25}body.clockwork .good{color:#cfba47}body.clockwork .average{color:#896b19}body.clockwork .bad{color:#5f380e}body.clockwork .highlight{color:#b18b25}body.clockwork main{display:block;margin-top:32px;padding:2px 6px 0}body.clockwork hr{height:2px;background-color:#b18b25;border:none}body.clockwork .hidden{display:none}body.clockwork .bar .barText,body.clockwork span.button{color:#b18b25;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.clockwork .bold{font-weight:700}body.clockwork .italic{font-style:italic}body.clockwork [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.clockwork div[data-tooltip],body.clockwork span[data-tooltip]{position:relative}body.clockwork div[data-tooltip]:after,body.clockwork span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #170800;background-color:#2d1400}body.clockwork div[data-tooltip]:hover:after,body.clockwork span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.clockwork div[data-tooltip].tooltip-top:after,body.clockwork span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-top:hover:after,body.clockwork span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:after,body.clockwork span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:hover:after,body.clockwork span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-left:after,body.clockwork span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-left:hover:after,body.clockwork span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:after,body.clockwork span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:hover:after,body.clockwork span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #170800;background:#2d1400}body.clockwork .bar .barText{position:absolute;top:0;right:3px}body.clockwork .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#b18b25}body.clockwork .bar .barFill.good{background-color:#cfba47}body.clockwork .bar .barFill.average{background-color:#896b19}body.clockwork .bar .barFill.bad{background-color:#5f380e}body.clockwork span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #170800}body.clockwork span.button .fa{padding-right:2px}body.clockwork span.button.normal{transition:background-color .5s;background-color:#5f380e}body.clockwork span.button.normal.active:focus,body.clockwork span.button.normal.active:hover{transition:background-color .25s;background-color:#704211;outline:0}body.clockwork span.button.disabled{transition:background-color .5s;background-color:#2d1400}body.clockwork span.button.disabled.active:focus,body.clockwork span.button.disabled.active:hover{transition:background-color .25s;background-color:#441e00;outline:0}body.clockwork span.button.selected{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.selected.active:focus,body.clockwork span.button.selected.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.toggle{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.toggle.active:focus,body.clockwork span.button.toggle.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.caution{transition:background-color .5s;background-color:#be6209}body.clockwork span.button.caution.active:focus,body.clockwork span.button.caution.active:hover{transition:background-color .25s;background-color:#cd6a0a;outline:0}body.clockwork span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.clockwork span.button.danger.active:focus,body.clockwork span.button.danger.active:hover{transition:background-color .25s;background-color:#abaf00;outline:0}body.clockwork span.button.gridable{width:125px;margin:2px 0}body.clockwork span.button.gridable.center{text-align:center;width:75px}body.clockwork span.button+span:not(.button),body.clockwork span:not(.button)+span.button{margin-left:5px}body.clockwork div.display{width:100%;padding:4px;margin:6px 0;background-color:#2d1400;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400);background-color:rgba(45,20,0,.9);box-shadow:inset 0 0 5px rgba(0,0,0,.3)}body.clockwork div.display.tabular{padding:0;margin:0}body.clockwork div.display header,body.clockwork div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#cfba47;border-bottom:2px solid #b18b25}body.clockwork div.display header .buttonRight,body.clockwork div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.clockwork div.display article,body.clockwork div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.clockwork input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#b18b25;background-color:#cfba47;border:1px solid #272727}body.clockwork input.number{width:35px}body.clockwork input:-ms-input-placeholder{color:#999}body.clockwork input::placeholder{color:#999}body.clockwork input::-ms-clear{display:none}body.clockwork svg.linegraph{overflow:hidden}body.clockwork div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#2d1400;font-weight:700;font-style:italic;background-color:#000;background-image:repeating-linear-gradient(-45deg,#000,#000 10px,#170800 0,#170800 20px)}body.clockwork div.notice .label{color:#2d1400}body.clockwork div.notice .content:only-of-type{padding:0}body.clockwork div.notice hr{background-color:#896b19}body.clockwork div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #5f380e;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.clockwork section .cell,body.clockwork section .content,body.clockwork section .label,body.clockwork section .line,body.nanotrasen section .cell,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.clockwork section{display:table-row;width:100%}body.clockwork section:not(:first-child){padding-top:4px}body.clockwork section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.clockwork section .label{width:1%;padding-right:32px;white-space:nowrap;color:#b18b25}body.clockwork section .content:not(:last-child){padding-right:16px}body.clockwork section .line{width:100%}body.clockwork section .cell:not(:first-child){text-align:center;padding-top:0}body.clockwork section .cell span.button{width:75px}body.clockwork section:not(:last-child){padding-right:4px}body.clockwork div.subdisplay{width:100%;margin:0}body.clockwork header.titlebar .close,body.clockwork header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#cfba47}body.clockwork header.titlebar .close:hover,body.clockwork header.titlebar .minimize:hover{color:#d1bd50}body.clockwork header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#5f380e;border-bottom:1px solid #170800;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.clockwork header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.clockwork header.titlebar .title{position:absolute;top:6px;left:46px;color:#cfba47;font-size:16px;white-space:nowrap}body.clockwork header.titlebar .minimize{position:absolute;top:6px;right:46px}body.clockwork header.titlebar .close{position:absolute;top:4px;right:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMzMiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4KPCEtLSBodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9saWNlbnNlcy9ieS1zYS80LjAvIC0tPgo=") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.toggle{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.toggle.active:focus,body.nanotrasen span.button.toggle.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button.gridable.center{text-align:center;width:75px}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display.tabular{padding:0;margin:0}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input.number{width:35px}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .cell,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen section .cell:not(:first-child){text-align:center;padding-top:0}body.nanotrasen section .cell span.button{width:75px}body.nanotrasen section:not(:last-child){padding-right:4px}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCAyMDAgMjg5Ljc0MiIgb3BhY2l0eT0iLjMzIj4KICA8cGF0aCBkPSJtIDkzLjUzNzY3NywwIGMgLTE4LjExMzEyNSwwIC0zNC4yMjAxMzMsMy4xMTE2NCAtNDguMzIzNDg0LDkuMzM0MzcgLTEzLjk2NTA5Miw2LjIyMTY3IC0yNC42MTI0NDIsMTUuMDcxMTQgLTMxLjk0MDY1MSwyNi41NDcxIC03LjE4OTkzOTgsMTEuMzM3ODkgLTEwLjMwMTIyNjYsMjQuNzQ5MTEgLTEwLjMwMTIyNjYsNDAuMjM0NzggMCwxMC42NDY2MiAyLjcyNTAwMjYsMjAuNDY0NjUgOC4xNzUxMTE2LDI5LjQ1MjU4IDUuNjE1Mjc3LDguOTg2ODYgMTQuMDM4Mjc3LDE3LjM1MjA0IDI1LjI2ODgyMSwyNS4wOTQzNiAxMS4yMzA1NDQsNy42MDUzMSAyNi41MDc0MjEsMTUuNDE4MzUgNDUuODMwNTE0LDIzLjQzNzgyIDE5Ljk4Mzc0OCw4LjI5NTU3IDM0Ljg0ODg0OCwxNS41NTQ3MSA0NC41OTI5OTgsMjEuNzc2MzggOS43NDQxNCw2LjIyMjczIDE2Ljc2MTcsMTIuODU4NSAyMS4wNTU3MiwxOS45MDk1MSA0LjI5NDA0LDcuMDUyMDggNi40NDE5MywxNS43NjQwOCA2LjQ0MTkzLDI2LjEzNDU5IDAsMTYuMTc3MDIgLTUuMjAxOTYsMjguNDgyMjIgLTE1LjYwNjczLDM2LjkxNjgyIC0xMC4yMzk2LDguNDM0NyAtMjUuMDIyMDMsMTIuNjUyMyAtNDQuMzQ1MTY5LDEyLjY1MjMgLTE0LjAzODE3MSwwIC0yNS41MTUyNDcsLTEuNjU5NCAtMzQuNDMzNjE4LC00Ljk3NzcgLTguOTE4MzcsLTMuNDU2NiAtMTYuMTg1NTcyLC04LjcxMTMgLTIxLjgwMDgzOSwtMTUuNzYzMyAtNS42MTUyNzcsLTcuMDUyMSAtMTAuMDc0Nzk1LC0xNi42NjA4OCAtMTMuMzc3ODk5LC0yOC44MjgxMiBsIC0yNC43NzMxNjI2MjkzOTQ1LDAgMCw1Ni44MjYzMiBDIDMzLjg1Njc2OSwyODYuMDc2MDEgNjMuNzQ5MDQsMjg5Ljc0MjAxIDg5LjY3ODM4MywyODkuNzQyMDEgYyAxNi4wMjAwMjcsMCAzMC43MTk3ODcsLTEuMzgyNyA0NC4wOTczMzcsLTQuMTQ3OSAxMy41NDI3MiwtMi45MDQzIDI1LjEwNDEsLTcuNDY3NiAzNC42ODMwOSwtMTMuNjg5MyA5Ljc0NDEzLC02LjM1OTcgMTcuMzQwNDIsLTE0LjUxOTUgMjIuNzkwNTIsLTI0LjQ3NDggNS40NTAxLC0xMC4wOTMzMiA4LjE3NTExLC0yMi4zOTk1OSA4LjE3NTExLC0zNi45MTY4MiAwLC0xMi45OTc2NCAtMy4zMDIxLC0yNC4zMzUzOSAtOS45MDgyOSwtMzQuMDE0NiAtNi40NDEwNSwtOS44MTcyNSAtMTUuNTI1NDUsLTE4LjUyNzA3IC0yNy4yNTE0NiwtMjYuMTMxMzMgLTExLjU2MDg1LC03LjYwNDI3IC0yNy45MTA4MywtMTUuODMxNDIgLTQ5LjA1MDY2LC0yNC42ODAyMiAtMTcuNTA2NDQsLTcuMTkwMTIgLTMwLjcxOTY2OCwtMTMuNjg5NDggLTM5LjYzODAzOCwtMTkuNDk3MDEgLTguOTE4MzcxLC01LjgwNzUyIC0xOC42MDc0NzQsLTEyLjQzNDA5IC0yNC4wOTY1MjQsLTE4Ljg3NDE3IC01LjQyNjA0MywtNi4zNjYxNiAtOS42NTg4MjYsLTE1LjA3MDAzIC05LjY1ODgyNiwtMjQuODg3MjkgMCwtOS4yNjQwMSAyLjA3NTQxNCwtMTcuMjEzNDUgNi4yMjM0NTQsLTIzLjg1MDMzIDExLjA5ODI5OCwtMTQuMzk3NDggNDEuMjg2NjM4LC0xLjc5NTA3IDQ1LjA3NTYwOSwyNC4zNDc2MiA0LjgzOTM5Miw2Ljc3NDkxIDguODQ5MzUsMTYuMjQ3MjkgMTIuMDI5NTE1LDI4LjQxNTYgbCAyMC41MzIzNCwwIDAsLTU1Ljk5OTY3IGMgLTQuNDc4MjUsLTUuOTI0NDggLTkuOTU0ODgsLTEwLjYzMjIyIC0xNS45MDgzNywtMTQuMzc0MTEgMS42NDA1NSwwLjQ3OTA1IDMuMTkwMzksMS4wMjM3NiA0LjYzODY1LDEuNjQwMjQgNi40OTg2MSwyLjYyNjA3IDEyLjE2NzkzLDcuMzI3NDcgMTcuMDA3MywxNC4xMDM0NSA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNSwxNi4yNDU2NyAxMi4wMjk1MiwyOC40MTM5NyAwLDAgOC40ODEyOCwtMC4xMjg5NCA4LjQ4OTc4LC0wLjAwMiAwLjQxNzc2LDYuNDE0OTQgLTEuNzUzMzksOS40NTI4NiAtNC4xMjM0MiwxMi41NjEwNCAtMi40MTc0LDMuMTY5NzggLTUuMTQ0ODYsNi43ODk3MyAtNC4wMDI3OCwxMy4wMDI5IDEuNTA3ODYsOC4yMDMxOCAxMC4xODM1NCwxMC41OTY0MiAxNC42MjE5NCw5LjMxMTU0IC0zLjMxODQyLC0wLjQ5OTExIC01LjMxODU1LC0xLjc0OTQ4IC01LjMxODU1LC0xLjc0OTQ4IDAsMCAxLjg3NjQ2LDAuOTk4NjggNS42NTExNywtMS4zNTk4MSAtMy4yNzY5NSwwLjk1NTcxIC0xMC43MDUyOSwtMC43OTczOCAtMTEuODAxMjUsLTYuNzYzMTMgLTAuOTU3NTIsLTUuMjA4NjEgMC45NDY1NCwtNy4yOTUxNCAzLjQwMTEzLC0xMC41MTQ4MiAyLjQ1NDYyLC0zLjIxOTY4IDUuMjg0MjYsLTYuOTU4MzEgNC42ODQzLC0xNC40ODgyNCBsIDAuMDAzLDAuMDAyIDguOTI2NzYsMCAwLC01NS45OTk2NyBjIC0xNS4wNzEyNSwtMy44NzE2OCAtMjcuNjUzMTQsLTYuMzYwNDIgLTM3Ljc0NjcxLC03LjQ2NTg2IC05Ljk1NTMxLC0xLjEwNzU1IC0yMC4xODgyMywtMS42NTk4MSAtMzAuNjk2NjEzLC0xLjY1OTgxIHogbSA3MC4zMjE2MDMsMTcuMzA4OTMgMC4yMzgwNSw0MC4zMDQ5IGMgMS4zMTgwOCwxLjIyNjY2IDIuNDM5NjUsMi4yNzgxNSAzLjM0MDgxLDMuMTA2MDIgNC44MzkzOSw2Ljc3NDkxIDguODQ5MzQsMTYuMjQ1NjYgMTIuMDI5NTEsMjguNDEzOTcgbCAyMC41MzIzNCwwIDAsLTU1Ljk5OTY3IGMgLTYuNjc3MzEsLTQuNTkzODEgLTE5LjgzNjQzLC0xMC40NzMwOSAtMzYuMTQwNzEsLTE1LjgyNTIyIHogbSAtMjguMTIwNDksNS42MDU1MSA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM3LC02LjQ2Njk3IC0xMy44NDY3OCwtOS43MTcyNiAtOC41NjQ3OSwtMTcuNzE2NTUgeiBtIDIyLjc5NzA1LDAgYyAyLjc3MTUsNy45OTkyOSAxLjc4NzQxLDExLjI0OTU4IC00LjQ5MzU0LDE3LjcxNjU1IGwgNC40OTM1NCwtMTcuNzE2NTUgeiBtIDE1LjIyMTk1LDI0LjAwODQ4IDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzgsLTYuNDY2OTcgLTEzLjg0Njc5LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDQsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gLTk5LjExMzg0LDIuMjA3NjQgOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzODIsLTYuNDY2OTcgLTEzLjg0Njc4MiwtOS43MTcyNiAtOC41NjQ3OSwtMTcuNzE2NTUgeiBtIDIyLjc5NTQyLDAgYyAyLjc3MTUsNy45OTkyOSAxLjc4NzQxLDExLjI0OTU4IC00LjQ5MzU0LDE3LjcxNjU1IGwgNC40OTM1NCwtMTcuNzE2NTUgeiIgLz4KPC9zdmc+CjwhLS0gVGhpcyB3b3JrIGlzIGxpY2Vuc2VkIHVuZGVyIGEgQ3JlYXRpdmUgQ29tbW9ucyBBdHRyaWJ1dGlvbi1TaGFyZUFsaWtlIDQuMCBJbnRlcm5hdGlvbmFsIExpY2Vuc2UuIC0tPgo8IS0tIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LXNhLzQuMC8gLS0+Cg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff750000",endColorstr="#ff340404",GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.toggle{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.toggle.active:focus,body.syndicate span.button.toggle.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button.gridable.center{text-align:center;width:75px}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display.tabular{padding:0;margin:0}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input.number{width:35px}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate section .cell:not(:first-child){text-align:center;padding-top:0}body.syndicate section .cell span.button{width:75px}body.syndicate section:not(:last-child){padding-right:4px}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"} \ No newline at end of file From a893559c6bf4edfaf5462957e5af036a151f9a2d Mon Sep 17 00:00:00 2001 From: arsserpentarium <32496644+arsserpentarium@users.noreply.github.com> Date: Sun, 24 Dec 2017 06:55:37 +0300 Subject: [PATCH 077/132] [READY]Circuitry upgrades --- code/modules/hydroponics/grown.dm | 4 +- .../integrated_electronics/core/assemblies.dm | 30 +-- .../integrated_electronics/core/debugger.dm | 2 +- .../integrated_electronics/core/helpers.dm | 4 +- .../core/integrated_circuit.dm | 18 +- .../integrated_electronics/core/pins.dm | 10 +- .../core/special_pins/index_pin.dm | 6 +- .../subtypes/arithmetic.dm | 60 ++--- .../subtypes/converters.dm | 8 +- .../integrated_electronics/subtypes/input.dm | 137 +++++++++- .../integrated_electronics/subtypes/logic.dm | 2 +- .../subtypes/manipulation.dm | 16 +- .../subtypes/reagents.dm | 239 +++++++++++++++--- .../integrated_electronics/subtypes/smart.dm | 2 +- .../obj/assemblies/electronic_components.dmi | Bin 21775 -> 22954 bytes 15 files changed, 409 insertions(+), 129 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 15456c1e34..dadf077c8a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -146,7 +146,7 @@ /obj/item/reagent_containers/food/snacks/grown/on_grind() var/nutriment = reagents.get_reagent_amount("nutriment") - if(grind_results.len) + if(grind_results&&grind_results.len) for(var/i in 1 to grind_results.len) grind_results[grind_results[i]] = nutriment reagents.del_reagent("nutriment") @@ -154,7 +154,7 @@ /obj/item/reagent_containers/food/snacks/grown/on_juice() var/nutriment = reagents.get_reagent_amount("nutriment") - if(juice_results.len) + if(juice_results&&juice_results.len) for(var/i in 1 to juice_results.len) juice_results[juice_results[i]] = nutriment reagents.del_reagent("nutriment") diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 805cf787f7..637c3bfcee 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -20,6 +20,8 @@ var/charge_tick = FALSE var/charge_delay = 4 var/use_cyborg_cell = TRUE + max_integrity = 50 + armor = list(melee = 50, bullet = 70, laser = 70, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0) /obj/item/device/electronic_assembly/proc/check_interactivity(mob/user) return user.canUseTopic(src,be_close = TRUE) @@ -30,8 +32,6 @@ START_PROCESSING(SScircuit, src) materials[MAT_METAL] = round((max_complexity + max_components) / 4) * SScircuit.cost_multiplier - - /obj/item/device/electronic_assembly/Destroy() STOP_PROCESSING(SScircuit, src) return ..() @@ -273,22 +273,9 @@ /obj/item/device/electronic_assembly/afterattack(atom/target, mob/user, proximity) - for(var/obj/item/integrated_circuit/input/sensor/S in assembly_components) - if(!proximity) - if(istype(S,/obj/item/integrated_circuit/input/sensor/ranged)||(!user)) - if(user.client) - if(!(target in view(user.client))) - continue - else - if(!(target in view(user))) - continue - else - continue - S.set_pin_data(IC_OUTPUT, 1, WEAKREF(target)) - S.check_then_do_work() - S.scan(target) - - visible_message(" [user] waves [src] around [target].") + for(var/obj/item/integrated_circuit/input/S in assembly_components) + if(S.sense(target,user,proximity)) + visible_message(" [user] waves [src] around [target].") /obj/item/device/electronic_assembly/screwdriver_act(mob/living/user, obj/item/S) @@ -326,8 +313,11 @@ interact(user) return TRUE else + for(var/obj/item/integrated_circuit/input/S in assembly_components) + S.attackby_react(I,user,user.a_intent) return ..() + /obj/item/device/electronic_assembly/attack_self(mob/user) if(!check_interactivity(user)) return @@ -391,7 +381,6 @@ /obj/item/device/electronic_assembly/proc/get_object() return src - // Returns the location to be used for dropping items. // Same as the regular drop_location(), but with checks being run on acting_object if necessary. /obj/item/integrated_circuit/drop_location() @@ -406,6 +395,7 @@ /obj/item/device/electronic_assembly/default //The /default electronic_assemblys are to allow the introduction of the new naming scheme without breaking old saves. name = "type-a electronic assembly" + /obj/item/device/electronic_assembly/calc name = "type-b electronic assembly" icon_state = "setup_small_calc" @@ -507,4 +497,4 @@ /obj/item/device/electronic_assembly/drone/arms name = "type-b electronic drone" icon_state = "setup_drone_arms" - desc = "It's a case, for building mobile electronics with. This one is armed and dangerous." \ No newline at end of file + desc = "It's a case, for building mobile electronics with. This one is armed and dangerous." diff --git a/code/modules/integrated_electronics/core/debugger.dm b/code/modules/integrated_electronics/core/debugger.dm index ac6f5c1a1e..666fcf00d6 100644 --- a/code/modules/integrated_electronics/core/debugger.dm +++ b/code/modules/integrated_electronics/core/debugger.dm @@ -56,7 +56,7 @@ data_to_show = A.name to_chat(user, "You write '[data_to_write ? data_to_show : "NULL"]' to the '[io]' pin of \the [io.holder].") else if(io.io_type == PULSE_CHANNEL) - io.holder.check_then_do_work(ignore_power = TRUE) + io.holder.check_then_do_work(io.ord,ignore_power = TRUE) to_chat(user, "You pulse \the [io.holder]'s [io].") io.holder.interact(user) // This is to update the UI. diff --git a/code/modules/integrated_electronics/core/helpers.dm b/code/modules/integrated_electronics/core/helpers.dm index e84823f201..773c4f0684 100644 --- a/code/modules/integrated_electronics/core/helpers.dm +++ b/code/modules/integrated_electronics/core/helpers.dm @@ -15,9 +15,9 @@ io_type_override = io_list_copy[io_entry] if(io_type_override) - io_list.Add(new io_type_override(src, io_entry, default_data, pin_type)) + io_list.Add(new io_type_override(src, io_entry, default_data, pin_type,i)) else - io_list.Add(new io_type(src, io_entry, default_data, pin_type)) + io_list.Add(new io_type(src, io_entry, default_data, pin_type,i)) /obj/item/integrated_circuit/proc/set_pin_data(pin_type, pin_number, datum/new_data) diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 069ca4245c..0c1a2fdad5 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -58,6 +58,12 @@ a creative player the means to solve many problems. Circuits are held inside an /obj/item/integrated_circuit/proc/any_examine(mob/user) return +/obj/item/integrated_circuit/proc/attackby_react(var/atom/movable/A,mob/user) + return + +/obj/item/integrated_circuit/proc/sense(var/atom/movable/A,mob/user,prox) + return + /obj/item/integrated_circuit/proc/check_interactivity(mob/user) if(assembly) return assembly.check_interactivity(user) @@ -291,17 +297,18 @@ a creative player the means to solve many problems. Circuits are held inside an return TRUE // Battery has enough. return FALSE // Not enough power. -/obj/item/integrated_circuit/proc/check_then_do_work(var/ignore_power = FALSE) +/obj/item/integrated_circuit/proc/check_then_do_work(ord,var/ignore_power = FALSE) if(world.time < next_use) // All intergrated circuits have an internal cooldown, to protect from spam. - return + return FALSE if(power_draw_per_use && !ignore_power) if(!check_power()) power_fail() - return + return FALSE next_use = world.time + cooldown_per_use - do_work() + do_work(ord) + return TRUE -/obj/item/integrated_circuit/proc/do_work() +/obj/item/integrated_circuit/proc/do_work(ord) return /obj/item/integrated_circuit/proc/disconnect_all() @@ -369,4 +376,3 @@ a creative player the means to solve many problems. Circuits are held inside an return TRUE return FALSE - diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index bff96b713c..528281c3b7 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -25,14 +25,16 @@ D [1]/ || var/list/linked = list() var/io_type = DATA_CHANNEL var/pin_type // IC_INPUT, IC_OUTPUT, IC_ACTIVATOR - used in saving assembly wiring + var/ord - -/datum/integrated_io/New(loc, _name, _data, _pin_type) +/datum/integrated_io/New(loc, _name, _data, _pin_type,_ord) name = _name if(_data) data = _data if(_pin_type) pin_type = _pin_type + if(_ord) + ord = _ord holder = loc @@ -148,7 +150,7 @@ D [1]/ || /datum/integrated_io/activate/push_data() for(var/k in 1 to linked.len) var/datum/integrated_io/io = linked[k] - io.holder.check_then_do_work() + io.holder.check_then_do_work(io.ord) /datum/integrated_io/proc/pull_data() for(var/k in 1 to linked.len) @@ -207,7 +209,7 @@ D [1]/ || write_data_to_pin(new_data) /datum/integrated_io/activate/ask_for_pin_data(mob/user) // This just pulses the pin. - holder.check_then_do_work(ignore_power = TRUE) + holder.check_then_do_work(ord,ignore_power = TRUE) to_chat(user, "You pulse \the [holder]'s [src] pin.") /datum/integrated_io/activate diff --git a/code/modules/integrated_electronics/core/special_pins/index_pin.dm b/code/modules/integrated_electronics/core/special_pins/index_pin.dm index 51b12a0f3a..06267eec61 100644 --- a/code/modules/integrated_electronics/core/special_pins/index_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/index_pin.dm @@ -1,4 +1,4 @@ -// These pins can only contain integer numbers between 1 and IC_MAX_LIST_LENGTH. Null is not allowed. +// These pins can only contain integer numbers between 0 and IC_MAX_LIST_LENGTH. Null is allowed. /datum/integrated_io/index name = "index pin" data = 1 @@ -11,10 +11,10 @@ /datum/integrated_io/index/write_data_to_pin(new_data) if(isnull(new_data)) - new_data = 1 + new_data = 0 if(isnum(new_data)) - data = CLAMP(round(new_data), 1, IC_MAX_LIST_LENGTH) + data = CLAMP(round(new_data), 0, IC_MAX_LIST_LENGTH) holder.on_data_written() /datum/integrated_io/index/display_pin_type() diff --git a/code/modules/integrated_electronics/subtypes/arithmetic.dm b/code/modules/integrated_electronics/subtypes/arithmetic.dm index 7dec779f83..e491a34a69 100644 --- a/code/modules/integrated_electronics/subtypes/arithmetic.dm +++ b/code/modules/integrated_electronics/subtypes/arithmetic.dm @@ -30,10 +30,9 @@ /obj/item/integrated_circuit/arithmetic/addition/do_work() var/result = 0 for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - I.pull_data() - if(isnum(I.data)) - result = result + I.data + var/I = get_pin_data(IC_INPUT, k) + if(isnum(I)) + result += I set_pin_data(IC_OUTPUT, 1, result) push_data() @@ -56,13 +55,10 @@ return var/result = A.data - for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - if(I == A) - continue - I.pull_data() - if(isnum(I.data)) - result = result - I.data + for(var/k in 2 to inputs.len) + var/I = get_pin_data(IC_INPUT, k) + if(isnum(I)) + result -= I set_pin_data(IC_OUTPUT, 1, result) push_data() @@ -85,13 +81,10 @@ if(!isnum(A.data)) return var/result = A.data - for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - if(I == A) - continue - I.pull_data() - if(isnum(I.data)) - result = result * I.data + for(var/k in 2 to inputs.len) + var/I = get_pin_data(IC_INPUT, k) + if(isnum(I)) + result *= I set_pin_data(IC_OUTPUT, 1, result) push_data() @@ -114,13 +107,12 @@ return var/result = A.data - for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - if(I == A) - continue - I.pull_data() - if(isnum(I.data) && I.data != 0) //No runtimes here. - result = result / I.data + + for(var/k in 2 to inputs.len) + var/I = get_pin_data(IC_INPUT, k) + if(isnum(I) && (I != 0)) + result /= I + set_pin_data(IC_OUTPUT, 1, result) push_data() @@ -228,12 +220,11 @@ /obj/item/integrated_circuit/arithmetic/average/do_work() var/result = 0 var/inputs_used = 0 - for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - I.pull_data() - if(isnum(I.data)) + for(var/k in 2 to inputs.len) + var/I = get_pin_data(IC_INPUT, k) + if(isnum(I)) inputs_used++ - result = result + I.data + result += I if(inputs_used) result = result / inputs_used @@ -288,11 +279,10 @@ /obj/item/integrated_circuit/arithmetic/square_root/do_work() var/result = 0 - for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - I.pull_data() - if(isnum(I.data)) - result = sqrt(I.data) + for(var/k in 2 to inputs.len) + var/I = get_pin_data(IC_INPUT, k) + if(isnum(I)) + result += sqrt(I) set_pin_data(IC_OUTPUT, 1, result) push_data() diff --git a/code/modules/integrated_electronics/subtypes/converters.dm b/code/modules/integrated_electronics/subtypes/converters.dm index d622ea8ca9..cd9306d0da 100644 --- a/code/modules/integrated_electronics/subtypes/converters.dm +++ b/code/modules/integrated_electronics/subtypes/converters.dm @@ -160,10 +160,10 @@ /obj/item/integrated_circuit/converter/concatenator/do_work() var/result = null - for(var/datum/integrated_io/I in inputs) - I.pull_data() - if(!isnull(I.data)) - result = result + I.data + for(var/k in 1 to inputs.len) + var/I = get_pin_data(IC_INPUT, k) + if(!isnull(I)) + result = result + I set_pin_data(IC_OUTPUT, 1, result) push_data() diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index c39cfeac44..91b4b437e3 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -128,7 +128,7 @@ var/mob/living/carbon/human/H = get_pin_data_as_type(IC_INPUT, 1, /mob/living/carbon/human) if(!istype(H)) //Invalid input return - if(H in view(get_turf(H))) // Like medbot's analyzer it can be used in range.. + if(H in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. var/total_health = round(H.health/H.getMaxHealth(), 0.01)*100 var/missing_health = H.getMaxHealth() - H.health @@ -143,6 +143,49 @@ push_data() activate_pin(2) +/obj/item/integrated_circuit/input/slime_scanner + name = "slime_scanner" + desc = "A very small version of the xenobio analyser. This allows the machine to know every needed properties of slime." + icon_state = "medscan_adv" + complexity = 12 + inputs = list("\ target") + outputs = list( + "colour" = IC_PINTYPE_STRING, + "adult" = IC_PINTYPE_BOOLEAN, + "nutrition" = IC_PINTYPE_NUMBER, + "charge" = IC_PINTYPE_NUMBER, + "health" = IC_PINTYPE_NUMBER, + "possible mutation" = IC_PINTYPE_LIST, + "genetic destability"= IC_PINTYPE_NUMBER, + "slime core amount" = IC_PINTYPE_NUMBER, + "Growth progress" = IC_PINTYPE_NUMBER, + ) + activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) + spawn_flags = IC_SPAWN_RESEARCH + power_draw_per_use = 80 + +/obj/item/integrated_circuit/input/slime_scanner/do_work() + var/mob/living/simple_animal/slime/T = get_pin_data_as_type(IC_INPUT, 1, /mob/living/simple_animal/slime) + if(!isslime(T)) //Invalid input + return + if(T in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. + + set_pin_data(IC_OUTPUT, 1, T.colour) + set_pin_data(IC_OUTPUT, 2, T.is_adult) + set_pin_data(IC_OUTPUT, 3, T.nutrition/T.get_max_nutrition()) + set_pin_data(IC_OUTPUT, 4, T.powerlevel) + set_pin_data(IC_OUTPUT, 5, round(T.health/T.maxHealth,0.01)*100) + set_pin_data(IC_OUTPUT, 6, uniqueList(T.slime_mutation)) + set_pin_data(IC_OUTPUT, 7, T.mutation_chance) + set_pin_data(IC_OUTPUT, 8, T.cores) + set_pin_data(IC_OUTPUT, 9, T.amount_grown/SLIME_EVOLUTION_THRESHOLD) + + + push_data() + activate_pin(2) + + + /obj/item/integrated_circuit/input/plant_scanner name = "integrated plant analyzer" desc = "A very small version of the plant analyser. This allows the machine to know all valuable params of plants in trays. \ @@ -180,7 +223,7 @@ return for(var/i=1, i<=outputs.len, i++) set_pin_data(IC_OUTPUT, i, null) - if(H in view(get_turf(H))) // Like medbot's analyzer it can be used in range.. + if(H in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. if(H.myseed) set_pin_data(IC_OUTPUT, 1, H.myseed.plantname) set_pin_data(IC_OUTPUT, 2, H.age) @@ -228,7 +271,7 @@ return for(var/i=1, i<=outputs.len, i++) set_pin_data(IC_OUTPUT, i, null) - if(H in view(get_turf(H))) // Like medbot's analyzer it can be used in range.. + if(H in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. if(H.myseed) for(var/datum/plant_gene/reagent/G in H.myseed.genes) greagents.Add(G.get_name()) @@ -671,12 +714,15 @@ spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH power_draw_per_use = 120 -/obj/item/integrated_circuit/input/sensor/proc/scan(var/atom/A) +/obj/item/integrated_circuit/input/sensor/sense(var/atom/A,mob/user,prox) + if(!prox) + return FALSE + if(!check_then_do_work()) + return FALSE var/ignore_bags = get_pin_data(IC_INPUT, 1) if(ignore_bags) if(istype(A, /obj/item/storage)) return FALSE - set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) push_data() activate_pin(1) @@ -694,6 +740,52 @@ spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH power_draw_per_use = 120 +/obj/item/integrated_circuit/input/sensor/ranged/sense(var/atom/A,mob/user) + if(!user) + return FALSE + if(user.client) + if(!(A in view(user.client))) + return FALSE + else + if(!(A in view(user))) + return FALSE + if(!check_then_do_work()) + return FALSE + var/ignore_bags = get_pin_data(IC_INPUT, 1) + if(ignore_bags) + if(istype(A, /obj/item/storage)) + return FALSE + set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) + push_data() + activate_pin(1) + return TRUE + +/obj/item/integrated_circuit/input/objscaner + name = "scaner" + desc = "Scans and obtains a reference for any objects you use on assembly." + extended_desc = "If 'put down' pin is set to true, assembly will take scanned object from your hands to it's location.\ + useful for interaction with grabber. Scaner works only with help intent." + icon_state = "recorder" + complexity = 4 + inputs = list("put down" = IC_PINTYPE_BOOLEAN) + outputs = list("scanned" = IC_PINTYPE_REF) + activators = list("on scanned" = IC_PINTYPE_PULSE_OUT) + spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH + power_draw_per_use = 20 + +/obj/item/integrated_circuit/input/objscaner/attackby_react(var/atom/A,var/mob/user,intent) + if(intent!=INTENT_HELP) + return FALSE + if(!check_then_do_work()) + return FALSE + var/pu = get_pin_data(IC_INPUT, 1) + if(pu) + user.transferItemToLoc(A,drop_location()) + set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) + push_data() + activate_pin(1) + return TRUE + /obj/item/integrated_circuit/input/internalbm name = "internal battery monitor" desc = "This monitors the charge level of an internal battery." @@ -760,3 +852,38 @@ activate_pin(2) push_data() return + +/obj/item/integrated_circuit/input/ntnetsc + name = "NTnet scaner" + desc = "This can return NTnet id of component insi given object, if there is any." + icon_state = "signalsc" + w_class = WEIGHT_CLASS_TINY + complexity = 2 + inputs = list("target" = IC_PINTYPE_REF) + outputs = list( + "id" = IC_PINTYPE_STRING + ) + activators = list("read" = IC_PINTYPE_PULSE_IN, "found" = IC_PINTYPE_PULSE_OUT,"not found" = IC_PINTYPE_PULSE_OUT) + spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH + power_draw_per_use = 1 + +/obj/item/integrated_circuit/input/ntnetsc/do_work() + + var/atom/AM = get_pin_data_as_type(IC_INPUT, 1, /atom) + var/list/processing_list = list(AM) + var/datum/component/ntnet_interface/net = null + set_pin_data(IC_OUTPUT, 1, null) + while(processing_list.len && !net) + var/atom/A = processing_list[1] + processing_list.Cut(1, 2) + //Byond does not allow things to be in multiple contents, or double parent-child hierarchies, so only += is needed + //This is also why we don't need to check against assembled as we go along + processing_list += A.contents + net = A.GetComponent(/datum/component/ntnet_interface) + if(net) + set_pin_data(IC_OUTPUT, 1, net.hardware_id) + activate_pin(2) + else + activate_pin(3) + push_data() + return diff --git a/code/modules/integrated_electronics/subtypes/logic.dm b/code/modules/integrated_electronics/subtypes/logic.dm index 627301ef10..f8e858ef94 100644 --- a/code/modules/integrated_electronics/subtypes/logic.dm +++ b/code/modules/integrated_electronics/subtypes/logic.dm @@ -2,7 +2,7 @@ name = "logic gate" desc = "This tiny chip will decide for you!" extended_desc = "Logic circuits will treat a null, 0, and a \"\" string value as FALSE and anything else as TRUE." - complexity = 3 + complexity = 1 outputs = list("result") activators = list("compare" = IC_PINTYPE_PULSE_IN) category_text = "Logic" diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index f32f414fbb..5099547197 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -155,9 +155,11 @@ if(isnum(wanted_dir.data)) if(step(assembly, wanted_dir.data)) activate_pin(2) + return else activate_pin(3) return FALSE + return FALSE /obj/item/integrated_circuit/manipulation/grenade name = "grenade primer" @@ -247,9 +249,14 @@ /obj/item/integrated_circuit/manipulation/plant_module/do_work() ..() var/turf/T = get_turf(src) - var/obj/machinery/hydroponics/AM = get_pin_data_as_type(IC_INPUT, 1, /obj/machinery/hydroponics) - if(!istype(AM)) //Invalid input + var/obj/OM = get_pin_data_as_type(IC_INPUT, 1, /obj) + if(istype(OM,/obj/structure/spacevine) && get_pin_data(IC_INPUT, 2) == 2) + qdel(OM) + activate_pin(2) return + var/obj/machinery/hydroponics/AM = OM + if(!istype(AM)) //Invalid input + return FALSE var/mob/living/M = get_turf(AM) if(!M.Adjacent(T)) return //Can't reach @@ -276,6 +283,7 @@ qdel(AM.myseed) AM.myseed = null AM.weedlevel = 0 //Has a side effect of cleaning up those nasty weeds + AM.dead = 0 AM.update_icon() else activate_pin(2) @@ -284,7 +292,7 @@ /obj/item/integrated_circuit/manipulation/grabber name = "grabber" - desc = "A circuit with it's own inventory for small/medium items, used to grab and store things." + desc = "A circuit with it's own inventory for tiny/small items, used to grab and store things." icon_state = "grabber" extended_desc = "The circuit accepts a reference to thing to be grabbed. It can store up to 10 things. Modes: 1 for grab. 0 for eject the first thing. -1 for eject all." w_class = WEIGHT_CLASS_SMALL @@ -307,7 +315,7 @@ var/mode = get_pin_data(IC_INPUT, 2) if(mode == 1) - if(check_target(AM, exclude_contents = TRUE)) + if(check_target(AM)) if((contents.len < max_items) && (!max_w_class || AM.w_class <= max_w_class)) AM.forceMove(src) if(mode == 0) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 33f92c3646..6f527c8149 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -9,6 +9,11 @@ . = ..() if(volume) create_reagents(volume) + push_vol() + +/obj/item/integrated_circuit/reagent/proc/push_vol() + set_pin_data(IC_OUTPUT, 1, reagents.total_volume) + push_data() /obj/item/integrated_circuit/reagent/smoke name = "smoke generator" @@ -29,7 +34,8 @@ ) activators = list( "create smoke" = IC_PINTYPE_PULSE_IN, - "on smoked" = IC_PINTYPE_PULSE_OUT + "on smoked" = IC_PINTYPE_PULSE_OUT, + "push ref" = IC_PINTYPE_PULSE_IN ) spawn_flags = IC_SPAWN_RESEARCH power_draw_per_use = 20 @@ -40,24 +46,27 @@ //reset warning only if we have reagents now if(changetype == ADD_REAGENT) notified = FALSE - set_pin_data(IC_OUTPUT, 1, reagents.total_volume) - push_data() + push_vol() -/obj/item/integrated_circuit/reagent/smoke/do_work() - if(!reagents || (reagents.total_volume < IC_SMOKE_REAGENTS_MINIMUM_UNITS)) - return - var/location = get_turf(src) - var/datum/effect_system/smoke_spread/chem/S = new - S.attach(location) - playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) - if(S) - S.set_up(reagents, smoke_radius, location, notified) - if(!notified) - notified = TRUE - S.start() - - reagents.clear_reagents() - activate_pin(2) +/obj/item/integrated_circuit/reagent/smoke/do_work(ord) + switch(ord) + if(1) + if(!reagents || (reagents.total_volume < IC_SMOKE_REAGENTS_MINIMUM_UNITS)) + return + var/location = get_turf(src) + var/datum/effect_system/smoke_spread/chem/S = new + S.attach(location) + playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) + if(S) + S.set_up(reagents, smoke_radius, location, notified) + if(!notified) + notified = TRUE + S.start() + reagents.clear_reagents() + activate_pin(2) + if(3) + set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) + push_data() /obj/item/integrated_circuit/reagent/injector name = "integrated hypo-injector" @@ -85,7 +94,9 @@ activators = list( "inject" = IC_PINTYPE_PULSE_IN, "on injected" = IC_PINTYPE_PULSE_OUT, - "on fail" = IC_PINTYPE_PULSE_OUT + "on fail" = IC_PINTYPE_PULSE_OUT, + "push ref" = IC_PINTYPE_PULSE_IN + ) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH power_draw_per_use = 15 @@ -93,15 +104,8 @@ var/transfer_amount = 10 var/busy = FALSE -/obj/item/integrated_circuit/reagent/injector/interact(mob/user) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - ..() - - /obj/item/integrated_circuit/reagent/injector/on_reagent_change(changetype) - set_pin_data(IC_OUTPUT, 1, reagents.total_volume) - push_data() + push_vol() /obj/item/integrated_circuit/reagent/injector/on_data_written() var/new_amount = get_pin_data(IC_INPUT, 2) @@ -127,7 +131,15 @@ temp_reagents.clear_reagents() qdel(temp_reagents) -/obj/item/integrated_circuit/reagent/injector/do_work() +/obj/item/integrated_circuit/reagent/injector/do_work(ord) + switch(ord) + if(1) + inject() + if(4) + set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) + push_data() + +/obj/item/integrated_circuit/reagent/injector/proc/inject() set waitfor = FALSE // Don't sleep in a proc that is called by a processor without this set, otherwise it'll delay the entire thing var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) var/atom/movable/acting_object = get_object() @@ -281,17 +293,20 @@ "volume used" = IC_PINTYPE_NUMBER, "self reference" = IC_PINTYPE_REF ) - activators = list() + activators = list("push ref" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH +<<<<<<< HEAD /obj/item/integrated_circuit/reagent/storage/interact(mob/user) +======= + +/obj/item/integrated_circuit/reagent/storage/do_work() +>>>>>>> 95b9e19... [READY]Circuitry upgrades (#33579) set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) push_data() - ..() /obj/item/integrated_circuit/reagent/storage/on_reagent_change(changetype) - set_pin_data(IC_OUTPUT, 1, reagents.total_volume) - push_data() + push_vol() /obj/item/integrated_circuit/reagent/storage/cryo name = "cryo reagent storage" @@ -306,6 +321,7 @@ . = ..() reagents.set_reacting(FALSE) + /obj/item/integrated_circuit/reagent/storage/big name = "big reagent storage" desc = "Stores liquid inside, and away from electrical components. Can store up to 180u." @@ -317,6 +333,99 @@ complexity = 16 spawn_flags = IC_SPAWN_RESEARCH +/obj/item/integrated_circuit/reagent/storage/grinder + name = "reagent grinder" + desc = "This is reagent grinder.It accepts ref to something and refines it into reagents. Can store up to 100u." + icon_state = "blender" + extended_desc = "" + inputs = list( + "target" = IC_PINTYPE_REF, + ) + outputs = list( + "volume used" = IC_PINTYPE_NUMBER, + "self reference" = IC_PINTYPE_REF + ) + activators = list( + "grind" = IC_PINTYPE_PULSE_IN, + "on grind" = IC_PINTYPE_PULSE_OUT, + "on fail" = IC_PINTYPE_PULSE_OUT, + "push ref" = IC_PINTYPE_PULSE_IN + ) + volume = 100 + power_draw_per_use = 150 + complexity = 16 + spawn_flags = IC_SPAWN_RESEARCH + + +/obj/item/integrated_circuit/reagent/storage/grinder/do_work(ord) + switch(ord) + if(1) + grind() + if(4) + set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) + push_data() + +/obj/item/integrated_circuit/reagent/storage/grinder/proc/grind() + if(reagents.total_volume >= reagents.maximum_volume) + activate_pin(3) + return FALSE + var/obj/item/I = get_pin_data_as_type(IC_INPUT, 1, /obj/item) + if(istype(I)&&(I.grind_results)&&check_target(I)&&(I.on_grind(src) != -1)) + reagents.add_reagent_list(I.grind_results) + if(I.reagents) + I.reagents.trans_to(src, I.reagents.total_volume) + qdel(I) + activate_pin(2) + return TRUE + activate_pin(3) + return FALSE + +obj/item/integrated_circuit/reagent/storage/juicer + name = "reagent juicer" + desc = "This is reagent juicer.It accepts ref to something and refines it into reagents. Can store up to 100u." + icon_state = "blender" + extended_desc = "" + inputs = list( + "target" = IC_PINTYPE_REF, + ) + outputs = list( + "volume used" = IC_PINTYPE_NUMBER, + "self reference" = IC_PINTYPE_REF + ) + activators = list( + "juice" = IC_PINTYPE_PULSE_IN, + "on juice" = IC_PINTYPE_PULSE_OUT, + "on fail" = IC_PINTYPE_PULSE_OUT, + "push ref" = IC_PINTYPE_PULSE_IN + ) + volume = 100 + power_draw_per_use = 150 + complexity = 16 + spawn_flags = IC_SPAWN_RESEARCH + +/obj/item/integrated_circuit/reagent/storage/juicer/do_work(ord) + switch(ord) + if(1) + juice() + if(4) + set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) + push_data() + +/obj/item/integrated_circuit/reagent/storage/juicer/proc/juice() + if(reagents.total_volume >= reagents.maximum_volume) + activate_pin(3) + return FALSE + var/obj/item/I = get_pin_data_as_type(IC_INPUT, 1, /obj/item) + if(istype(I)&&check_target(I)&&(I.juice_results)&&(I.on_juice() != -1)) + reagents.add_reagent_list(I.juice_results) + qdel(I) + activate_pin(2) + return TRUE + activate_pin(3) + return FALSE + + + /obj/item/integrated_circuit/reagent/storage/scan name = "reagent scanner" desc = "Stores liquid inside, and away from electrical components. Can store up to 60u. On pulse this beaker will send list of contained reagents." @@ -330,17 +439,22 @@ "list of reagents" = IC_PINTYPE_LIST ) activators = list( - "scan" = IC_PINTYPE_PULSE_IN + "scan" = IC_PINTYPE_PULSE_IN, + "push ref" = IC_PINTYPE_PULSE_IN ) spawn_flags = IC_SPAWN_RESEARCH -/obj/item/integrated_circuit/reagent/storage/scan/do_work() - var/cont[0] - for(var/datum/reagent/RE in reagents.reagent_list) - cont += RE.id - set_pin_data(IC_OUTPUT, 3, cont) - push_data() - +/obj/item/integrated_circuit/reagent/storage/scan/do_work(ord) + switch(ord) + if(1) + var/cont[0] + for(var/datum/reagent/RE in reagents.reagent_list) + cont += RE.id + set_pin_data(IC_OUTPUT, 3, cont) + push_data() + if(2) + set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) + push_data() /obj/item/integrated_circuit/reagent/filter name = "reagent filter" @@ -394,7 +508,8 @@ if(!source.reagents || !target.reagents) return - if(!source.is_drainable() || !target.is_refillable()) + // FALSE in those procs makes mobs invalid targets. + if(!source.is_drawable(FALSE) || !target.is_injectable(FALSE)) return if(target.reagents.maximum_volume - target.reagents.total_volume <= 0) @@ -410,3 +525,45 @@ activate_pin(2) push_data() +/obj/item/integrated_circuit/reagent/storage/heater + name = "chemical heater" + desc = "Stores liquid inside, and away from electrical components. Can store up to 60u. Will heat or freeze reagents \ + to target temperature, when turned on." + icon_state = "heater" + container_type = OPENCONTAINER + complexity = 8 + inputs = list( + "target temperature" = IC_PINTYPE_NUMBER, + "on" = IC_PINTYPE_BOOLEAN + ) + inputs_default = list("1" = 300) + outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF,"temperature" = IC_PINTYPE_NUMBER) + spawn_flags = IC_SPAWN_RESEARCH + var/heater_coefficient = 0.1 + +/obj/item/integrated_circuit/reagent/storage/heater/on_data_written() + if(get_pin_data(IC_INPUT, 2)) + power_draw_idle = 30 + else + power_draw_idle = 0 + +/obj/item/integrated_circuit/reagent/storage/heater/Initialize() + .=..() + START_PROCESSING(SScircuit, src) + +/obj/item/integrated_circuit/reagent/storage/heater/Destroy() + STOP_PROCESSING(SScircuit, src) + return ..() + +/obj/item/integrated_circuit/reagent/storage/heater/process() + if(power_draw_idle) + var/target_temperature = get_pin_data(IC_INPUT, 1) + if(reagents.chem_temp > target_temperature) + reagents.chem_temp += min(-1, (target_temperature - reagents.chem_temp) * heater_coefficient) + if(reagents.chem_temp < target_temperature) + reagents.chem_temp += max(1, (target_temperature - reagents.chem_temp) * heater_coefficient) + + reagents.chem_temp = round(reagents.chem_temp) + reagents.handle_reactions() + set_pin_data(IC_OUTPUT, 3, reagents.chem_temp) + push_data() diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm index ec59c3cab1..37a38677b0 100644 --- a/code/modules/integrated_electronics/subtypes/smart.dm +++ b/code/modules/integrated_electronics/subtypes/smart.dm @@ -27,6 +27,6 @@ push_data() return // Can't see the target. - set_pin_data(IC_OUTPUT, 1, get_dir(get_turf(src), get_turf(A))) + set_pin_data(IC_OUTPUT, 1, get_dir(get_turf(src), get_step_towards2(get_turf(src),A))) push_data() activate_pin(2) diff --git a/icons/obj/assemblies/electronic_components.dmi b/icons/obj/assemblies/electronic_components.dmi index 1852079e7392745c0a3911bf1ea557f74b052e0d..a9dac06d6b8bcc864bce0ca0194ba949b0856b4d 100644 GIT binary patch literal 22954 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 Date: Sun, 24 Dec 2017 16:52:16 -0600 Subject: [PATCH 078/132] Automatic changelog generation for PR #4505 [ci skip] --- html/changelogs/AutoChangeLog-pr-4505.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4505.yml diff --git a/html/changelogs/AutoChangeLog-pr-4505.yml b/html/changelogs/AutoChangeLog-pr-4505.yml new file mode 100644 index 0000000000..baf8daa374 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4505.yml @@ -0,0 +1,6 @@ +author: "coiax" +delete-after: True +changes: + - balance: "The kitchen gibber must be anchored in order to use." + - balance: "The gibber requires bodies to have no external items or +equipment." From 848006fefde1d0219fbbd0e57861a7e78a8fb384 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 16:52:35 -0600 Subject: [PATCH 079/132] Automatic changelog generation for PR #4506 [ci skip] --- html/changelogs/AutoChangeLog-pr-4506.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4506.yml diff --git a/html/changelogs/AutoChangeLog-pr-4506.yml b/html/changelogs/AutoChangeLog-pr-4506.yml new file mode 100644 index 0000000000..0b2d10fffe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4506.yml @@ -0,0 +1,4 @@ +author: "Dax Dupont" +delete-after: True +changes: + - bugfix: "Borgs will no longer have their metal/glass/etc stacks commit sudoku when it runs out of metal. They will also show the correct amount instead of a constant of \"1\" on menu interaction." From 568ecf9160fef5e08e0e3b1d08dba4efe9a04879 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 16:52:48 -0600 Subject: [PATCH 080/132] Automatic changelog generation for PR #4507 [ci skip] --- html/changelogs/AutoChangeLog-pr-4507.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4507.yml diff --git a/html/changelogs/AutoChangeLog-pr-4507.yml b/html/changelogs/AutoChangeLog-pr-4507.yml new file mode 100644 index 0000000000..3076537362 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4507.yml @@ -0,0 +1,4 @@ +author: "Kor" +delete-after: True +changes: + - rscadd: "During Christmas you will be able to click on the tree in the Chapel to receive one present per round. That present can contain any item in the game." From b6f4a63ec81b91af7e756594e099fdffdd46d565 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 16:53:17 -0600 Subject: [PATCH 081/132] Automatic changelog generation for PR #4509 [ci skip] --- html/changelogs/AutoChangeLog-pr-4509.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4509.yml diff --git a/html/changelogs/AutoChangeLog-pr-4509.yml b/html/changelogs/AutoChangeLog-pr-4509.yml new file mode 100644 index 0000000000..0be18e6c47 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4509.yml @@ -0,0 +1,4 @@ +author: "Robustin" +delete-after: True +changes: + - tweak: "The EMP door shocking effect has a new formula. Heavy EMP's will no longer shock doors while light EMP's have a 10% chance (down from 13.33%)." From e7f926c153ed59a6516d15b6d2f0df7f0c31a620 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 24 Dec 2017 16:54:01 -0600 Subject: [PATCH 082/132] Update _eminence.dm --- .../gamemodes/clock_cult/clock_mobs/_eminence.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 825ad90057..71b3401e13 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -30,17 +30,6 @@ /mob/camera/eminence/Login() ..() var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) -<<<<<<< HEAD - if(!C) - add_servant_of_ratvar(src, TRUE) - C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) - if(C && C.clock_team) - if(C.clock_team.eminence) - remove_servant_of_ratvar(src,TRUE) - qdel(src) - else - C.clock_team.eminence = src -======= if(C && C.clock_team) if(C.clock_team.eminence && C.clock_team.eminence != src) remove_servant_of_ratvar(src,TRUE) @@ -48,7 +37,6 @@ return else C.clock_team.eminence = src ->>>>>>> 619a83f... Fixes eminence login (#33752) to_chat(src, "You have been selected as the Eminence!") to_chat(src, "As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.") to_chat(src, "Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.") From 5bf490ae1d2be4883f62e44897d51760b64abf9c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 17:00:20 -0600 Subject: [PATCH 083/132] Automatic changelog generation for PR #4516 [ci skip] --- html/changelogs/AutoChangeLog-pr-4516.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4516.yml diff --git a/html/changelogs/AutoChangeLog-pr-4516.yml b/html/changelogs/AutoChangeLog-pr-4516.yml new file mode 100644 index 0000000000..66e1e9c6f3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4516.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - bugfix: "\"Download N research nodes\" objective is now checked correctly again." From dacf4b7b795e9fcb30d0d422c40850dd768b01af Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 17:00:53 -0600 Subject: [PATCH 084/132] Automatic changelog generation for PR #4519 [ci skip] --- html/changelogs/AutoChangeLog-pr-4519.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4519.yml diff --git a/html/changelogs/AutoChangeLog-pr-4519.yml b/html/changelogs/AutoChangeLog-pr-4519.yml new file mode 100644 index 0000000000..aa0bf5a78d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4519.yml @@ -0,0 +1,4 @@ +author: "Frozenguy5" +delete-after: True +changes: + - bugfix: "Soapstones now give the correct time they were placed down." From dab03cf25f06a6385f15ba0f671dc5d7d617b400 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 17:01:06 -0600 Subject: [PATCH 085/132] Automatic changelog generation for PR #4521 [ci skip] --- html/changelogs/AutoChangeLog-pr-4521.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4521.yml diff --git a/html/changelogs/AutoChangeLog-pr-4521.yml b/html/changelogs/AutoChangeLog-pr-4521.yml new file mode 100644 index 0000000000..2b5553d55f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4521.yml @@ -0,0 +1,4 @@ +author: "More Robust Than You" +delete-after: True +changes: + - tweak: "Vending machines now use TGUI" From 6dc2d8f0eb3598a52c20216bdb6774cda42ab497 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 24 Dec 2017 18:02:13 -0500 Subject: [PATCH 086/132] Update reagents.dm --- code/modules/integrated_electronics/subtypes/reagents.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 6f527c8149..0c66c3a943 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -296,12 +296,7 @@ activators = list("push ref" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -<<<<<<< HEAD -/obj/item/integrated_circuit/reagent/storage/interact(mob/user) -======= - /obj/item/integrated_circuit/reagent/storage/do_work() ->>>>>>> 95b9e19... [READY]Circuitry upgrades (#33579) set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) push_data() From 2609dc109f542f45db9f0fcce8a24d573474bd4b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 24 Dec 2017 22:10:17 -0600 Subject: [PATCH 087/132] Automatic changelog generation for PR #4440 [ci skip] --- html/changelogs/AutoChangeLog-pr-4440.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4440.yml diff --git a/html/changelogs/AutoChangeLog-pr-4440.yml b/html/changelogs/AutoChangeLog-pr-4440.yml new file mode 100644 index 0000000000..9d14363c8a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4440.yml @@ -0,0 +1,4 @@ +author: "ninjanomnom" +delete-after: True +changes: + - bugfix: "Non movement keys pressed while moving no longer stop movement." From 30bc5609725457116bee22e4d9b051bf0a27d44e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 24 Dec 2017 21:48:06 -0800 Subject: [PATCH 088/132] readds shock collars --- code/modules/research/designs/autolathe_designs.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 8542660343..fd48ac77e7 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -814,3 +814,12 @@ materials = list(MAT_METAL = 1000) build_path = /obj/item/disk/holodisk category = list("initial", "Misc") + +//CITADEL +/datum/design/shock_collar + name = "Shock Collar" + id = "shock_collar" + build_type = AUTOLATHE + materials = list(MAT_METAL = 5000, MAT_GLASS = 2000) + build_path = /obj/item/device/electropack/shockcollar + category = list("hacked", "Security") From cab61abc329c75fcd530dbc4a646714ee81b9c3b Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 24 Dec 2017 23:29:33 -0800 Subject: [PATCH 089/132] Update autolathe_designs.dm --- code/modules/research/designs/autolathe_designs.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index fd48ac77e7..ebcea57b6d 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -818,8 +818,8 @@ //CITADEL /datum/design/shock_collar name = "Shock Collar" - id = "shock_collar" - build_type = AUTOLATHE - materials = list(MAT_METAL = 5000, MAT_GLASS = 2000) - build_path = /obj/item/device/electropack/shockcollar - category = list("hacked", "Security") + id = "shock_collar" + build_type = AUTOLATHE + materials = list(MAT_METAL = 5000, MAT_GLASS = 2000) + build_path = /obj/item/device/electropack/shockcollar + category = list("hacked", "Security") From 7b40f3f0e0821e5cb3cd228189c57c5199e09ed3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 25 Dec 2017 05:09:21 -0600 Subject: [PATCH 090/132] Update disease_outbreak.dm --- code/modules/events/disease_outbreak.dm | 35 ++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index beb3fb476f..f33d8ec87a 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -13,7 +13,7 @@ var/max_severity = 3 -/datum/round_event/disease_outbreak/announce() +/datum/round_event/disease_outbreak/announce(fake) priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak7.ogg') /datum/round_event/disease_outbreak/setup() @@ -33,7 +33,7 @@ var/turf/T = get_turf(H) if(!T) continue - if(T.z != ZLEVEL_STATION_PRIMARY) + if(!(T.z in GLOB.station_z_levels)) continue if(!H.client) continue @@ -51,7 +51,7 @@ var/datum/disease/D if(!advanced_virus) if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. - if(!H.dna || (H.has_disability(BLIND))) //A blindness disease would be the worst. + if(!H.dna || (H.has_disability(DISABILITY_BLIND))) //A blindness disease would be the worst. continue D = new virus_type() var/datum/disease/dnaspread/DS = D @@ -64,4 +64,33 @@ D = make_virus(max_severity, max_severity) D.carrier = TRUE H.AddDisease(D) + + if(advanced_virus) + var/datum/disease/advance/A = D + var/list/name_symptoms = list() //for feedback + for(var/datum/symptom/S in A.symptoms) + name_symptoms += S.name + message_admins("An event has triggered a random advanced virus outbreak on [key_name_admin(H)]! It has these symptoms: [english_list(name_symptoms)]") + log_game("An event has triggered a random advanced virus outbreak on [key_name(H)]! It has these symptoms: [english_list(name_symptoms)]") break + +/datum/round_event/disease_outbreak/proc/make_virus(max_symptoms, max_level) + if(max_symptoms > SYMPTOM_LIMIT) + max_symptoms = SYMPTOM_LIMIT + var/datum/disease/advance/A = new(FALSE, null) + A.symptoms = list() + var/list/datum/symptom/possible_symptoms = list() + for(var/symptom in subtypesof(/datum/symptom)) + var/datum/symptom/S = symptom + if(initial(S.level) > max_level) + continue + if(initial(S.level) <= 0) //unobtainable symptoms + continue + possible_symptoms += S + for(var/i in 1 to max_symptoms) + var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms) + if(chosen_symptom) + var/datum/symptom/S = new chosen_symptom + A.symptoms += S + A.Refresh() //just in case someone already made and named the same disease + return A From 62a9649a989075aa45e2bcfb3b95d19a7da003ed Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 25 Dec 2017 05:23:37 -0600 Subject: [PATCH 091/132] Update disease_outbreak.dm --- code/modules/events/disease_outbreak.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index f33d8ec87a..5c28632c89 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -51,7 +51,7 @@ var/datum/disease/D if(!advanced_virus) if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. - if(!H.dna || (H.has_disability(DISABILITY_BLIND))) //A blindness disease would be the worst. + if(!H.dna || (H.has_disability(BLIND))) //A blindness disease would be the worst. continue D = new virus_type() var/datum/disease/dnaspread/DS = D From b0f793f4353e448d469fe96b87e27066078eeafc Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 25 Dec 2017 14:41:31 -0800 Subject: [PATCH 092/132] gives medical some medical boards, but not their own circuit imprinter yet (#33816) * medical gets med boards * sleepers/cryo too --- code/modules/research/designs/machine_designs.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 2343bd8814..059d9c982c 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -111,6 +111,7 @@ desc = "The circuit board for a sleeper." id = "sleeper" build_path = /obj/item/circuitboard/machine/sleeper + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL category = list ("Medical Machinery") /datum/design/board/cryotube @@ -118,6 +119,7 @@ desc = "The circuit board for a cryotube." id = "cryotube" build_path = /obj/item/circuitboard/machine/cryo_tube + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL category = list ("Medical Machinery") /datum/design/board/chem_dispenser @@ -125,12 +127,14 @@ desc = "The circuit board for a portable chem dispenser." id = "chem_dispenser" build_path = /obj/item/circuitboard/machine/chem_dispenser + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL category = list ("Medical Machinery") /datum/design/board/chem_master name = "Machine Design (Chem Master Board)" desc = "The circuit board for a Chem Master 3000." id = "chem_master" + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL build_path = /obj/item/circuitboard/machine/chem_master category = list ("Medical Machinery") @@ -138,6 +142,7 @@ name = "Machine Design (Chemical Heater Board)" desc = "The circuit board for a chemical heater." id = "chem_heater" + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL build_path = /obj/item/circuitboard/machine/chem_heater category = list ("Medical Machinery") @@ -153,12 +158,14 @@ desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." id = "clonecontrol" build_path = /obj/item/circuitboard/computer/cloning + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL category = list("Medical Machinery") /datum/design/board/clonepod name = "Machine Design (Clone Pod)" desc = "Allows for the construction of circuit boards used to build a Cloning Pod." id = "clonepod" + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL build_path = /obj/item/circuitboard/machine/clonepod category = list("Medical Machinery") @@ -166,6 +173,7 @@ name = "Machine Design (Cloning Scanner)" desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." id = "clonescanner" + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL build_path = /obj/item/circuitboard/machine/clonescanner category = list("Medical Machinery") From 703667bdffbe3ea20d8ba989d0946d3242bf9504 Mon Sep 17 00:00:00 2001 From: coiax Date: Mon, 25 Dec 2017 23:11:08 +0000 Subject: [PATCH 094/132] Ghosts can *spin and *flip --- code/datums/emotes.dm | 13 ++-- code/modules/mob/dead/observer/say.dm | 24 +++++++ code/modules/mob/emote.dm | 48 ++++++++++++++ code/modules/mob/living/emote.dm | 44 ------------- code/modules/mob/living/say.dm | 5 -- code/modules/mob/say.dm | 91 +++++++++++++++++++++++++++ tgstation.dme | 1 + 7 files changed, 172 insertions(+), 54 deletions(-) create mode 100644 code/modules/mob/emote.dm diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 2e5bd580bf..b452eff382 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -16,8 +16,9 @@ var/emote_type = EMOTE_VISIBLE //Whether the emote is visible or audible var/restraint_check = FALSE //Checks if the mob is restrained before performing the emote var/muzzle_ignore = FALSE //Will only work if the emote is EMOTE_AUDIBLE - var/list/mob_type_allowed_typecache //Types that are allowed to use that emote + var/list/mob_type_allowed_typecache = list(/mob) //Types that are allowed to use that emote var/list/mob_type_blacklist_typecache //Types that are NOT allowed to use that emote + var/list/mob_type_ignore_stat_typecache var/stat_allowed = CONSCIOUS var/static/list/emote_list = list() @@ -26,6 +27,7 @@ emote_list[key_third_person] = src mob_type_allowed_typecache = typecacheof(mob_type_allowed_typecache) mob_type_blacklist_typecache = typecacheof(mob_type_blacklist_typecache) + mob_type_ignore_stat_typecache = typecacheof(mob_type_ignore_stat_typecache) /datum/emote/proc/run_emote(mob/user, params, type_override) . = TRUE @@ -37,9 +39,10 @@ msg = replace_pronoun(user, msg) - var/mob/living/L = user - for(var/obj/item/implant/I in L.implants) - I.trigger(key, L) + if(isliving(user)) + var/mob/living/L = user + for(var/obj/item/implant/I in L.implants) + I.trigger(key, L) if(!msg) return @@ -97,7 +100,7 @@ return FALSE if(is_type_in_typecache(user, mob_type_blacklist_typecache)) return FALSE - if(status_check) + if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache)) if(user.stat > stat_allowed || (user.status_flags & FAKEDEATH)) to_chat(user, "You cannot [key] while unconscious.") return FALSE diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index ad64c53fc7..110d2b5cc4 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -5,6 +5,7 @@ return log_talk(src,"Ghost/[src.key] : [message]", LOGSAY) +<<<<<<< HEAD . = src.say_dead(message) @@ -23,3 +24,26 @@ message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode) to_chat(src, "[link] [message]") +======= + + if(check_emote(message)) + return + + . = say_dead(message) + +/mob/dead/observer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) + var/atom/movable/to_follow = speaker + if(radio_freq) + var/atom/movable/virtualspeaker/V = speaker + + if(isAI(V.source)) + var/mob/living/silicon/ai/S = V.source + to_follow = S.eyeobj + else + to_follow = V.source + var/link = FOLLOW_LINK(src, to_follow) + // Recompose the message, because it's scrambled by default + message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode) + to_chat(src, "[link] [message]") + +>>>>>>> 887cc89... No flipping while unconscious (#33736) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm new file mode 100644 index 0000000000..5487b5b284 --- /dev/null +++ b/code/modules/mob/emote.dm @@ -0,0 +1,48 @@ +//The code execution of the emote datum is located at code/datums/emotes.dm +/mob/emote(act, m_type = null, message = null) + act = lowertext(act) + var/param = message + var/custom_param = findchar(act, " ") + if(custom_param) + param = copytext(act, custom_param + 1, length(act) + 1) + act = copytext(act, 1, custom_param) + + var/datum/emote/E + E = E.emote_list[act] + if(!E) + to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + return + E.run_emote(src, param, m_type) + +/datum/emote/flip + key = "flip" + key_third_person = "flips" + restraint_check = TRUE + mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer) + mob_type_ignore_stat_typecache = list(/mob/dead/observer) + +/datum/emote/flip/run_emote(mob/user, params) + . = ..() + if(.) + user.SpinAnimation(7,1) + +/datum/emote/spin + key = "spin" + key_third_person = "spins" + restraint_check = TRUE + mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer) + mob_type_ignore_stat_typecache = list(/mob/dead/observer) + +/datum/emote/spin/run_emote(mob/user) + . = ..() + if(.) + user.spin(20, 1) + + if(iscyborg(user) && user.has_buckled_mobs()) + var/mob/living/silicon/robot/R = user + GET_COMPONENT_FROM(riding_datum, /datum/component/riding, R) + if(riding_datum) + for(var/mob/M in R.buckled_mobs) + riding_datum.force_dismount(M) + else + R.unbuckle_all_mobs() diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 9f541aaf67..fd3c521cd1 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -1,18 +1,3 @@ -//The code execution of the emote datum is located at code/datums/emotes.dm -/mob/living/emote(act, m_type = null, message = null) - act = lowertext(act) - var/param = message - var/custom_param = findchar(act, " ") - if(custom_param) - param = copytext(act, custom_param + 1, length(act) + 1) - act = copytext(act, 1, custom_param) - - var/datum/emote/E - E = E.emote_list[act] - if(!E) - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") - return - E.run_emote(src, param, m_type) /* EMOTE DATUMS */ /datum/emote/living @@ -143,16 +128,6 @@ restraint_check = TRUE wing_time = 10 -/datum/emote/living/flip - key = "flip" - key_third_person = "flips" - restraint_check = TRUE - -/datum/emote/living/flip/run_emote(mob/user, params) - . = ..() - if(.) - user.SpinAnimation(7,1) - /datum/emote/living/frown key = "frown" key_third_person = "frowns" @@ -482,25 +457,6 @@ message_param = "beeps at %t." sound = 'sound/machines/twobeep.ogg' -/datum/emote/living/spin - key = "spin" - key_third_person = "spins" - restraint_check = TRUE - -/datum/emote/living/spin/run_emote(mob/user) - . = ..() - if(.) - user.spin(20, 1) - if(iscyborg(user) && user.has_buckled_mobs()) - var/mob/living/silicon/robot/R = user - GET_COMPONENT_FROM(riding_datum, /datum/component/riding, R) - if(riding_datum) - for(var/mob/M in R.buckled_mobs) - riding_datum.force_dismount(M) - else - R.unbuckle_all_mobs() - - /datum/emote/living/circle key = "circle" key_third_person = "circles" diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index e21c21453a..4e731567f1 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -296,11 +296,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 -/mob/living/proc/check_emote(message) - if(copytext(message, 1, 2) == "*") - emote(copytext(message, 2)) - return 1 - /mob/living/proc/get_message_mode(message) var/key = copytext(message, 1, 2) if(key == "#") diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 1ee7f27452..32710c06f9 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //Speech verbs. /mob/verb/say_verb(message as text) set name = "Say" @@ -80,3 +81,93 @@ /mob/proc/lingcheck() return LINGHIVE_NONE +======= +//Speech verbs. +/mob/verb/say_verb(message as text) + set name = "Say" + set category = "IC" + if(GLOB.say_disabled) //This is here to try to identify lag problems + to_chat(usr, "Speech is currently admin-disabled.") + return + if(message) + say(message) + + +/mob/verb/whisper_verb(message as text) + set name = "Whisper" + set category = "IC" + if(GLOB.say_disabled) //This is here to try to identify lag problems + to_chat(usr, "Speech is currently admin-disabled.") + return + whisper(message) + +/mob/proc/whisper(message, datum/language/language=null) + say(message, language) //only living mobs actually whisper, everything else just talks + +/mob/verb/me_verb(message as text) + set name = "Me" + set category = "IC" + + if(GLOB.say_disabled) //This is here to try to identify lag problems + to_chat(usr, "Speech is currently admin-disabled.") + return + + message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) + + usr.emote("me",1,message) + +/mob/proc/say_dead(var/message) + var/name = real_name + var/alt_name = "" + + if(GLOB.say_disabled) //This is here to try to identify lag problems + to_chat(usr, "Speech is currently admin-disabled.") + return + + if(jobban_isbanned(src, "OOC")) + to_chat(src, "You have been banned from deadchat.") + return + + if (src.client) + if(src.client.prefs.muted & MUTE_DEADCHAT) + to_chat(src, "You cannot talk in deadchat (muted).") + return + + if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT)) + return + + var/mob/dead/observer/O = src + if(isobserver(src) && O.deadchat_name) + name = "[O.deadchat_name]" + else + if(mind && mind.name) + name = "[mind.name]" + else + name = real_name + if(name != real_name) + alt_name = " (died as [real_name])" + + var/K + + if(key) + K = src.key + + message = src.say_quote(message, get_spans()) + var/rendered = "DEAD: [name][alt_name] [message]" + + deadchat_broadcast(rendered, follow_target = src, speaker_key = K) + +/mob/proc/check_emote(message) + if(copytext(message, 1, 2) == "*") + emote(copytext(message, 2)) + return 1 + +/mob/proc/emote(var/act) + return + +/mob/proc/hivecheck() + return 0 + +/mob/proc/lingcheck() + return LINGHIVE_NONE +>>>>>>> 887cc89... No flipping while unconscious (#33736) diff --git a/tgstation.dme b/tgstation.dme index 4b6ba31e8b..45c9a8c75e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1698,6 +1698,7 @@ #include "code\modules\mining\lavaland\necropolis_chests.dm" #include "code\modules\mining\lavaland\ruins\gym.dm" #include "code\modules\mob\death.dm" +#include "code\modules\mob\emote.dm" #include "code\modules\mob\inventory.dm" #include "code\modules\mob\login.dm" #include "code\modules\mob\logout.dm" From 0a29f02c89d1a1f3735e5e44d49b32a68c6053d1 Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Mon, 25 Dec 2017 20:17:12 -0500 Subject: [PATCH 095/132] Blocks auxiliary bases from being placed on top of lava or indestructible turfs --- code/modules/mining/aux_base.dm | 38 ++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 6b364e63e7..aed88c9545 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -1,9 +1,10 @@ ///Mining Base//// +#define ZONE_SET 0 #define BAD_ZLEVEL 1 #define BAD_AREA 2 #define BAD_COORDS 3 -#define ZONE_SET 4 +#define BAD_TURF 4 /area/shuttle/auxillary_base name = "Auxillary Base" @@ -134,21 +135,31 @@ interface with the mining shuttle at the landing site if a mobile beacon is also possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public" /obj/machinery/computer/auxillary_base/proc/set_landing_zone(turf/T, mob/user, var/no_restrictions) - var/obj/docking_port/mobile/auxillary_base/base_dock = locate(/obj/docking_port/mobile/auxillary_base) in SSshuttle.mobile if(!base_dock) //Not all maps have an Aux base. This object is useless in that case. to_chat(user, "This station is not equipped with an auxillary base. Please contact your Nanotrasen contractor.") return if(!no_restrictions) + var/static/list/disallowed_turf_types = typecacheof(list( + /turf/open/lava, + /turf/closed/indestructible, + /turf/open/indestructible, + )) + if(T.z != ZLEVEL_MINING) return BAD_ZLEVEL - var/colony_radius = max(base_dock.width, base_dock.height)*0.5 - if(T.x - colony_radius < 1 || T.x + colony_radius >= world.maxx || T.y - colony_radius < 1 || T.y + colony_radius >= world.maxx) - return BAD_COORDS //Avoid dropping the base too close to map boundaries, as it results in parts of it being left in space - var/list/area_counter = get_areas_in_range(colony_radius, T) - if(area_counter.len > 1) //Avoid smashing ruins unless you are inside a really big one - return BAD_AREA + var/colony_radius = CEILING(max(base_dock.width, base_dock.height)*0.5, 1) + var/list/colony_turfs = block(locate(T.x - colony_radius, T.y - colony_radius, T.z), locate(T.x + colony_radius, T.y + colony_radius, T.z)) + for(var/i in 1 to colony_turfs.len) + CHECK_TICK + var/turf/place = colony_turfs[i] + if(!place) + return BAD_COORDS + if(!istype(place.loc, /area/lavaland/surface)) + return BAD_AREA + if(disallowed_turf_types[place.type]) + return BAD_TURF var/area/A = get_area(T) @@ -208,14 +219,16 @@ interface with the mining shuttle at the landing site if a mobile beacon is also return switch(AB.set_landing_zone(T, user, no_restrictions)) + if(ZONE_SET) + qdel(src) if(BAD_ZLEVEL) to_chat(user, "This uplink can only be used in a designed mining zone.") if(BAD_AREA) to_chat(user, "Unable to acquire a targeting lock. Find an area clear of stuctures or entirely within one.") if(BAD_COORDS) to_chat(user, "Location is too close to the edge of the station's scanning range. Move several paces away and try again.") - if(ZONE_SET) - qdel(src) + if(BAD_TURF) + to_chat(user, "The landing zone contains turfs unsuitable for a base.") /obj/item/device/assault_pod/mining/unrestricted name = "omni-locational landing field designator" @@ -348,7 +361,12 @@ obj/docking_port/stationary/public_mining_dock /obj/structure/mining_shuttle_beacon/attack_robot(mob/user) return attack_hand(user) //So borgies can help +#undef ZONE_SET #undef BAD_ZLEVEL #undef BAD_AREA #undef BAD_COORDS +<<<<<<< HEAD #undef ZONE_SET +======= +#undef BAD_TURF +>>>>>>> 19e2a76... minor set_landing_zone() refactor (#33780) From 8ed083837770a8bd5803bac0baeb66f781d828e7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 25 Dec 2017 21:26:20 -0600 Subject: [PATCH 096/132] Automatic changelog generation for PR #4494 [ci skip] --- html/changelogs/AutoChangeLog-pr-4494.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4494.yml diff --git a/html/changelogs/AutoChangeLog-pr-4494.yml b/html/changelogs/AutoChangeLog-pr-4494.yml new file mode 100644 index 0000000000..d873e211a5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4494.yml @@ -0,0 +1,6 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - bugfix: "Projectiles that pierce objects will no longer be thrown off course when doing so!" + - code_imp: "Projectiles now use /datum/point/vectors for trajectory calculations." + - bugfix: "Beam rifle reflections will no longer glitch out." From b4763cb2bea2902c9885f7bbb186b08807ba485d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 25 Dec 2017 21:26:36 -0600 Subject: [PATCH 097/132] Automatic changelog generation for PR #4497 [ci skip] --- html/changelogs/AutoChangeLog-pr-4497.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4497.yml diff --git a/html/changelogs/AutoChangeLog-pr-4497.yml b/html/changelogs/AutoChangeLog-pr-4497.yml new file mode 100644 index 0000000000..05673f222c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4497.yml @@ -0,0 +1,4 @@ +author: "WJohnston" +delete-after: True +changes: + - tweak: "Syndicate nuke op infiltrator shuttle is no longer lopsided." From fcf707ad66317227c2675a8668b385185091b4ed Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 25 Dec 2017 21:27:20 -0600 Subject: [PATCH 098/132] Automatic changelog generation for PR #4482 [ci skip] --- html/changelogs/AutoChangeLog-pr-4482.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4482.yml diff --git a/html/changelogs/AutoChangeLog-pr-4482.yml b/html/changelogs/AutoChangeLog-pr-4482.yml new file mode 100644 index 0000000000..210ad03b5b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4482.yml @@ -0,0 +1,5 @@ +author: "Xhuis" +delete-after: True +changes: + - balance: "Floors blessed with holy water prevent servants from warping in and the Eminence from crossing them." + - balance: "The Eminence can never enter the Chapel." From adfb04fa6d65e067c5fcd5bba8b497b2c643a83a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 25 Dec 2017 21:27:42 -0600 Subject: [PATCH 099/132] Automatic changelog generation for PR #4492 [ci skip] --- html/changelogs/AutoChangeLog-pr-4492.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4492.yml diff --git a/html/changelogs/AutoChangeLog-pr-4492.yml b/html/changelogs/AutoChangeLog-pr-4492.yml new file mode 100644 index 0000000000..3b8e0de7e3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4492.yml @@ -0,0 +1,4 @@ +author: "Awesine" +delete-after: True +changes: + - rscadd: "added some things which happen to be mining scanner things to that gulag thing" From a7a0823594a028d9f066a485ff757979f9c953ac Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 25 Dec 2017 21:31:50 -0600 Subject: [PATCH 100/132] Update say.dm --- code/modules/mob/dead/observer/say.dm | 34 +++++---------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 110d2b5cc4..d2224a5965 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -1,30 +1,10 @@ -/mob/dead/observer/say(message) - message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) - - if (!message) - return - +/mob/dead/observer/say(message) + message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) + + if (!message) + return + log_talk(src,"Ghost/[src.key] : [message]", LOGSAY) -<<<<<<< HEAD - - . = src.say_dead(message) - -/mob/dead/observer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) - var/atom/movable/to_follow = speaker - if(radio_freq) - var/atom/movable/virtualspeaker/V = speaker - - if(isAI(V.source)) - var/mob/living/silicon/ai/S = V.source - to_follow = S.eyeobj - else - to_follow = V.source - var/link = FOLLOW_LINK(src, to_follow) - // Recompose the message, because it's scrambled by default - message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode) - to_chat(src, "[link] [message]") - -======= if(check_emote(message)) return @@ -45,5 +25,3 @@ // Recompose the message, because it's scrambled by default message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode) to_chat(src, "[link] [message]") - ->>>>>>> 887cc89... No flipping while unconscious (#33736) From 4cefd9219f3e2d1947b2137702e2b1a5ab5d47cc Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 25 Dec 2017 21:32:05 -0600 Subject: [PATCH 101/132] Update say.dm --- code/modules/mob/say.dm | 85 ----------------------------------------- 1 file changed, 85 deletions(-) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 32710c06f9..f9ee14b638 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -1,87 +1,3 @@ -<<<<<<< HEAD -//Speech verbs. -/mob/verb/say_verb(message as text) - set name = "Say" - set category = "IC" - if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") - return - usr.say(message) - - -/mob/verb/whisper_verb(message as text) - set name = "Whisper" - set category = "IC" - if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") - return - whisper(message) - -/mob/proc/whisper(message, datum/language/language=null) - say(message, language) //only living mobs actually whisper, everything else just talks - -/mob/verb/me_verb(message as text) - set name = "Me" - set category = "IC" - - if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") - return - - message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) - - usr.emote("me",1,message) - -/mob/proc/say_dead(var/message) - var/name = real_name - var/alt_name = "" - - if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") - return - - if(jobban_isbanned(src, "OOC")) - to_chat(src, "You have been banned from deadchat.") - return - - if (src.client) - if(src.client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "You cannot talk in deadchat (muted).") - return - - if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT)) - return - - var/mob/dead/observer/O = src - if(isobserver(src) && O.deadchat_name) - name = "[O.deadchat_name]" - else - if(mind && mind.name) - name = "[mind.name]" - else - name = real_name - if(name != real_name) - alt_name = " (died as [real_name])" - - var/K - - if(key) - K = src.key - - message = src.say_quote(message, get_spans()) - var/rendered = "DEAD: [name][alt_name] [message]" - - deadchat_broadcast(rendered, follow_target = src, speaker_key = K) - -/mob/proc/emote(var/act) - return - -/mob/proc/hivecheck() - return 0 - -/mob/proc/lingcheck() - return LINGHIVE_NONE -======= //Speech verbs. /mob/verb/say_verb(message as text) set name = "Say" @@ -170,4 +86,3 @@ /mob/proc/lingcheck() return LINGHIVE_NONE ->>>>>>> 887cc89... No flipping while unconscious (#33736) From 072e5b32aeb5b8086d40f7197bab416802c50107 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 25 Dec 2017 22:25:57 -0600 Subject: [PATCH 102/132] Automatic changelog generation for PR #4527 [ci skip] --- html/changelogs/AutoChangeLog-pr-4527.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4527.yml diff --git a/html/changelogs/AutoChangeLog-pr-4527.yml b/html/changelogs/AutoChangeLog-pr-4527.yml new file mode 100644 index 0000000000..0dbcc75089 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4527.yml @@ -0,0 +1,4 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "Ghosts can now use the *spin and *flip emotes." From 9eb78791a91a1c7f2fe4d43a232e7d802753b8f6 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 25 Dec 2017 22:53:44 -0600 Subject: [PATCH 103/132] Update aux_base.dm --- code/modules/mining/aux_base.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index aed88c9545..4e419646bc 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -365,8 +365,4 @@ obj/docking_port/stationary/public_mining_dock #undef BAD_ZLEVEL #undef BAD_AREA #undef BAD_COORDS -<<<<<<< HEAD -#undef ZONE_SET -======= #undef BAD_TURF ->>>>>>> 19e2a76... minor set_landing_zone() refactor (#33780) From 3ea4e8471954b0d3b66656b576b6d7ef0f97db9e Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 26 Dec 2017 01:12:40 -0500 Subject: [PATCH 104/132] Fixes deleting handcuffs (#33821) * Fixes deleting handcuffs * cleanup --- code/game/gamemodes/changeling/powers/biodegrade.dm | 2 -- code/game/objects/items/handcuffs.dm | 13 +++++++++++++ code/game/objects/items/tools/wirecutters.dm | 4 ---- code/modules/mob/living/carbon/carbon.dm | 11 ++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm index 4a34de151e..dbb0e3a88a 100644 --- a/code/game/gamemodes/changeling/powers/biodegrade.dm +++ b/code/game/gamemodes/changeling/powers/biodegrade.dm @@ -55,14 +55,12 @@ /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O) if(O && user.handcuffed == O) user.visible_message("[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.") - user.uncuff() new /obj/effect/decal/cleanable/greenglow(O.drop_location()) qdel(O) /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S) if(S && user.wear_suit == S) user.visible_message("[S] dissolves into a puddle of sizzling goop.") - user.uncuff() new /obj/effect/decal/cleanable/greenglow(S.drop_location()) qdel(S) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 1dd2b1b1de..7cfc4e220e 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -1,6 +1,19 @@ /obj/item/restraints breakouttime = 600 +/obj/item/restraints/Destroy() + if(iscarbon(loc)) + var/mob/living/carbon/M = loc + if(M.handcuffed == src) + M.handcuffed = null + M.update_handcuffed() + if(M.buckled && M.buckled.buckle_requires_restraints) + M.buckled.unbuckle_mob(M) + if(M.legcuffed == src) + M.legcuffed = null + M.update_inv_legcuffed() + return ..() + //Handcuffs /obj/item/restraints/handcuffs diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index c03469164e..285d776240 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -32,10 +32,6 @@ if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) user.visible_message("[user] cuts [C]'s restraints with [src]!") qdel(C.handcuffed) - C.handcuffed = null - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob(C) - C.update_handcuffed() return else ..() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 23decdd59f..8b1b47612b 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -365,16 +365,9 @@ to_chat(src, "You successfully [cuff_break ? "break" : "remove"] [I].") if(cuff_break) + . = !((I == handcuffed) || (I == legcuffed)) qdel(I) - if(I == handcuffed) - handcuffed = null - update_handcuffed() - return - else if(I == legcuffed) - legcuffed = null - update_inv_legcuffed() - return - return TRUE + return else if(I == handcuffed) From 7b159e204cd231d33173b57d96eea71e173deee8 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 26 Dec 2017 06:14:09 +0000 Subject: [PATCH 106/132] Cut through handcuffs with power wirecutters (#33822) * Cut through handcuffs with power wirecutters * unbuckle is handled on delete of the handcuffs --- code/game/objects/items/tools/wirecutters.dm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index c03469164e..94b10a6a9f 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -14,7 +14,8 @@ materials = list(MAT_METAL=80) attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' - usesound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + tool_behaviour = TOOL_WIRECUTTER toolspeed = 1 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) @@ -58,7 +59,8 @@ desc = "Extremely sharp wirecutters, made out of a silvery-green metal." icon = 'icons/obj/abductor.dmi' icon_state = "cutters" - toolspeed = 0.1 + toolspeed = 0.1 + random_color = FALSE /obj/item/wirecutters/cyborg @@ -70,7 +72,8 @@ name = "jaws of life" desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." icon_state = "jaws_cutter" - item_state = "jawsoflife" + item_state = "jawsoflife" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) usesound = 'sound/items/jaws_cut.ogg' toolspeed = 0.25 @@ -92,4 +95,12 @@ var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power to_chat(user, "You attach the pry jaws to [src].") qdel(src) - user.put_in_active_hand(pryjaws) \ No newline at end of file + user.put_in_active_hand(pryjaws) + +/obj/item/wirecutters/power/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + return + else + ..() From e51baed92e46f2062508bce6f86cc564bbe21428 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 26 Dec 2017 05:27:01 -0600 Subject: [PATCH 108/132] Update labcoat.dm --- code/modules/clothing/suits/labcoat.dm | 51 -------------------------- 1 file changed, 51 deletions(-) diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 7b794e9e09..7c7599af3d 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -1,53 +1,3 @@ -<<<<<<< HEAD -/obj/item/clothing/suit/toggle/labcoat - name = "labcoat" - desc = "A suit that protects against minor chemical spills." - icon_state = "labcoat" - item_state = "labcoat" - blood_overlay_type = "coat" - body_parts_covered = CHEST|ARMS - allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/device/sensor_device, /obj/item/tank/internals/emergency_oxygen) - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0, fire = 50, acid = 50) - togglename = "buttons" - -/obj/item/clothing/suit/toggle/labcoat/cmo - name = "chief medical officer's labcoat" - desc = "Bluer than the standard model." - icon_state = "labcoat_cmo" - item_state = "labcoat_cmo" - -/obj/item/clothing/suit/toggle/labcoat/emt - name = "EMT's jacket" - desc = "A dark blue jacket with reflective strips for emergency medical technicians." - icon_state = "labcoat_emt" - item_state = "labcoat_cmo" - -/obj/item/clothing/suit/toggle/labcoat/mad - name = "\improper The Mad's labcoat" - desc = "It makes you look capable of konking someone on the noggin and shooting them into space." - icon_state = "labgreen" - item_state = "labgreen" - -/obj/item/clothing/suit/toggle/labcoat/genetics - name = "geneticist labcoat" - desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." - icon_state = "labcoat_gen" - -/obj/item/clothing/suit/toggle/labcoat/chemist - name = "chemist labcoat" - desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." - icon_state = "labcoat_chem" - -/obj/item/clothing/suit/toggle/labcoat/virologist - name = "virologist labcoat" - desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." - icon_state = "labcoat_vir" - -/obj/item/clothing/suit/toggle/labcoat/science - name = "scientist labcoat" - desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." - icon_state = "labcoat_tox" -======= /obj/item/clothing/suit/toggle/labcoat name = "labcoat" desc = "A suit that protects against minor chemical spills." @@ -97,4 +47,3 @@ name = "scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_tox" ->>>>>>> 67f633f... Golems can wear labcoats (#33639) From 69a12f055712193c602413cc09789e58cffc6eee Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 05:29:44 -0600 Subject: [PATCH 109/132] Automatic changelog generation for PR #4472 [ci skip] --- html/changelogs/AutoChangeLog-pr-4472.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4472.yml diff --git a/html/changelogs/AutoChangeLog-pr-4472.yml b/html/changelogs/AutoChangeLog-pr-4472.yml new file mode 100644 index 0000000000..c6c38c1ae6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4472.yml @@ -0,0 +1,7 @@ +author: "Xhuis" +delete-after: True +changes: + - bugfix: "You can no longer elect two Eminences simultaneously." + - bugfix: "The Eminence no longer drifts in space." + - tweak: "The Eminence's mass recall now works on unconscious servants." + - tweak: "The Eminence's messages now have follow links for observers." From 29e221c3f9e64274747fe0d7cc2e6b5f6078557b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 05:59:54 -0600 Subject: [PATCH 110/132] Automatic changelog generation for PR #4503 [ci skip] --- html/changelogs/AutoChangeLog-pr-4503.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4503.yml diff --git a/html/changelogs/AutoChangeLog-pr-4503.yml b/html/changelogs/AutoChangeLog-pr-4503.yml new file mode 100644 index 0000000000..3cd060a535 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4503.yml @@ -0,0 +1,5 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - rscadd: "Clown modules have been added for cyborgs! Modules: Bikehorn, Airhorn, instrumental bikehorn, clown stamp, multicolor paint, rainbow crayon, soap, razor, purple lipstick, nonstunning selfcharging creampie cannon, nonslipping selfcharging water sprayer, lollipop fabricator, metallic picket sign, mini extinguisher, laughter reagent hypospray, and the ability to hug. +experimental: When emagged they get a fire spray, \"super\" laughter injector, and shocking or crushing hugs. Also, the module is adminspawn only at the moment." From d36b3e036b13e2c6e721617ab394dd0956e09a19 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 07:38:08 -0600 Subject: [PATCH 111/132] Automatic changelog generation for PR #4447 [ci skip] --- html/changelogs/AutoChangeLog-pr-4447.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4447.yml diff --git a/html/changelogs/AutoChangeLog-pr-4447.yml b/html/changelogs/AutoChangeLog-pr-4447.yml new file mode 100644 index 0000000000..09e363d971 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4447.yml @@ -0,0 +1,4 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "Golems can now wear labcoats." From 2e4b622aa456e610596339476367f186e677a2ee Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Tue, 26 Dec 2017 13:34:00 -0800 Subject: [PATCH 112/132] Add song title display to Play Internet Sound (#33839) * Add song title display to Play Internet Sound * Expands youtube-dl -J flag --- code/modules/admin/verbs/playsound.dm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 29d95c639f..58189e98b0 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -80,14 +80,32 @@ to_chat(src, "For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.") return var/shell_scrubbed_input = shell_url_scrub(web_sound_input) - var/list/output = world.shelleo("[ytdl] --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --get-url \"[shell_scrubbed_input]\"") + var/list/output = world.shelleo("[ytdl] --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_scrubbed_input]\"") var/errorlevel = output[SHELLEO_ERRORLEVEL] var/stdout = output[SHELLEO_STDOUT] var/stderr = output[SHELLEO_STDERR] if(!errorlevel) - var/static/regex/content_url_regex = regex("https?://\\S+") - if(content_url_regex.Find(stdout)) - web_sound_url = content_url_regex.match + var/list/data + try + data = json_decode(stdout) + catch(var/exception/e) + to_chat(src, "Youtube-dl JSON parsing FAILED:") + to_chat(src, "[e]: [stdout]") + return + + if (data["url"]) + web_sound_url = data["url"] + var/title = "[data["title"]]" + var/webpage_url = title + if (data["webpage_url"]) + webpage_url = "[title]" + + var/res = alert(usr, "Show the title of and link to this song to the players?\n[title]",, "No", "Yes", "Cancel") + switch(res) + if("Yes") + to_chat(world, "An admin played: [webpage_url]") + if("Cancel") + return if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) pitch = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5) From 9aa77b7df1840c4207b7306c7cb701718cef2da6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 15:58:02 -0600 Subject: [PATCH 114/132] [MIRROR] Rebalances virus healing (#4543) * Rebalances virus healing (#33815) * Rebalances virus healing * carbon * Rebalances virus healing --- code/datums/diseases/advance/symptoms/heal.dm | 152 +++++++++--------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 104a4c00c2..4f208b826b 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -1,10 +1,10 @@ /datum/symptom/heal name = "Basic Healing (does nothing)" //warning for adminspawn viruses desc = "You should not be seeing this." - stealth = 1 - resistance = -4 - stage_speed = -4 - transmittable = -4 + stealth = 0 + resistance = 0 + stage_speed = 0 + transmittable = 0 level = 0 //not obtainable base_message_chance = 20 //here used for the overlays symptom_delay_min = 1 @@ -22,7 +22,6 @@ /datum/symptom/heal/Activate(datum/disease/advance/A) if(!..()) return - //100% chance to activate for slow but consistent healing var/mob/living/M = A.affected_mob switch(A.stage) if(4, 5) @@ -45,20 +44,20 @@ return TRUE -/datum/symptom/heal/toxin +/datum/symptom/heal/starlight name = "Starlight Condensation" - desc = "The virus reacts to direct starlight, producing regenerative chemicals that can cure toxin damage." - stealth = 1 - resistance = -3 - stage_speed = -3 - transmittable = -3 + desc = "The virus reacts to direct starlight, producing regenerative chemicals. Works best against toxin-based damage." + stealth = -1 + resistance = -2 + stage_speed = 0 + transmittable = 1 level = 6 passive_message = "You miss the feeling of starlight on your skin." var/nearspace_penalty = 0.3 threshold_desc = "Stage Speed 6: Increases healing speed.
    \ Transmission 6: Removes penalty for only being close to space." -/datum/symptom/heal/toxin/Start(datum/disease/advance/A) +/datum/symptom/heal/starlight/Start(datum/disease/advance/A) if(!..()) return if(A.properties["transmission"] >= 6) @@ -66,7 +65,7 @@ if(A.properties["stage_rate"] >= 6) power = 2 -/datum/symptom/heal/toxin/CanHeal(datum/disease/advance/A) +/datum/symptom/heal/starlight/CanHeal(datum/disease/advance/A) var/mob/living/M = A.affected_mob if(istype(get_turf(M), /turf/open/space)) return power @@ -75,15 +74,25 @@ if(istype(T, /turf/open/space)) return power * nearspace_penalty -/datum/symptom/heal/toxin/Heal(mob/living/M, datum/disease/advance/A, actual_power) +/datum/symptom/heal/starlight/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = actual_power if(M.getToxLoss() && prob(5)) - to_chat(M, "Your skin tingles as the starlight purges toxins from your bloodstream.") - M.adjustToxLoss(-heal_amt) + to_chat(M, "Your skin tingles as the starlight seems to heal you.") + + M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins + + var/list/parts = M.get_damaged_bodyparts(1,1) + + if(!parts.len) + return + + for(var/obj/item/bodypart/L in parts) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len)) + M.update_damage_overlays() return 1 -/datum/symptom/heal/toxin/passive_message_condition(mob/living/M) - if(M.getToxLoss()) +/datum/symptom/heal/starlight/passive_message_condition(mob/living/M) + if(M.getBruteLoss() || M.getFireLoss() || M.getToxLoss()) return TRUE return FALSE @@ -91,7 +100,7 @@ name = "Toxolysis" stealth = 0 resistance = -2 - stage_speed = -2 + stage_speed = 2 transmittable = -2 level = 7 var/food_conversion = FALSE @@ -153,58 +162,50 @@ to_chat(C, "You feel an odd gurgle in your stomach, as if it was working much faster than normal.") return 1 -/datum/symptom/heal/brute - name = "Cellular Molding" - desc = "The virus is able to shift cells around when in conditions of high heat, repairing existing physical damage." - stealth = 1 - resistance = -3 - stage_speed = -3 - transmittable = -3 +/datum/symptom/heal/darkness + name = "Nocturnal Regeneration" + desc = "The virus is able to mend the host's flesh when in conditions of low light, repairing physical damage. More effective against brute damage." + stealth = 2 + resistance = -1 + stage_speed = -2 + transmittable = -1 level = 6 - passive_message = "You feel the flesh pulsing under your skin for a moment, but it's too cold to move." + passive_message = "You feel tingling on your skin as light passes over it." threshold_desc = "Stage Speed 8: Doubles healing speed." -/datum/symptom/heal/brute/Start(datum/disease/advance/A) +/datum/symptom/heal/darkness/Start(datum/disease/advance/A) if(!..()) return if(A.properties["stage_rate"] >= 8) power = 2 -/datum/symptom/heal/brute/CanHeal(datum/disease/advance/A) +/datum/symptom/heal/darkness/CanHeal(datum/disease/advance/A) var/mob/living/M = A.affected_mob - switch(M.bodytemperature) - if(0 to 340) - return FALSE - if(340 to BODYTEMP_HEAT_DAMAGE_LIMIT) - . = 0.3 * power - if(BODYTEMP_HEAT_DAMAGE_LIMIT to 400) - . = 0.75 * power - if(400 to 460) - . = power - else - . = 1.5 * power + var/light_amount = 0 + if(isturf(M.loc)) //else, there's considered to be no light + var/turf/T = M.loc + light_amount = min(1,T.get_lumcount()) - 0.5 + if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) + return power - if(M.on_fire) - . *= 2 - -/datum/symptom/heal/brute/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) +/datum/symptom/heal/darkness/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = 2 * actual_power - var/list/parts = M.get_damaged_bodyparts(1,0) //brute only + var/list/parts = M.get_damaged_bodyparts(1,1) if(!parts.len) return if(prob(5)) - to_chat(M, "You feel your flesh moving beneath your heated skin, mending your wounds.") + to_chat(M, "The darkness soothes and mends your wounds.") for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(heal_amt/parts.len, 0)) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5)) //more effective on brute M.update_damage_overlays() return 1 -/datum/symptom/heal/brute/passive_message_condition(mob/living/M) - if(M.getBruteLoss()) +/datum/symptom/heal/darkness/passive_message_condition(mob/living/M) + if(M.getBruteLoss() || M.getFireLoss()) return TRUE return FALSE @@ -212,8 +213,8 @@ name = "Regenerative Coma" desc = "The virus causes the host to fall into a death-like coma when severely damaged, then rapidly fixes the damage." stealth = 0 - resistance = 0 - stage_speed = -2 + resistance = 2 + stage_speed = -3 transmittable = -2 level = 8 passive_message = "The pain from your wounds makes you feel oddly sleepy..." @@ -283,20 +284,20 @@ return TRUE return FALSE -/datum/symptom/heal/burn +/datum/symptom/heal/water name = "Tissue Hydration" - desc = "The virus uses excess water inside and outside the body to repair burned tisue cells." - stealth = 1 - resistance = -3 - stage_speed = -3 - transmittable = -3 + desc = "The virus uses excess water inside and outside the body to repair damaged tissue cells. More effective against burns." + stealth = 0 + resistance = -1 + stage_speed = 0 + transmittable = 1 level = 6 - passive_message = "Your burned skin feels oddly dry..." + passive_message = "Your skin feels oddly dry..." var/absorption_coeff = 1 threshold_desc = "Resistance 5: Water is consumed at a much slower rate.
    \ Stage Speed 7: Increases healing speed." -/datum/symptom/heal/burn/Start(datum/disease/advance/A) +/datum/symptom/heal/water/Start(datum/disease/advance/A) if(!..()) return if(A.properties["stage_rate"] >= 7) @@ -304,7 +305,7 @@ if(A.properties["stealth"] >= 2) absorption_coeff = 0.25 -/datum/symptom/heal/burn/CanHeal(datum/disease/advance/A) +/datum/symptom/heal/water/CanHeal(datum/disease/advance/A) . = 0 var/mob/living/M = A.affected_mob if(M.fire_stacks < 0) @@ -317,33 +318,33 @@ M.reagents.remove_reagent("water", 0.5 * absorption_coeff) . += power * 0.5 -/datum/symptom/heal/burn/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) +/datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = 2 * actual_power - var/list/parts = M.get_damaged_bodyparts(0,1) //burn only + var/list/parts = M.get_damaged_bodyparts(1,1) //more effective on burns if(!parts.len) return if(prob(5)) - to_chat(M, "You feel yourself absorbing the water around you to soothe your burned skin.") + to_chat(M, "You feel yourself absorbing the water around you to soothe your damaged skin.") for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(0, heal_amt/parts.len)) + if(L.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len)) M.update_damage_overlays() return 1 -/datum/symptom/heal/burn/passive_message_condition(mob/living/M) - if(M.getFireLoss()) +/datum/symptom/heal/water/passive_message_condition(mob/living/M) + if(M.getBruteLoss() || M.getFireLoss()) return TRUE return FALSE /datum/symptom/heal/plasma name = "Plasma Fixation" - desc = "The virus draws plasma from the atmosphere and from inside the body to stabilize body temperature and heal burns." + desc = "The virus draws plasma from the atmosphere and from inside the body to heal and stabilize body temperature." stealth = 0 - resistance = 0 + resistance = 3 stage_speed = -2 transmittable = -2 level = 8 @@ -379,8 +380,6 @@ /datum/symptom/heal/plasma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = 4 * actual_power - var/list/parts = M.get_damaged_bodyparts(0,1) //burn only - if(prob(5)) to_chat(M, "You feel yourself absorbing plasma inside and around you...") @@ -393,24 +392,25 @@ if(prob(5)) to_chat(M, "You feel warmer.") + M.adjustToxLoss(-heal_amt) + + var/list/parts = M.get_damaged_bodyparts(1,1) if(!parts.len) return if(prob(5)) - to_chat(M, "The pain from your burns fades rapidly.") - + to_chat(M, "The pain from your wounds fades rapidly.") for(var/obj/item/bodypart/L in parts) - if(L.heal_damage(0, heal_amt/parts.len)) + if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len)) M.update_damage_overlays() return 1 - /datum/symptom/heal/radiation name = "Radioactive Resonance" desc = "The virus uses radiation to fix damage through dna mutations." stealth = -1 resistance = -2 - stage_speed = 0 + stage_speed = 2 transmittable = -3 level = 6 symptom_delay_min = 1 @@ -450,6 +450,8 @@ if(cellular_damage) M.adjustCloneLoss(-heal_amt * 0.5) + M.adjustToxLoss(-(2 * heal_amt)) + var/list/parts = M.get_damaged_bodyparts(1,1) if(!parts.len) From b45ae2078f24f095bf0c15116d0b0b84dc45123d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 15:58:04 -0600 Subject: [PATCH 115/132] Automatic changelog generation for PR #4543 [ci skip] --- html/changelogs/AutoChangeLog-pr-4543.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4543.yml diff --git a/html/changelogs/AutoChangeLog-pr-4543.yml b/html/changelogs/AutoChangeLog-pr-4543.yml new file mode 100644 index 0000000000..f8e25ac31a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4543.yml @@ -0,0 +1,8 @@ +author: "XDTM" +delete-after: True +changes: + - balance: "Rebalanced healing symptoms." + - balance: "Cellular Molding was replaced by Nocturnal Regeneration, which only works in darkness." + - balance: "All healing symptoms now heal both brute and burn damage, although the basic ones will still be more effective on one damage type." + - balance: "Plasma Fixation and Radioactive Metabolism heal toxin damage, offsetting the damage done by their healing sources." + - balance: "Changed healing symptoms' stats, generally making them less punishing." From 8aed987bd98433f98f34cadfda2be86105861547 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 15:58:16 -0600 Subject: [PATCH 116/132] [MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544) * Fixes emagged cleanbot acid attack doing no damage (#33848) * Fixes emagged cleanbot acid attack doing no damage --- code/modules/mob/living/carbon/monkey/monkey_defense.dm | 4 ++-- code/modules/mob/living/simple_animal/bot/cleanbot.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 96cafa4501..3d7619b6d2 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -160,13 +160,13 @@ if(!bodyzone_hit || bodyzone_hit == "head") if(wear_mask) if(!(wear_mask.resistance_flags & UNACIDABLE)) - wear_mask.acid_act(acidpwr) + wear_mask.acid_act(acidpwr, acid_volume) else to_chat(src, "Your mask protects you from the acid.") return if(head) if(!(head.resistance_flags & UNACIDABLE)) - head.acid_act(acidpwr) + head.acid_act(acidpwr, acid_volume) else to_chat(src, "Your hat protects you from the acid.") return diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index efe289b222..186d0c5a41 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -125,7 +125,7 @@ if(!target) //Search for decals then. target = scan(/obj/effect/decal/cleanable) - + if(!target) //Checks for remains target = scan(/obj/effect/decal/remains) @@ -242,7 +242,7 @@ say(phrase) victim.emote("scream") playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) - victim.acid_act(5, 2, 100) + victim.acid_act(5, 100) else if(A == src) // Wets floors and spawns foam randomly if(prob(75)) var/turf/open/T = loc From 5a515ff24a0108e83a06e3c40314c613efbcb262 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 26 Dec 2017 15:58:19 -0600 Subject: [PATCH 117/132] Automatic changelog generation for PR #4544 [ci skip] --- html/changelogs/AutoChangeLog-pr-4544.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4544.yml diff --git a/html/changelogs/AutoChangeLog-pr-4544.yml b/html/changelogs/AutoChangeLog-pr-4544.yml new file mode 100644 index 0000000000..b2ab500474 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4544.yml @@ -0,0 +1,5 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - bugfix: "Emagged cleanbots can acid people again" + - bugfix: "Headgear worn by monkeys can be affected by acid" From 752e3f73787060e9ee4359d7dbe467a5a29e21ee Mon Sep 17 00:00:00 2001 From: YPOQ <30683121+YPOQ@users.noreply.github.com> Date: Tue, 26 Dec 2017 17:29:20 -0700 Subject: [PATCH 118/132] Fixes AI camera lights not updating when tracking mobs (#33849) --- code/modules/mob/living/silicon/ai/freelook/eye.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 1d2598c63d..b5b1bd082b 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -16,7 +16,6 @@ // It will also stream the chunk that the new loc is in. /mob/camera/aiEye/proc/setLoc(T) - if(ai) if(!isturf(ai.loc)) return @@ -34,6 +33,8 @@ if(istype(ai.current, /obj/machinery/holopad)) var/obj/machinery/holopad/H = ai.current H.move_hologram(ai, T) + if(ai.camera_light_on) + ai.light_cameras() /mob/camera/aiEye/Move() return 0 @@ -85,11 +86,6 @@ if(!user.tracking) user.cameraFollow = null - //user.unset_machine() //Uncomment this if it causes problems. - //user.lightNearbyCamera() - if(user.camera_light_on) - user.light_cameras() - // Return to the Core. /mob/living/silicon/ai/proc/view_core() From 4499ff2fad616b71830aad0dcd3c5b1807746f88 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 26 Dec 2017 19:37:45 -0500 Subject: [PATCH 120/132] Merge pull request #33834 from Xhuis/drone_hats Drones now spawn with seasonal hats depending on active holidays [VERY Important PR] --- .../clock_cult/clock_items/construct_chassis.dm | 10 ++++++++++ code/modules/holiday/holidays.dm | 11 +++++++++++ .../friendly/drone/drones_as_items.dm | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm index 1b2b867aa5..df9fa45b89 100644 --- a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm +++ b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm @@ -83,6 +83,7 @@ construct_type = /mob/living/simple_animal/drone/cogscarab w_class = WEIGHT_CLASS_SMALL var/infinite_resources = TRUE + var/static/obj/item/seasonal_hat //Share it with all other scarabs, since we're from the same cult! /obj/item/clockwork/construct_chassis/cogscarab/Initialize() . = ..() @@ -93,6 +94,12 @@ if(infinite_resources) //During rounds where they can't interact with the station, let them experiment with builds construct_type = /mob/living/simple_animal/drone/cogscarab/ratvar + if(!seasonal_hat) + var/obj/item/drone_shell/D = locate() in GLOB.poi_list + if(D && D.possible_seasonal_hats.len) + seasonal_hat = pick(D.possible_seasonal_hats) + else + seasonal_hat = "none" /obj/item/clockwork/construct_chassis/cogscarab/post_spawn(mob/living/construct) if(infinite_resources) //Allow them to build stuff and recite scripture @@ -101,3 +108,6 @@ F.uses_power = FALSE for(var/obj/item/clockwork/slab/S in cached_stuff) S.no_cost = TRUE + if(seasonal_hat && seasonal_hat != "none") + var/obj/item/hat = new seasonal_hat(construct) + construct.equip_to_slot_or_del(hat, slot_head) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 85605fd2c4..1177e889db 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -9,6 +9,8 @@ var/begin_weekday = FALSE //If set to a weekday, then this will trigger the holiday on the above week var/always_celebrate = FALSE // for christmas neverending, or testing. + var/obj/item/drone_hat //If this is defined, drones without a default hat will spawn with this one during the holiday; check drones_as_items.dm to see this used + // This proc gets run before the game starts when the holiday is activated. Do festive shit here. /datum/holiday/proc/celebrate() return @@ -172,11 +174,13 @@ name = "Labor Day" begin_day = 1 begin_month = MAY + drone_hat = /obj/item/clothing/head/hardhat /datum/holiday/firefighter name = "Firefighter's Day" begin_day = 4 begin_month = MAY + drone_hat = /obj/item/clothing/head/hardhat/red /datum/holiday/firefighter/getStationPrefix() return pick("Burning","Blazing","Plasma","Fire") @@ -190,6 +194,7 @@ name = "Doctor's Day" begin_day = 1 begin_month = JULY + drone_hat = /obj/item/clothing/head/nursehat /datum/holiday/UFO name = "UFO Day" @@ -221,6 +226,7 @@ name = "Talk-Like-a-Pirate Day" begin_day = 19 begin_month = SEPTEMBER + drone_hat = /obj/item/clothing/head/pirate /datum/holiday/pirate/greet() return "Ye be talkin' like a pirate today or else ye'r walkin' tha plank, matey!" @@ -321,6 +327,7 @@ begin_week = 4 begin_month = NOVEMBER begin_weekday = THURSDAY + drone_hat = /obj/item/clothing/head/that //This is the closest we can get to a pilgrim's hat /datum/holiday/thanksgiving/canada name = "Thanksgiving in Canada" @@ -384,12 +391,14 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and name = "Mayan Doomsday Anniversary" begin_day = 21 begin_month = DECEMBER + drone_hat = /obj/item/clothing/mask/rat/tribal /datum/holiday/xmas name = CHRISTMAS begin_day = 22 begin_month = DECEMBER end_day = 27 + drone_hat = /obj/item/clothing/head/santa /datum/holiday/xmas/greet() return "Have a merry Christmas!" @@ -399,6 +408,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and begin_day = 1 begin_month = DECEMBER end_day = 31 + drone_hat = /obj/item/clothing/head/santa /datum/holiday/festive_season/greet() return "Have a nice festive season!" @@ -421,6 +431,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and /datum/holiday/easter name = EASTER + drone_hat = /obj/item/clothing/head/rabbitears var/const/days_early = 1 //to make editing the holiday easier var/const/days_extra = 1 diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index c0a57e3739..20e25e3a18 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -14,6 +14,8 @@ icon = 'icons/mob/drone.dmi' icon_state = "drone_maint_hat"//yes reuse the _hat state. var/drone_type = /mob/living/simple_animal/drone //Type of drone that will be spawned + var/seasonal_hats = TRUE //If TRUE, and there are no default hats, different holidays will grant different hats + var/static/list/possible_seasonal_hats //This is built automatically in build_seasonal_hats() but can also be edited by admins! /obj/item/drone_shell/New() ..() @@ -21,6 +23,17 @@ if(A) notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) GLOB.poi_list |= src + if(isnull(possible_seasonal_hats)) + build_seasonal_hats() + +/obj/item/drone_shell/proc/build_seasonal_hats() + possible_seasonal_hats = list() + if(!SSevents.holidays.len) + return //no holidays, no hats; we'll keep the empty list so we never call this proc again + for(var/V in SSevents.holidays) + var/datum/holiday/holiday = SSevents.holidays[V] + if(holiday.drone_hat) + possible_seasonal_hats += holiday.drone_hat /obj/item/drone_shell/Destroy() GLOB.poi_list -= src @@ -42,6 +55,10 @@ if(be_drone == "No" || QDELETED(src) || !isobserver(user)) return var/mob/living/simple_animal/drone/D = new drone_type(get_turf(loc)) + if(!D.default_hatmask && seasonal_hats && possible_seasonal_hats.len) + var/hat_type = pick(possible_seasonal_hats) + var/obj/item/new_hat = new hat_type(D) + D.equip_to_slot_or_del(new_hat, slot_head) D.admin_spawned = admin_spawned D.key = user.key qdel(src) From b0facbda47617221aaaac64dd4cf61b6f211dc28 Mon Sep 17 00:00:00 2001 From: Cruix Date: Tue, 26 Dec 2017 23:43:23 -0600 Subject: [PATCH 122/132] Fixed shuttle docking computers not working more than once (#33782) * Fixed shuttle docking computers not moving the docking port if it already existed * Removed explicit type instantiation --- code/modules/shuttle/navigation_computer.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index de1b0022f6..263901a763 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -119,7 +119,7 @@ return if(!my_port) - my_port = new(locate(eyeobj.x - x_offset, eyeobj.y - y_offset, eyeobj.z)) + my_port = new() my_port.name = shuttlePortName my_port.id = shuttlePortId my_port.height = shuttle_port.height @@ -128,6 +128,7 @@ my_port.dwidth = shuttle_port.dwidth my_port.hidden = shuttle_port.hidden my_port.dir = the_eye.dir + my_port.forceMove(locate(eyeobj.x - x_offset, eyeobj.y - y_offset, eyeobj.z)) if(current_user.client) current_user.client.images -= the_eye.placed_images From 76ccdcb94d004c1ed59295f1cdaf14ff1bb08c23 Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 27 Dec 2017 19:04:27 +1300 Subject: [PATCH 124/132] Merge pull request #33770 from vuonojenmustaturska/internalmagfix adds ABSTRACT_1 flag to internal magazine objects --- code/modules/projectiles/boxes_magazines/internal_mag.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/boxes_magazines/internal_mag.dm b/code/modules/projectiles/boxes_magazines/internal_mag.dm index f486be732d..07ce388abb 100644 --- a/code/modules/projectiles/boxes_magazines/internal_mag.dm +++ b/code/modules/projectiles/boxes_magazines/internal_mag.dm @@ -2,6 +2,7 @@ /obj/item/ammo_box/magazine/internal desc = "Oh god, this shouldn't be here" + flags_1 = CONDUCT_1|ABSTRACT_1 //internals magazines are accessible, so replace spent ammo if full when trying to put a live one in /obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R) From e87c5919272a5bc56e8fda723ad9349b5ee374a6 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Tue, 26 Dec 2017 22:04:52 -0800 Subject: [PATCH 126/132] Maybe make R&D console icons load faster (#33749) * Maybe make design icons load faster * Move design icon generation to asset_cache file --- code/modules/client/asset_cache.dm | 36 ++++++++++++++++++++++++++++++ code/modules/research/designs.dm | 36 ++---------------------------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 3704494050..28875e3dc2 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -372,3 +372,39 @@ GLOBAL_LIST_EMPTY(asset_datums) var/meter = icon('icons/obj/atmospherics/pipes/simple.dmi', "meterX", SOUTH, frame, movement_states) if(meter) register_asset(sanitize_filename("[prefix].south.meterX.png"), fcopy_rsc(meter)) + +// Representative icons for each research design +/datum/asset/simple/research_designs/register() + for (var/path in subtypesof(/datum/design)) + var/datum/design/D = path + + // construct the icon and slap it into the resource cache + var/atom/item = initial(D.build_path) + if (!ispath(item, /atom)) + // biogenerator outputs to beakers by default + if (initial(D.build_type) & BIOGENERATOR) + item = /obj/item/reagent_containers/glass/beaker/large + else + continue // shouldn't happen, but just in case + + // circuit boards become their resulting machines or computers + if (ispath(item, /obj/item/circuitboard)) + var/obj/item/circuitboard/C = item + var/machine = initial(C.build_path) + if (machine) + item = machine + var/icon_file = initial(item.icon) + var/icon/I = icon(icon_file, initial(item.icon_state), SOUTH) + + // computers (and snowflakes) get their screen and keyboard sprites + if (ispath(item, /obj/machinery/computer) || ispath(item, /obj/machinery/power/solar_control)) + var/obj/machinery/computer/C = item + var/screen = initial(C.icon_screen) + var/keyboard = initial(C.icon_keyboard) + if (screen) + I.Blend(icon(icon_file, screen, SOUTH), ICON_OVERLAY) + if (keyboard) + I.Blend(icon(icon_file, keyboard, SOUTH), ICON_OVERLAY) + + assets["design_[initial(D.id)].png"] = I + return ..() diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 0af1650d42..b3b0f8df99 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -51,40 +51,8 @@ other types of metals and chemistry for reagents). return ..() /datum/design/proc/icon_html(client/user) - if (!icon_cache) - // construct the icon and slap it into the resource cache - var/atom/item = build_path - if (!ispath(item, /atom)) - // biogenerator outputs to beakers by default - if (build_type & BIOGENERATOR) - item = /obj/item/reagent_containers/glass/beaker/large - else - return // shouldn't happen, but just in case - - // circuit boards become their resulting machines or computers - if (ispath(item, /obj/item/circuitboard)) - var/obj/item/circuitboard/C = item - var/machine = initial(C.build_path) - if (machine) - item = machine - var/icon_file = initial(item.icon) - var/icon/I = icon(icon_file, initial(item.icon_state), SOUTH) - - // computers (and snowflakes) get their screen and keyboard sprites - if (ispath(item, /obj/machinery/computer) || ispath(item, /obj/machinery/power/solar_control)) - var/obj/machinery/computer/C = item - var/screen = initial(C.icon_screen) - var/keyboard = initial(C.icon_keyboard) - if (screen) - I.Blend(icon(icon_file, screen, SOUTH), ICON_OVERLAY) - if (keyboard) - I.Blend(icon(icon_file, keyboard, SOUTH), ICON_OVERLAY) - - // based on icon2html - icon_cache = "[generate_asset_name(I)].png" - register_asset(icon_cache, I) - send_asset(user, icon_cache, FALSE) - return "" + send_asset(user, "design_[id].png", FALSE) + return "" //////////////////////////////////////// //Disks for transporting design datums// From 4825bbd4b190fb17a2f63705e2c75da492ac5382 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 27 Dec 2017 03:01:49 -0600 Subject: [PATCH 128/132] Automatic changelog generation for PR #4542 [ci skip] --- html/changelogs/AutoChangeLog-pr-4542.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4542.yml diff --git a/html/changelogs/AutoChangeLog-pr-4542.yml b/html/changelogs/AutoChangeLog-pr-4542.yml new file mode 100644 index 0000000000..f0edae6b07 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4542.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - admin: "Play Internet Sound now has an option to show the song title to players." From 1542f1dda8396e556201d4611d3bf5a6bc0b6e8a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 27 Dec 2017 03:03:18 -0600 Subject: [PATCH 129/132] Automatic changelog generation for PR #4546 [ci skip] --- html/changelogs/AutoChangeLog-pr-4546.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4546.yml diff --git a/html/changelogs/AutoChangeLog-pr-4546.yml b/html/changelogs/AutoChangeLog-pr-4546.yml new file mode 100644 index 0000000000..6a34ac9447 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4546.yml @@ -0,0 +1,4 @@ +author: "Xhuis" +delete-after: True +changes: + - rscadd: "Maintenance drones and cogscarabs can now spawn with holiday-related hats on some holidays!" From d70c0ea265a7e9705b447c0a9d8ece78a9e07a67 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 27 Dec 2017 03:04:44 -0600 Subject: [PATCH 130/132] Automatic changelog generation for PR #4551 [ci skip] --- html/changelogs/AutoChangeLog-pr-4551.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4551.yml diff --git a/html/changelogs/AutoChangeLog-pr-4551.yml b/html/changelogs/AutoChangeLog-pr-4551.yml new file mode 100644 index 0000000000..e1aa612d9d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4551.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - code_imp: "The R&D console has been made more responsive by tweaking how design icons are loaded." From b8af7773e56db4ef9cf33c96901aaf89abd8968a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 27 Dec 2017 03:05:23 -0600 Subject: [PATCH 131/132] Automatic changelog generation for PR #4536 [ci skip] --- html/changelogs/AutoChangeLog-pr-4536.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4536.yml diff --git a/html/changelogs/AutoChangeLog-pr-4536.yml b/html/changelogs/AutoChangeLog-pr-4536.yml new file mode 100644 index 0000000000..66d81c0738 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4536.yml @@ -0,0 +1,4 @@ +author: "PsyKzz" +delete-after: True +changes: + - rscadd: "Jaws of life can now cut handcuffs" From a5923374abfa7d454ac1e941b981516a3bebb7e0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 27 Dec 2017 03:05:51 -0600 Subject: [PATCH 132/132] Automatic changelog generation for PR #4534 [ci skip] --- html/changelogs/AutoChangeLog-pr-4534.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4534.yml diff --git a/html/changelogs/AutoChangeLog-pr-4534.yml b/html/changelogs/AutoChangeLog-pr-4534.yml new file mode 100644 index 0000000000..a699579ab8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4534.yml @@ -0,0 +1,4 @@ +author: "ninjanomnom" +delete-after: True +changes: + - bugfix: "The auxiliary mining base can no longer be placed on top of lava, indestructible turfs, or inside particularly large ruins."