") + text = replacetext(text, "\[small\]", "") + text = replacetext(text, "\[/small\]", "") + text = replacetext(text, "\[list\]", "
- ")
+ text = replacetext(text, "\[/list\]", "
")
+
+ text = "[text]"
+
+ text = copytext(text, 1, MAX_PAPER_MESSAGE_LEN)
+ return text
+
+/proc/html_to_pencode(text)
+ text = replacetext(text, "", "\n") + text = replacetext(text, "
", "\[br\]") + text = replacetext(text, "", "\[b\]") + text = replacetext(text, "", "\[/b\]") + text = replacetext(text, "", "\[i\]") + text = replacetext(text, "", "\[/i\]") + text = replacetext(text, "", "\[u\]") + text = replacetext(text, "", "\[/u\]") + text = replacetext(text, "", "\[large\]") + text = replacetext(text, "", "\[field\]") + + text = replacetext(text, "
", "\[h1\]") + text = replacetext(text, "
", "\[/h1\]") + text = replacetext(text, "", "\[h2\]") + text = replacetext(text, "
", "\[/h2\]") + text = replacetext(text, "", "\[h3\]") + text = replacetext(text, "
", "\[/h3\]") + + text = replacetext(text, "", "\[hr\]") + text = replacetext(text, "", "\[small\]") + text = replacetext(text, "
- ", "\[list\]")
+ text = replacetext(text, "
", "\[logo\]")
+ return text
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 713289c737c..c139b969df1 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -46,4 +46,20 @@ var/list/TAGGERLOCATIONS = list("Disposals",
"Robotics", "HoP Office", "Library", "Chapel", "Captain's Office",
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics","Brig Physician")
-var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")
\ No newline at end of file
+var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")
+
+var/global/list/greek_letters = list("Alpha", "Beta", "Gamma", "Delta",
+ "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu",
+ "Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
+ "Chi", "Psi", "Omega")
+
+var/global/list/phonetic_alphabet = list("Alpha", "Bravo", "Charlie",
+ "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet",
+ "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec",
+ "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray",
+ "Yankee", "Zulu")
+
+var/global/list/numbers_as_words = list("One", "Two", "Three", "Four",
+ "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve",
+ "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen",
+ "Eighteen", "Nineteen")
\ No newline at end of file
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 8018fae5681..41588a7b07a 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -23,6 +23,7 @@ var/global/list/rcd_list = list() //list of Rapid Construction Devices.
var/global/list/apcs = list()
var/global/list/air_alarms = list()
var/global/list/power_monitors = list()
+var/global/list/all_vent_pumps = list()
var/global/list/navbeacons = list() //list of all bot nagivation beacons, used for patrolling.
var/global/list/deliverybeacons = list() //list of all MULEbot delivery beacons.
@@ -34,8 +35,9 @@ var/global/list/tracked_implants = list() //list of all current implants that
var/global/list/pinpointer_list = list() //list of all pinpointers. Used to change stuff they are pointing to all at once.
var/global/list/abductor_equipment = list() //list of all abductor equipment
-
var/global/list/global_intercoms = list() //list of all intercomms, across all z-levels
var/global/list/global_radios = list() //list of all radios, across all z-levels
-var/global/list/poi_list = list() //list of points of interest for observe/follow
\ No newline at end of file
+var/global/list/meteor_list = list() //list of all meteors
+var/global/list/poi_list = list() //list of points of interest for observe/follow
+
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 46368def984..4c9f57d4e4e 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -161,13 +161,13 @@
for(var/mob/O in viewers(messagesource, null))
if(attack_verb.len)
- O.show_message("[M] has been [pick(attack_verb)] with [src][showname] ", 1)
+ O.show_message("[M] has been [pick(attack_verb)] with [src][showname] ", 1)
else
- O.show_message("[M] has been attacked with [src][showname] ", 1)
+ O.show_message("[M] has been attacked with [src][showname] ", 1)
if(!showname && user)
if(user.client)
- to_chat(user, "You attack [M] with [src]. ")
+ to_chat(user, "You attack [M] with [src]. ")
diff --git a/code/controllers/Processes/lighting.dm b/code/controllers/Processes/lighting.dm
index 15b134ecf44..d92fe8a36b1 100644
--- a/code/controllers/Processes/lighting.dm
+++ b/code/controllers/Processes/lighting.dm
@@ -86,6 +86,18 @@
overlay_updates++
SCHECK
+
+
+
+/datum/controller/process/lighting/statProcess()
+ ..()
+ stat(null, "[all_lighting_sources.len] light sources exist")
+ stat(null, "[all_lighting_corners.len] light corners exist")
+ stat(null, "[global.all_lighting_overlays.len] light overlays exist")
+ stat(null, "[lighting_update_lights.len] lighting sources queued")
+ stat(null, "[lighting_update_corners.len] lighting corners queued")
+ stat(null, "[lighting_update_overlays.len] lighting overlays queued")
+
#undef MAX_LIGHT_UPDATES_PER_WORK
#undef MAX_CORNER_UPDATES_PER_WORK
#undef MAX_OVERLAY_UPDATES_PER_WORK
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 5e1701aacb8..251494d9f89 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -38,7 +38,7 @@
var/continuous_rounds = 0 // Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
var/allow_Metadata = 0 // Metadata is supported.
var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
- var/Ticklag = 0.9
+ var/Ticklag = 0.5
var/Tickcomp = 0
var/socket_talk = 0 // use socket_talk to communicate with other processes
var/list/resource_urls = null
@@ -575,10 +575,10 @@
if("round_abandon_penalty_period")
config.round_abandon_penalty_period = MinutesToTicks(text2num(value))
-
+
if("medal_hub_address")
global.medal_hub = value
-
+
if("medal_hub_password")
global.medal_pass = value
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 1b48dd37560..7a8c802b42d 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -15,7 +15,6 @@
var/static_beam = 0
var/beam_type = /obj/effect/ebeam //must be subtype
-
/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam)
endtime = world.time+time
origin = beam_origin
@@ -30,7 +29,6 @@
icon_state = beam_icon_state
beam_type = btype
-
/datum/beam/proc/Start()
Draw()
while(!finished && origin && target && world.time < endtime && get_dist(origin,target)" intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle.
" intercepttext += "Preliminary analysis of the organism classifies it as a level 5 biohazard. Its origin is unknown.
" @@ -26,6 +27,7 @@ if(is_station_level(bomb.z)) bomb.r_code = nukecode + interceptname = "Classified [command_name()] Update" intercepttext += "Nanotrasen Update: Biohazard Alert.
" intercepttext += "Directive 7-12 has been issued for [station_name()].
" intercepttext += "The biohazard has grown out of control and will soon reach critical mass.
" @@ -41,17 +43,8 @@ aiPlayer.set_zeroth_law(law) to_chat(aiPlayer, "Laws Updated: [law]") - for(var/obj/machinery/computer/communications/comm in world) - comm.messagetitle.Add(interceptname) - comm.messagetext.Add(intercepttext) - if(!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) - var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc ) - playsound(comm.loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) - intercept.name = "Classified Central Command Update" - intercept.info = intercepttext + print_command_report(intercepttext, interceptname) event_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg') - return - /datum/station_state var/floor = 0 diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 166f3f590ac..cfd72f71a7e 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -333,7 +333,7 @@ if(ticker && ticker.mode.name == "blob") var/datum/game_mode/blob/BL = ticker.mode - BL.blobwincount = initial(BL.blobwincount) * 2 + BL.blobwincount += initial(BL.blobwincount) /mob/camera/blob/verb/blob_broadcast() diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index dd15a313701..4b8e002d576 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -11,6 +11,16 @@ to_chat(user, "We cleanse impurities from our form.") + var/mob/living/simple_animal/borer/B = user.has_brain_worms() + if(B) + if(B.controlling) + B.detatch() + B.leave_host() + if(iscarbon(user)) + var/mob/living/carbon/C = user + C.vomit(0) + to_chat(user, "We expel a parasite from our form.") + var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg) if(egg) egg.remove(user) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index cbbe5590475..f7bdc478466 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -245,7 +245,7 @@ var/timer = shuttle_master.emergency.timeLeft(1) + cursetime shuttle_master.emergency.setTimer(timer) to_chat(user,"You shatter the orb! A dark essence spirals into the air, then disappears.") - playsound(user.loc, "sound/effects/Glassbr1.ogg", 50, 1) + playsound(user.loc, 'sound/effects/Glassbr1.ogg', 50, 1) qdel(src) sleep(20) var/global/list/curses diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index b2344639c1d..2a9c9851478 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -37,6 +37,8 @@ var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) var/list/player_draft_log = list() var/list/datum/mind/xenos = list() + + var/list/datum/station_goal/station_goals = list() // A list of all station goals for this game mode /datum/game_mode/proc/announce() //to be calles when round starts to_chat(world, "Notice: [src] did not define announce()") @@ -78,6 +80,7 @@ // if(revdata) // feedback_set_details("revision","[revdata.revision]") feedback_set_details("server_ip","[world.internet_address]:[world.port]") + generate_station_goals() start_state = new /datum/station_state() start_state.count() return 1 @@ -222,7 +225,7 @@ /datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere. return 0 - + /datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=0) var/list/players = list() var/list/candidates = list() @@ -475,3 +478,36 @@ proc/get_nt_opposed() text += "
Objective #[count]: [objective.explanation_text] Fail." count++ return text + +/datum/game_mode/proc/generate_station_goals() + var/list/possible = list() + for(var/T in subtypesof(/datum/station_goal)) + var/datum/station_goal/G = T + if(config_tag in initial(G.gamemode_blacklist)) + continue + possible += T + var/goal_weights = 0 + while(possible.len && goal_weights < STATION_GOAL_BUDGET) + var/datum/station_goal/picked = pick_n_take(possible) + goal_weights += initial(picked.weight) + station_goals += new picked + + if(station_goals.len) + send_station_goals_message() + +/datum/game_mode/proc/send_station_goals_message() + var/message_text = "
"
+ message_text += "[command_name()] Orders
" + message_text += "Special Orders for [station_name()]:
" + + for(var/datum/station_goal/G in station_goals) + G.on_report() + message_text += G.get_report() + message_text += "
" + + print_command_report(message_text, "[command_name()] Orders") + +/datum/game_mode/proc/declare_station_goal_completion() + for(var/V in station_goals) + var/datum/station_goal/G = V + G.print_result() \ No newline at end of file diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 5a3d0599c8c..8067aabe719 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -416,7 +416,6 @@ var/round_start_time = 0 /datum/controller/gameticker/proc/declare_completion() - nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point. //Round statistics report var/datum/station_state/end_state = new /datum/station_state() @@ -471,6 +470,9 @@ var/round_start_time = 0 scoreboard() karmareminder() + // Declare the completion of the station goals + mode.declare_station_goal_completion() + //Ask the event manager to print round end information event_manager.RoundEnd() diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 890cc4e151c..e634a47c590 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -118,11 +118,13 @@ return . /obj/effect/meteor/Destroy() + meteor_list -= src walk(src,0) //this cancels the walk_towards() proc return ..() /obj/effect/meteor/New() ..() + meteor_list += src SpinAnimation() /obj/effect/meteor/Bump(atom/A) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 56c52797c0d..16f7a4e0847 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -4,33 +4,33 @@ /mob/living/captive_brain/say(var/message) - if(src.client) + if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, "\red You cannot speak in IC (muted).") return - if(src.client.handle_spam_prevention(message,MUTE_IC)) + if(client.handle_spam_prevention(message,MUTE_IC)) return - if(istype(src.loc,/mob/living/simple_animal/borer)) + if(istype(loc,/mob/living/simple_animal/borer)) message = trim(sanitize(copytext(message, 1, MAX_MESSAGE_LEN))) if(!message) return log_say("[key_name(src)] : [message]") if(stat == DEAD) return say_dead(message) - var/mob/living/simple_animal/borer/B = src.loc + var/mob/living/simple_animal/borer/B = loc to_chat(src, "You whisper silently, \"[message]\"") - to_chat(B.host, "The captive mind of [src] whispers, \"[message]\"") + to_chat(B.host, "The captive mind of [src] whispers, \"[message]\"") for(var/mob/M in mob_list) - if(M.mind && (istype(M, /mob/dead/observer))) + if(M.mind && isobserver(M)) to_chat(M, "Thought-speech, [src] -> [B.truename]: [message]") /mob/living/captive_brain/say_understands(var/mob/other, var/datum/language/speaking = null) - var/mob/living/simple_animal/borer/B = src.loc + var/mob/living/simple_animal/borer/B = loc if(!istype(B)) log_runtime(EXCEPTION("Trapped mind found without a borer!"), src) - return 0 + return FALSE return B.host.say_understands(other, speaking) /mob/living/captive_brain/emote(var/message) @@ -42,20 +42,18 @@ to_chat(src, "You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") to_chat(B.host, "You feel the captive mind of [src] begin to resist your control.") - spawn(rand(350,450) + B.host.brainloss) + var/delay = (rand(350,450) + B.host.brainloss) + addtimer(src, "return_control", delay) - if(!B || !B.controlling) - return +/mob/living/captive_brain/proc/return_control(mob/living/simple_animal/borer/B) + if(!B || !B.controlling) + return - B.host.adjustBrainLoss(rand(5,10)) - to_chat(src, "With an immense exertion of will, you regain control of your body!") - to_chat(B.host, "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") + B.host.adjustBrainLoss(rand(5,10)) + to_chat(src, "With an immense exertion of will, you regain control of your body!") + to_chat(B.host, "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") - B.detatch() - - verbs -= /mob/living/carbon/proc/release_control - verbs -= /mob/living/carbon/proc/punish_host - verbs -= /mob/living/carbon/proc/spawn_larvae + B.detatch() /mob/living/simple_animal/borer name = "cortical borer" @@ -78,20 +76,83 @@ wander = 0 mob_size = MOB_SIZE_TINY density = 0 - pass_flags = PASSTABLE + pass_flags = PASSTABLE | PASSMOB + mob_size = MOB_SIZE_SMALL + faction = list("creature") ventcrawler = 2 atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - - var/talk_inside_host = 0 // So that borers don't accidentally give themselves away on a botched message + minbodytemp = 0 + maxbodytemp = 1500 + var/generation = 1 + var/static/list/borer_names = list( + "Primary", "Secondary", "Tertiary", "Quaternary", "Quinary", "Senary", + "Septenary", "Octonary", "Novenary", "Decenary", "Undenary", "Duodenary", + ) + var/talk_inside_host = FALSE // So that borers don't accidentally give themselves away on a botched message var/used_dominate - var/chemicals = 10 // Chemicals used for reproduction and chemical injection. - var/max_chems = 250 // How many chemicals that can be stored in total - var/mob/living/carbon/human/host // Human host for the brain worm. - var/truename // Name used for brainworm-speak. - var/mob/living/captive_brain/host_brain // Used for swapping control of the body back and forth. - var/controlling // Used in human death check. - var/docile = 0 // Sugar can stop borers from acting. - var/list/borer_injection_chems = list("mannitol","salglu_solution","methamphetamine", "hydrocodone", "spaceacillin", "mitocholide", "charcoal", "salbutamol", "capulettium_plus") + var/chemicals = 10 // Chemicals used for reproduction and chemical injection. + var/max_chems = 250 + var/mob/living/carbon/human/host // Human host for the brain worm. + var/truename // Name used for brainworm-speak. + var/mob/living/captive_brain/host_brain // Used for swapping control of the body back and forth. + var/controlling // Used in human death check. + var/docile = FALSE // Sugar can stop borers from acting. + var/bonding = FALSE + var/leaving = FALSE + var/hiding = FALSE + var/datum/action/innate/borer/talk_to_host/talk_to_host_action = new + var/datum/action/innate/borer/infest_host/infest_host_action = new + var/datum/action/innate/borer/toggle_hide/toggle_hide_action = new + var/datum/action/innate/borer/talk_to_borer/talk_to_borer_action = new + var/datum/action/innate/borer/talk_to_brain/talk_to_brain_action = new + var/datum/action/innate/borer/take_control/take_control_action = new + var/datum/action/innate/borer/give_back_control/give_back_control_action = new + var/datum/action/innate/borer/leave_body/leave_body_action = new + var/datum/action/innate/borer/make_chems/make_chems_action = new + var/datum/action/innate/borer/make_larvae/make_larvae_action = new + var/datum/action/innate/borer/freeze_victim/freeze_victim_action = new + var/datum/action/innate/borer/torment/torment_action = new + +/mob/living/simple_animal/borer/New(atom/newloc, var/gen=1) + ..(newloc) + generation = gen + add_language("Cortical Link") + notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) + real_name = "Cortical Borer [rand(1000,9999)]" + truename = "[borer_names[min(generation, borer_names.len)]] [rand(1000,9999)]" + GrantBorerActions() + +/mob/living/simple_animal/borer/attack_ghost(mob/user) + if(jobban_isbanned(user, "Syndicate")) + return + if(key) + return + if(stat != CONSCIOUS) + return + var/be_borer = alert("Become a cortical borer? (Warning, You can no longer be cloned!)",,"Yes","No") + if(be_borer == "No" || !src || qdeleted(src)) + return + if(key) + return + transfer_personality(user.client) + +/mob/living/simple_animal/borer/Stat() + ..() + statpanel("Status") + + show_stat_emergency_shuttle_eta() + + if(client.statpanel == "Status") + stat("Chemicals", chemicals) + +/mob/living/simple_animal/borer/say(message) + var/datum/language/dialect = parse_language(message) + if(!dialect) + dialect = get_default_language() + if(!istype(dialect, /datum/language/corticalborer) && loc == host && !talk_inside_host) + to_chat(src, "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications.") + return + ..() /mob/living/simple_animal/borer/verb/Communicate() set category = "Borer" @@ -107,18 +168,20 @@ return var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", "") - if(!input) return + if(!input) + return - - var/say_string = (docile) ? "slurs" :"states" - if(host) - to_chat(host, "[src.truename] [say_string]: [input]") - log_say("Borer Communication: [key_name(src)] -> [key_name(host)] : [input]") - for(var/M in dead_mob_list) - if(istype(M, /mob/dead/observer)) - to_chat(M, "Borer Communication from [src.truename] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[src.truename] [say_string]: [input]") - host.verbs += /mob/living/proc/borer_comm + if(src && !qdeleted(src) && !qdeleted(host)) + var/say_string = (docile) ? "slurs" :"states" + if(host) + to_chat(host, "[truename] [say_string]: [input]") + log_say("Borer Communication: [key_name(src)] -> [key_name(host)] : [input]") + for(var/M in dead_mob_list) + if(isobserver(M)) + to_chat(M, "Borer Communication from [truename] ([ghost_follow_link(src, ghost=M)]): [input]") + to_chat(src, "[truename] [say_string]: [input]") + host.verbs += /mob/living/proc/borer_comm + talk_to_borer_action.Grant(host) /mob/living/simple_animal/borer/verb/toggle_silence_inside_host() set name = "Toggle speech inside Host" @@ -126,10 +189,10 @@ set desc = "Toggle whether you will be able to say audible messages while inside your host." if(talk_inside_host) - talk_inside_host = 0 + talk_inside_host = FALSE to_chat(src, "You will no longer talk audibly while inside a host.") else - talk_inside_host = 1 + talk_inside_host = TRUE to_chat(src, "You will now be able to audibly speak from inside of a host.") /mob/living/proc/borer_comm() @@ -138,18 +201,19 @@ set desc = "Communicate mentally with your borer." - var/mob/living/simple_animal/borer/B = src.has_brain_worms() + var/mob/living/simple_animal/borer/B = has_brain_worms() if(!B) return var/input = stripped_input(src, "Please enter a message to tell the borer.", "Message", "") - if(!input) return + if(!input) + return to_chat(B, "[src] says: [input]") log_say("Borer Communication: [key_name(src)] -> [key_name(B)] : [input]") for(var/M in dead_mob_list) - if(istype(M, /mob/dead/observer)) + if(isobserver(M)) to_chat(M, "Borer Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") to_chat(src, "[src] says: [input]") @@ -159,18 +223,19 @@ set desc = "Communicate mentally with the trapped mind of your host." - var/mob/living/simple_animal/borer/B = src.has_brain_worms() + var/mob/living/simple_animal/borer/B = has_brain_worms() if(!B || !B.host_brain) return var/mob/living/captive_brain/CB = B.host_brain var/input = stripped_input(src, "Please enter a message to tell the trapped mind.", "Message", "") - if(!input) return + if(!input) + return to_chat(CB, "[B.truename] says: [input]") log_say("Borer Communication: [key_name(B)] -> [key_name(CB)] : [input]") for(var/M in dead_mob_list) - if(istype(M, /mob/dead/observer)) + if(isobserver(M)) to_chat(M, "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]") to_chat(src, "[B.truename] says: [input]") @@ -188,14 +253,14 @@ to_chat(host, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") else to_chat(src, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") - docile = 1 + docile = TRUE else if(docile) if(controlling) to_chat(host, "\blue You shake off your lethargy as the sugar leaves your host's blood.") else to_chat(src, "\blue You shake off your lethargy as the sugar leaves your host's blood.") - docile = 0 + docile = FALSE if(chemicals < max_chems) chemicals++ @@ -218,36 +283,193 @@ else return ..() -/mob/living/simple_animal/borer/New(var/by_gamemode=0) +/mob/living/simple_animal/borer/UnarmedAttack(mob/living/M) + chemscan(usr, M) + return + +/mob/living/simple_animal/borer/verb/infest() + set category = "Borer" + set name = "Infest" + set desc = "Infest a suitable humanoid host." + + if(host) + to_chat(src, "You are already within a host.") + return + + if(stat) + to_chat(src, "You cannot infest a target in your current state.") + return + + var/list/choices = list() + for(var/mob/living/carbon/human/H in view(1,src)) + var/obj/item/organ/external/head/head = H.get_organ("head") + if(head.status & ORGAN_ROBOT) + continue + if(H.stat != DEAD && Adjacent(H) && !H.has_brain_worms()) + choices += H + + var/mob/living/carbon/human/M = input(src,"Who do you wish to infest?") in null|choices + + if(!M || !src) + return + + if(!Adjacent(M)) + return + + if(M.has_brain_worms()) + to_chat(src, "You cannot infest someone who is already infested!") + return + + to_chat(src, "You slither up [M] and begin probing at their ear canal...") + + if(!do_after(src,50, target = M)) + to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.") + return + + if(!M || !src) + return + + if(stat) + to_chat(src, "You cannot infest a target in your current state.") + return + + if(M.stat == DEAD) + to_chat(src, "That is not an appropriate target.") + return + + if(M in view(1, src)) + to_chat(src, "You wiggle into [M]'s ear.") + /* + if(!M.stat) + to_chat(M, "Something disgusting and slimy wiggles into your ear!") + */ // Let's see how stealthborers work out + + perform_infestation(M) + + return + else + to_chat(src, "They are no longer in range!") + return + +/mob/living/simple_animal/borer/proc/perform_infestation(var/mob/living/carbon/M) + if(!M) + return + + if(M.has_brain_worms()) + to_chat(src, "[M] is already infested!") + return + host = M + forceMove(M) + + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/obj/item/organ/external/head = H.get_organ("head") + head.implants += src + + host.status_flags |= PASSEMOTES + + RemoveBorerActions() + GrantInfestActions() + +/mob/living/simple_animal/borer/verb/secrete_chemicals() + set category = "Borer" + set name = "Secrete Chemicals" + set desc = "Push some chemicals into your host's bloodstream." + + if(!host) + to_chat(src, "You are not inside a host body.") + return + + if(stat) + to_chat(src, "You cannot secrete chemicals in your current state.") + + if(docile) + to_chat(src, " You are feeling far too docile to do that.") + return + + var content = "" + + content += "
| [R.name] ([initial(C.chemuse)]) [initial(C.chemdesc)] |
+ [content]
+
"}
+ return html
\ No newline at end of file
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
index d93bc601f89..7a16ef17857 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
@@ -1,26 +1,14 @@
/datum/event/spawn_swarmer
- //name = "Sawrmer Spawn"
- //one_shot = 1
startWhen = 3 //30 minutes
announceWhen = 10
-
/datum/event/spawn_swarmer/announce()
if(prob(25)) //25% chance to announce it to the crew
var/swarmer_report = "[command_name()] High-Priority Update"
swarmer_report += "Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come \ through." - for(var/obj/machinery/computer/communications/C in machines) - if(! (C.stat & (BROKEN|NOPOWER) ) ) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) - P.name = "'Classified [command_name()] Update'" - P.info = swarmer_report - P.update_icon() - C.messagetitle.Add("Classified [command_name()] Update") - C.messagetext.Add(P.info) - command_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg') - - + print_command_report(swarmer_report, "Classified [command_name()] Update") + event_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg') /datum/event/spawn_swarmer/start() if(find_swarmer()) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 089e91cdbec..5ce318bf273 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -1,5 +1,5 @@ #define CHALLENGE_TIME_LIMIT 6000 -#define MIN_CHALLENGE_PLAYERS 50 +#define CHALLENGE_MIN_PLAYERS 50 #define CHALLENGE_SHUTTLE_DELAY 15000 //25 minutes, so the ops have at least 5 minutes before the shuttle is callable. /obj/item/device/nuclear_challenge @@ -9,33 +9,42 @@ desc = "Use to send a declaration of hostilities to the target, delaying your shuttle departure for 20 minutes while they prepare for your assault. \ Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. \ Must be used within five minutes, or your benefactors will lose interest." - var/declaring_war = 0 - - + var/declaring_war = FALSE /obj/item/device/nuclear_challenge/attack_self(mob/living/user) - if(declaring_war) - return - if(player_list.len < MIN_CHALLENGE_PLAYERS) - to_chat(user, "The enemy crew is too small to be worth declaring war on.") - return - if(!is_admin_level(user.z)) - to_chat(user, "You have to be at your base to use this.") + if(!check_allowed(user)) return - if(world.time > CHALLENGE_TIME_LIMIT) - to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.") + declaring_war = TRUE + var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? You have [-round((world.time-round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide.", "Declare war?", "Yes", "No") + declaring_war = FALSE + + if(!check_allowed(user)) return - declaring_war = 1 - var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew?", "Declare war?", "Yes", "No") if(are_you_sure == "No") to_chat(user, "On second thought, the element of surprise isn't so bad after all.") - declaring_war = 0 return var/war_declaration = "[user.real_name] has declared his intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them." + + declaring_war = TRUE + var/custom_threat = alert(user, "Do you want to customize your declaration?", "Customize?", "Yes", "No") + declaring_war = FALSE + + if(!check_allowed(user)) + return + + if(custom_threat == "Yes") + declaring_war = TRUE + war_declaration = stripped_input(user, "Insert your custom declaration", "Declaration") + declaring_war = FALSE + + if(!check_allowed(user) || !war_declaration) + return + event_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg') + to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") for(var/obj/machinery/computer/shuttle/syndicate/S in machines) @@ -47,7 +56,25 @@ config.shuttle_refuel_delay = CHALLENGE_SHUTTLE_DELAY qdel(src) +/obj/item/device/nuclear_challenge/proc/check_allowed(mob/living/user) + if(declaring_war) + to_chat(user, "You are already in the process of declaring war! Make your mind up.") + return FALSE + if(player_list.len < CHALLENGE_MIN_PLAYERS) + to_chat(user, "The enemy crew is too small to be worth declaring war on.") + return FALSE + if(!is_admin_level(user.z)) + to_chat(user, "You have to be at your base to use this.") + return FALSE + if(world.time > CHALLENGE_TIME_LIMIT) + to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.") + return FALSE + for(var/obj/machinery/computer/shuttle/syndicate/S in machines) + if(S.moved) + to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.") + return FALSE + return TRUE #undef CHALLENGE_TIME_LIMIT -#undef MIN_CHALLENGE_PLAYERS +#undef CHALLENGE_MIN_PLAYERS #undef CHALLENGE_SHUTTLE_DELAY diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 3340b044958..55afe36f1d2 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -41,7 +41,7 @@ name = "disintegrating touch" desc = "This hand of mine glows with an awesome power!" catchphrase = "EI NATH!!" - on_use_sound = "sound/magic/Disintegrate.ogg" + on_use_sound = 'sound/magic/Disintegrate.ogg' icon_state = "disintegrate" item_state = "disintegrate" @@ -59,7 +59,7 @@ name = "petrifying touch" desc = "That's the bottom line, because flesh to stone said so!" catchphrase = "STAUN EI!!" - on_use_sound = "sound/magic/FleshToStone.ogg" + on_use_sound = 'sound/magic/FleshToStone.ogg' icon_state = "fleshtostone" item_state = "fleshtostone" @@ -78,7 +78,7 @@ name = "toy plastic hand" desc = "This hand of mine glows with an awesome power! Ok, maybe just batteries." catchphrase = "EI NATH!!" - on_use_sound = "sound/magic/Disintegrate.ogg" + on_use_sound = 'sound/magic/Disintegrate.ogg' icon_state = "disintegrate" item_state = "disintegrate" @@ -95,7 +95,7 @@ name = "cluwne touch" desc = "It's time to start clowning around." catchphrase = "NWOLC EGNEVER" - on_use_sound = "sound/misc/sadtrombone.ogg" + on_use_sound = 'sound/misc/sadtrombone.ogg' icon_state = "cluwnecurse" item_state = "cluwnecurse" diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 5a2d4ebb411..733c19bc337 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -8,7 +8,7 @@ slot_flags = SLOT_BELT origin_tech = "bluespace=4;materials=4" var/imprinted = "empty" - + var/usability = TRUE // Can this soul stone be used by anyone, or only cultists/wizards? var/reusable = TRUE // Can this soul stone be used more than once? var/spent = FALSE // If the soul stone can only be used once, has it been used? @@ -18,7 +18,7 @@ return TRUE return FALSE - + /obj/item/device/soulstone/proc/was_used() if(!reusable) spent = TRUE @@ -26,21 +26,21 @@ desc = "A fragment of the legendary treasure known simply as \ the 'Soul Stone'. The shard lies still, dull and lifeless; \ whatever spark it once held long extinguished." - + /obj/item/device/soulstone/anybody usability = TRUE /obj/item/device/soulstone/anybody/chaplain name = "mysterious old shard" reusable = FALSE - + /obj/item/device/soulstone/pickup(mob/living/user) ..() if(!can_use(user)) to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.") user.Dizzy(120) - -//////////////////////////////Capturing//////////////////////////////////////////////////////// + +//////////////////////////////Capturing//////////////////////////////////////////////////////// /obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) if(!can_use(user)) user.Paralyse(5) @@ -53,7 +53,7 @@ if(!ishuman(M) || istype(M, /mob/living/carbon/human/dummy)) //If target is not a human or a dummy return ..() - + if(M.has_brain_worms()) //Borer stuff - RR to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.") return ..() @@ -62,6 +62,13 @@ to_chat(user, "A mysterious force prevents you from trapping this being's soul.") return ..() + if(iscultist(M)) + to_chat(user, "This soul is already MINE.") + return ..() + + M.create_attack_log("Has had their soul captured with [src.name] by [key_name(user)]") + user.create_attack_log("Used the [src.name] to capture the soul of [key_name(M)]") + M.create_attack_log("Has had their soul captured with [src.name] by [key_name(user)]") user.create_attack_log("Used the [src.name] to capture the soul of [key_name(M)]") log_attack("[key_name(user)] used the [src.name] to capture the soul of [key_name(M)]") @@ -69,7 +76,7 @@ transfer_soul("VICTIM", M, user) return -///////////////////Options for using captured souls/////////////////////////////////////// +///////////////////Options for using captured souls/////////////////////////////////////// /obj/item/device/soulstone/attack_self(mob/user) if(!in_range(src, user)) return @@ -77,8 +84,8 @@ if(!can_use(user)) user.Paralyse(5) to_chat(user, "Your body is wracked with debilitating pain!") - return - + return + user.set_machine(src) var/dat = "Soul Stone
" for(var/mob/living/simple_animal/shade/A in src) @@ -127,7 +134,7 @@ icon = 'icons/obj/wizard.dmi' icon_state = "construct" desc = "A wicked machine used by those skilled in magical arts. It is inactive" - + /obj/structure/constructshell/examine(mob/user) if(..(user, 0)) if(iscultist(user) || iswizard(user) || user.stat == DEAD) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 3c59d47f020..fd554e03c85 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -106,6 +106,11 @@ spell_type = /obj/effect/proc_holder/spell/fireball log_name = "FB" +/datum/spellbook_entry/rod_form + name = "Rod Form" + spell_type = /obj/effect/proc_holder/spell/targeted/rod_form + log_name = "RF" + /datum/spellbook_entry/magicm name = "Magic Missile" spell_type = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile @@ -853,7 +858,7 @@ spellname = "disintegrate" icon_state ="bookfireball" desc = "This book feels like it will rip stuff apart." - + /obj/item/weapon/spellbook/oneuse/sacredflame spell = /obj/effect/proc_holder/spell/targeted/sacred_flame spellname = "sacred flame" diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index eedb50a8412..1331db02791 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -8,7 +8,7 @@ supervisors = "your laws" req_admin_notify = 1 minimal_player_age = 30 - exp_requirements = 600 + exp_requirements = 1200 exp_type = EXP_TYPE_CREW equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 090fc6681a0..981753c5aee 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -13,7 +13,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) access = list() //See get_access() minimal_access = list() //See get_access() minimal_player_age = 30 - exp_requirements = 600 + exp_requirements = 1200 exp_type = EXP_TYPE_CREW equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -237,6 +237,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) alt_titles = list("Lawyer","Public Defender") minimal_player_age = 30 + exp_requirements = 300 + exp_type = EXP_TYPE_CREW idtype = /obj/item/weapon/card/id/security equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm index 746dfcacf44..e0b403bfce7 100644 --- a/code/game/jobs/job_exp.dm +++ b/code/game/jobs/job_exp.dm @@ -1,22 +1,49 @@ // Admin Verbs -/client/proc/cmd_admin_check_player_exp() //Allows admins to determine who the newer players are. +/client/proc/cmd_mentor_check_player_exp() //Allows admins to determine who the newer players are. set category = "Admin" set name = "Check Player Playtime" - if(!check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN|R_MOD|R_MENTOR)) return - var/msg = "
- "
+ var/msg = "
- [key_name_admin(C.mob)]: " + C.get_exp_living() + " " - msg += "
Players under 20h:
- "
+ msg += players_new.Join()
+ msg += "
Players over 20h:
- "
+ msg += players_old.Join()
+ msg += "
Playtime:" body += C.get_exp_report() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 4f9e357cd61..1222d3e00b3 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -473,7 +473,7 @@ printing = 1 visible_message("\The [src] rattles and prints out a sheet of paper.") var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) P.info = "
" P.info += "Time of scan: [worldtime2text(world.time)]
" P.info += "[printing_text]" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 65f6fb7b09d..2ffa9301dd7 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -445,12 +445,12 @@ update_flag else logmsg = "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the air
" if(air_contents.toxins > 0) - message_admins("[key_name_admin(usr)] opened a canister that contains plasma! (JMP)") - log_admin("[key_name(usr)] opened a canister that contains plasma at [x], [y], [z]") + message_admins("[key_name_admin(usr)] opened a canister that contains plasma in [get_area(src)]! (JMP)") + log_admin("[key_name(usr)] opened a canister that contains plasma at [get_area(src)]: [x], [y], [z]") var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in air_contents.trace_gases if(sleeping_agent && (sleeping_agent.moles > 1)) - message_admins("[key_name_admin(usr)] opened a canister that contains N2O! (JMP)") - log_admin("[key_name(usr)] opened a canister that contains N2O at [x], [y], [z]") + message_admins("[key_name_admin(usr)] opened a canister that contains N2O in [get_area(src)]! (JMP)") + log_admin("[key_name(usr)] opened a canister that contains N2O at [get_area(src)]: [x], [y], [z]") investigate_log(logmsg, "atmos") release_log += logmsg valve_open = !valve_open diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 6ae47a3042d..9ed23ae44cd 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -137,7 +137,7 @@ user.visible_message("[user] begins to load \the [O] in \the [src]...", "You begin to load a design from \the [O]...", "You hear the chatter of a floppy drive.") - playsound(get_turf(src), "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(get_turf(src), 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) busy = 1 if(do_after(user, 14.4, target = src)) files.AddDesign2Known(D.blueprint) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 8ba7558d69b..af452dbdbcd 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -124,6 +124,9 @@ buf.dna.unique_enzymes = md5(buf.dna.real_name) buf.dna.UI=list(0x066,0x000,0x033,0x000,0x000,0x000,0xAF0,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x033,0x066,0x0FF,0x4DB,0x002,0x690,0x000,0x000) //buf.dna.UI=list(0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x000,0x000,0x000,0x000,0x161,0xFBD,0xDEF) // Farmer Jeff + for(var/i in buf.dna.UI.len to DNA_UI_LENGTH) + buf.dna.UI += 0x000 + buf.dna.ResetSE() buf.dna.UpdateUI() /obj/item/weapon/disk/data/monkey diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 197008c40f7..0f555a1169b 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -25,7 +25,7 @@ return 1 ui_interact(user) -/obj/machinery/computer/atmoscontrol/emag_act(var/remaining_carges, var/mob/user) +/obj/machinery/computer/atmoscontrol/emag_act(mob/user) if(!emagged) user.visible_message("\The [user] does something \the [src], causing the screen to flash!",\ "You cause the screen to flash as you gain full control.",\ diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 71aad1085ff..d3d7b8cf3d1 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -30,7 +30,12 @@ var/frame_desc = null var/contain_parts = 1 - +/obj/item/weapon/circuitboard/computer + board_type = "computer" + +/obj/item/weapon/circuitboard/machine + board_type = "machine" + /obj/item/weapon/circuitboard/message_monitor name = "Circuit board (Message Monitor)" build_path = /obj/machinery/computer/message_monitor diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 3d1df935cf8..e91286fe422 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -37,18 +37,19 @@ off_action.Activate() /obj/machinery/computer/camera_advanced/attack_hand(mob/user) - if(..()) - return - if(!iscarbon(user)) - return if(current_user) to_chat(user, "The console is already in use!") return - + if(!iscarbon(user)) + return + if(..()) + return user.set_machine(src) + if(!eyeobj) CreateEye() - if(!eyeobj.initialized) + + if(!eyeobj.eye_initialized) var/camera_location for(var/obj/machinery/camera/C in cameranet.cameras) if(!C.can_use()) @@ -57,7 +58,7 @@ camera_location = get_turf(C) break if(camera_location) - eyeobj.initialized = 1 + eyeobj.eye_initialized = 1 give_eye_control(user) eyeobj.setLoc(camera_location) else @@ -66,6 +67,7 @@ user.unset_machine() else give_eye_control(user) + eyeobj.setLoc(eyeobj.loc) /obj/machinery/computer/camera_advanced/proc/give_eye_control(mob/user) @@ -77,7 +79,6 @@ user.remote_view = 1 user.remote_control = eyeobj user.reset_perspective(eyeobj) - eyeobj.setLoc(eyeobj.loc) /mob/camera/aiEye/remote name = "Inactive Camera Eye" @@ -86,10 +87,15 @@ var/acceleration = 1 var/mob/living/carbon/human/eye_user = null var/obj/machinery/computer/camera_advanced/origin - var/initialized = 0 + var/eye_initialized = 0 var/visible_icon = 0 var/image/user_image = null +/mob/camera/aiEye/remote/Destroy() + eye_user = null + origin = null + return ..() + /mob/camera/aiEye/remote/GetViewerClient() if(eye_user) return eye_user.client @@ -102,12 +108,11 @@ T = get_turf(T) loc = T cameranet.visibility(src) - if(eye_user.client) - if(visible_icon) + if(visible_icon) + if(eye_user.client) eye_user.client.images -= user_image user_image = image(icon,loc,icon_state,FLY_LAYER) eye_user.client.images += user_image - eye_user.client.eye = src /mob/camera/aiEye/remote/relaymove(mob/user,direct) var/initial = initial(sprint) @@ -140,14 +145,16 @@ remote_eye.origin.current_user = null remote_eye.origin.jump_action.Remove(C) remote_eye.eye_user = null - C.reset_perspective(null) if(C.client) - C.client.images -= remote_eye.user_image + C.reset_perspective(null) + if(remote_eye.visible_icon) + C.client.images -= remote_eye.user_image for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks) C.client.images -= chunk.obscured C.remote_control = null C.unset_machine() src.Remove(C) + playsound(remote_eye.origin, 'sound/machines/terminal_off.ogg', 25, 0) /datum/action/innate/camera_jump name = "Jump To Camera" @@ -175,7 +182,14 @@ T[text("[][]", netcam.c_tag, (netcam.can_use() ? null : " (Deactivated)"))] = netcam + playsound(origin, 'sound/machines/terminal_prompt.ogg', 25, 0) var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T var/obj/machinery/camera/final = T[camera] + playsound(origin, "terminal_type", 25, 0) if(final) + playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) remote_eye.setLoc(get_turf(final)) + C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/noise) + C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console! + else + playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, 0) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 1588d990d80..8ccc505f39f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -362,7 +362,7 @@ var/time_last_changed_position = 0 if("print") if(!printing) printing = 1 - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) spawn(50) printing = null nanomanager.update_uis(src) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 8b838ceade5..6087bc68d08 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -53,6 +53,24 @@ to_chat(user, "Access denied.") return COMM_AUTHENTICATION_NONE +/obj/machinery/computer/communications/proc/change_security_level(var/new_level) + tmp_alertlevel = new_level + var/old_level = security_level + if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN + if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN + if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this + set_security_level(tmp_alertlevel) + if(security_level != old_level) + //Only notify the admins if an actual change happened + log_game("[key_name(usr)] has changed the security level to [get_security_level()].") + message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") + switch(security_level) + if(SEC_LEVEL_GREEN) + feedback_inc("alert_comms_green",1) + if(SEC_LEVEL_BLUE) + feedback_inc("alert_comms_blue",1) + tmp_alertlevel = 0 + /obj/machinery/computer/communications/Topic(href, href_list) if(..(href, href_list)) return 1 @@ -100,35 +118,25 @@ if("newalertlevel") if(isAI(usr) || isrobot(usr)) to_chat(usr, "Firewalls prevent you from changing the alert level.") - nanomanager.update_uis(src) return 1 - tmp_alertlevel = text2num(href_list["level"]) + else if(usr.can_admin_interact()) + change_security_level(text2num(href_list["level"])) + return 1 + else if(!ishuman(usr)) + to_chat(usr, "Security measures prevent you from changing the alert level.") + return 1 + var/mob/living/carbon/human/L = usr var/obj/item/card = L.get_active_hand() - var/obj/item/weapon/card/id/I = (card && card.GetID())||L.wear_id||L.wear_pda + var/obj/item/weapon/card/id/I = (card && card.GetID()) || L.wear_id || L.wear_pda if(istype(I, /obj/item/device/pda)) var/obj/item/device/pda/pda = I I = pda.id if(I && istype(I)) if(access_captain in I.access) - var/old_level = security_level - if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN - if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN - if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this - set_security_level(tmp_alertlevel) - if(security_level != old_level) - //Only notify the admins if an actual change happened - log_game("[key_name(usr)] has changed the security level to [get_security_level()].") - message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") - switch(security_level) - if(SEC_LEVEL_GREEN) - feedback_inc("alert_comms_green",1) - if(SEC_LEVEL_BLUE) - feedback_inc("alert_comms_blue",1) - tmp_alertlevel = 0 + change_security_level(text2num(href_list["level"])) else to_chat(usr, "You are not authorized to do this.") - tmp_alertlevel = 0 setMenuState(usr,COMM_SCREEN_MAIN) else to_chat(usr, "You need to swipe your ID.") @@ -172,24 +180,26 @@ setMenuState(usr,COMM_SCREEN_MAIN) if("messagelist") - src.currmsg = 0 + currmsg = 0 if(href_list["msgid"]) setCurrentMessage(usr, text2num(href_list["msgid"])) setMenuState(usr,COMM_SCREEN_MESSAGES) if("delmessage") if(href_list["msgid"]) - src.currmsg = text2num(href_list["msgid"]) + currmsg = text2num(href_list["msgid"]) var/response = alert("Are you sure you wish to delete this message?", "Confirm", "Yes", "No") if(response == "Yes") - if(src.currmsg) + if(currmsg) var/id = getCurrentMessage() - var/title = src.messagetitle[id] - var/text = src.messagetext[id] - src.messagetitle.Remove(title) - src.messagetext.Remove(text) - if(currmsg==id) currmsg=0 - if(aicurrmsg==id) aicurrmsg=0 + var/title = messagetitle[id] + var/text = messagetext[id] + messagetitle.Remove(title) + messagetext.Remove(text) + if(currmsg == id) + currmsg = 0 + if(aicurrmsg == id) + aicurrmsg = 0 setMenuState(usr,COMM_SCREEN_MESSAGES) if("status") @@ -336,7 +346,7 @@ /obj/machinery/computer/communications/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] - data["is_ai"] = isAI(user)||isrobot(user) + data["is_ai"] = isAI(user) || isrobot(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state data["emagged"] = emagged data["authenticated"] = is_authenticated(user, 0) @@ -368,16 +378,15 @@ list("id" = SEC_LEVEL_BLUE, "name" = "Blue"), //SEC_LEVEL_RED = list("name"="Red"), ) - - var/msg_data[0] - for(var/i = 1; i <= src.messagetext.len; i++) - var/cur_msg[0] - cur_msg["title"] = messagetitle[i] - cur_msg["body"] = messagetext[i] - msg_data += list(cur_msg) + + var/list/msg_data = list() + for(var/i = 1; i <= messagetext.len; i++) + msg_data.Add(list(list("title" = messagetitle[i], "body" = messagetext[i], "id" = i))) data["messages"] = msg_data - data["current_message"] = data["is_ai"] ? aicurrmsg : currmsg + if((data["is_ai"] && aicurrmsg) || (!data["is_ai"] && currmsg)) + data["current_message"] = data["is_ai"] ? messagetext[aicurrmsg] : messagetext[currmsg] + data["current_message_title"] = data["is_ai"] ? messagetitle[aicurrmsg] : messagetitle[currmsg] data["lastCallLoc"] = shuttle_master.emergencyLastCallLoc ? format_text(shuttle_master.emergencyLastCallLoc.name) : null @@ -403,9 +412,9 @@ /obj/machinery/computer/communications/proc/setCurrentMessage(var/mob/user,var/value) if(isAI(user) || isrobot(user)) - aicurrmsg=value + aicurrmsg = value else - currmsg=value + currmsg = value /obj/machinery/computer/communications/proc/getCurrentMessage(var/mob/user) if(isAI(user) || isrobot(user)) @@ -540,3 +549,13 @@ message_admins("All the AI's, communication consoles and boards are destroyed. Shuttle called.", 1) return ..() + +/proc/print_command_report(text = "", title = "Central Command Update") + for(var/obj/machinery/computer/communications/C in machines) + if(!(C.stat & (BROKEN|NOPOWER)) && is_station_contact(C.z)) + var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(C.loc) + P.name = "paper- '[title]'" + P.info = text + C.messagetitle.Add("[title]") + C.messagetext.Add(text) + P.update_icon() \ No newline at end of file diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 1162735db96..ddbee4c06a9 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -465,7 +465,7 @@ if(href_list["print_p"]) if(!( src.printing )) src.printing = 1 - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) P.info = "
" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index b8b2629b22b..644f9cddec8 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -63,7 +63,7 @@ src.spark_system.start() var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey MK.loc = src.loc - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) // Will help make emagging the console not so easy to get away with. MK.info += "
£%@%(*$%&(£&?*(%&£/{}" update_icon() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 2a11b4a8836..77921e171bb 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -318,7 +318,7 @@ What a mess.*/ if("Print Record") if(!( printing )) printing = 1 - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) P.info = "
" @@ -341,7 +341,7 @@ What a mess.*/ if("Print Photo") if(!printing) printing = 1 - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) sleep(50) if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) create_record_photo(active1) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index ee90fcc3b21..384e9e80179 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -253,7 +253,7 @@ What a mess.*/ if("Print Record") if(!( printing )) printing = 1 - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) P.info = "
" diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index a9e7fb72741..e3f0abad69a 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -159,7 +159,7 @@ // to_chat(usr, "Printing the log, standby...") //sleep(50) var/obj/item/weapon/paper/P = new/obj/item/weapon/paper( loc ) - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) P.name = "activity log" P.info = dat diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index c75ff304922..471a24078fb 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -46,17 +46,13 @@ ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/teleporter + ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay ME.attach(src) -/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null) - if(C) - C.forceMove(src) - cell = C - return - cell = new(src) +/obj/mecha/combat/gygax/dark/add_cell() + cell = new /obj/item/weapon/stock_parts/cell/bluespace(src) cell.charge = 30000 cell.maxcharge = 30000 diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index cecbc1e5b13..97b442a51da 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -50,6 +50,11 @@ force = 55 max_equip = 5 +/obj/mecha/combat/marauder/seraph/add_cell() + cell = new /obj/item/weapon/stock_parts/cell/bluespace(src) + cell.charge = 40000 + cell.maxcharge = 40000 + /obj/mecha/combat/marauder/seraph/loaded/New() ..()//Let it equip whatever is needed. var/obj/item/mecha_parts/mecha_equipment/ME @@ -61,7 +66,7 @@ ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src) + ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise(src) ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) ME.attach(src) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index 184766dc3ed..9e2a754bd4c 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -9,17 +9,25 @@ icon_state = "mecha_teleport" origin_tech = "bluespace=10" equip_cooldown = 150 - energy_drain = 1000 + energy_drain = 8000 range = RANGED + var/tele_precision = 4 /obj/item/mecha_parts/mecha_equipment/teleporter/action(atom/target) if(!action_checks(target) || !is_teleport_allowed(loc.z)) return var/turf/T = get_turf(target) if(T) - do_teleport(chassis, T, 4) + chassis.use_power(energy_drain) + do_teleport(chassis, T, tele_precision) return 1 +/obj/item/mecha_parts/mecha_equipment/teleporter/precise + name = "upgraded teleporter" + desc = "An exosuit module that allows exosuits to teleport to any position in view. This is the high-precision, energy-efficient version." + origin_tech = "bluespace=13" + energy_drain = 1000 + tele_precision = 1 ////////////////////////////////////////////// WORMHOLE GENERATOR ////////////////////////////////////////// diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 93a86fbe956..0466aa698c6 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -237,7 +237,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced name = "\improper S.H.H. \"Quietus\" Carbine" - fire_sound = "sound/weapons/Gunshot_silenced.ogg" + fire_sound = 'sound/weapons/Gunshot_silenced.ogg' icon_state = "mecha_mime" equip_cooldown = 15 projectile = /obj/item/projectile/bullet/mime diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 95ca2d4f4d8..3da7bb372d4 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -750,7 +750,7 @@ steam.start() -- spawns the effect var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition) I.dir = src.holder.dir flick("ion_fade", I) - I.icon_state = "blank" + I.icon_state = "" spawn( 20 ) if(I) I.delete() @@ -812,8 +812,8 @@ steam.start() -- spawns the effect II.dir = src.holder.dir flick("ion_fade", I) flick("ion_fade", II) - I.icon_state = "blank" - II.icon_state = "blank" + I.icon_state = "" + II.icon_state = "" spawn( 20 ) if(I) I.delete() if(II) II.delete() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index d805105a906..2a2237559fb 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -77,7 +77,7 @@ drawtype = temp update_window(usr) -/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(is_type_in_list(target,validSurfaces)) var/temp = "rune" @@ -95,17 +95,22 @@ if(!uses) to_chat(user, "You used up your [name]!") qdel(src) - return -/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) +/obj/item/toy/crayon/attack(mob/M, mob/user) var/huffable = istype(src,/obj/item/toy/crayon/spraycan) if(M == user) - to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!") + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(!H.check_has_mouth()) + to_chat(user, "You do not have a mouth!") + return + playsound(loc, 'sound/items/eatfood.ogg', 50, 0) + to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!") user.nutrition += 5 if(uses) uses -= 5 if(uses <= 0) - to_chat(user, "There is no more of [name] left!") + to_chat(user, "There is no more of [name] left!") qdel(src) else ..() diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 2d08b4f582b..81e0f05258a 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -151,7 +151,7 @@ for(var/mob/O in viewers(usr)) O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1) - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) var/obj/item/weapon/paper/P = new(usr.loc) diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm index eaf1c668e3c..bb11c5f0a2a 100644 --- a/code/game/objects/items/devices/guitar.dm +++ b/code/game/objects/items/devices/guitar.dm @@ -25,10 +25,7 @@ ui_interact(user) /obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(!user) - return - - if(!isliving(user) || user.stat || user.restrained() || user.lying) + if(!isliving(user) || user.incapacitated()) return song.ui_interact(user, ui_key, ui, force_open) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 68b0b8d2dca..ab61008816c 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -11,11 +11,16 @@ var/obj/item/device/radio/radio var/looking_for_personality = 0 var/mob/living/silicon/pai/pai + var/list/faction = list("neutral") // The factions the pAI will inherit from the card + +/obj/item/device/paicard/syndicate + name = "syndicate personal AI device" + faction = list("syndicate") /obj/item/device/paicard/relaymove(var/mob/user, var/direction) if(user.stat || user.stunned) return - var/obj/item/weapon/rig/rig = src.get_rig() + var/obj/item/weapon/rig/rig = get_rig() if(istype(rig)) rig.forced_move(direction, user) @@ -260,7 +265,7 @@ to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.") return last_request = world.time / 10 - src.looking_for_personality = 1 + looking_for_personality = 1 paiController.findPAI(src, usr) if(href_list["wipe"]) var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No") @@ -297,33 +302,33 @@ // WIRE_TRANSMIT = 4 /obj/item/device/paicard/proc/setPersonality(mob/living/silicon/pai/personality) - src.pai = personality - src.overlays += "pai-happy" + pai = personality + overlays += "pai-happy" /obj/item/device/paicard/proc/removePersonality() - src.pai = null - src.overlays.Cut() - src.overlays += "pai-off" + pai = null + overlays.Cut() + overlays += "pai-off" /obj/item/device/paicard var/current_emotion = 1 /obj/item/device/paicard/proc/setEmotion(var/emotion) if(pai) - src.overlays.Cut() + overlays.Cut() switch(emotion) - if(1) src.overlays += "pai-happy" - if(2) src.overlays += "pai-cat" - if(3) src.overlays += "pai-extremely-happy" - if(4) src.overlays += "pai-face" - if(5) src.overlays += "pai-laugh" - if(6) src.overlays += "pai-off" - if(7) src.overlays += "pai-sad" - if(8) src.overlays += "pai-angry" - if(9) src.overlays += "pai-what" + if(1) overlays += "pai-happy" + if(2) overlays += "pai-cat" + if(3) overlays += "pai-extremely-happy" + if(4) overlays += "pai-face" + if(5) overlays += "pai-laugh" + if(6) overlays += "pai-off" + if(7) overlays += "pai-sad" + if(8) overlays += "pai-angry" + if(9) overlays += "pai-what" current_emotion = emotion /obj/item/device/paicard/proc/alertUpdate() - var/turf/T = get_turf_or_move(src.loc) + var/turf/T = get_turf_or_move(loc) for(var/mob/M in viewers(T)) M.show_message("\blue [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\blue [src] bleeps electronically.", 2) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index d804c874e1a..c573e4ff975 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -231,7 +231,7 @@ return to_chat(usr, "Transcript printed.") - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) var/t1 = "Transcript:
" for(var/i = 1, mytape.storedinfo.len >= i, i++) diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 323fb3db4f4..3ad1e98d6a6 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -30,10 +30,7 @@ ui_interact(user) /obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(!user) - return - - if(!isliving(user) || user.stat || user.restrained() || user.lying) + if(!isliving(user) || user.incapacitated()) return song.ui_interact(user, ui_key, ui, force_open) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 0bacbaa161e..bb57a4a2cc2 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -7,7 +7,7 @@ RCD /obj/item/weapon/rcd name = "rapid-construction-device (RCD)" desc = "A device used to rapidly build and deconstruct walls and floors." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "rcd" opacity = 0 density = 0 @@ -28,6 +28,7 @@ RCD var/canRwall = 0 var/menu = 1 var/door_type = /obj/machinery/door/airlock + var/door_name = "Airlock" req_access = list(access_engine) var/list/door_accesses = list() var/list/door_accesses_list = list() @@ -85,7 +86,7 @@ RCD /obj/item/weapon/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 400, 400, state = state) + ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state) ui.open() ui.set_auto_update(1) @@ -93,6 +94,7 @@ RCD var/data[0] data["mode"] = mode data["door_type"] = door_type + data["door_name"] = door_name data["menu"] = menu data["matter"] = matter data["max_matter"] = max_matter @@ -164,6 +166,11 @@ RCD door_accesses_list[++door_accesses_list.len] = list("name" = get_access_desc(access), "id" = access, "enabled" = (access in door_accesses)) . = 1 + if(href_list["choice"] && !locked) + var/temp_t = sanitize(copytext(input("Enter a custom Airlock Name.","Airlock Name"),1,MAX_MESSAGE_LEN)) + if(temp_t) + door_name = temp_t + /obj/item/weapon/rcd/proc/activate() playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -207,6 +214,7 @@ RCD if(!useResource(10, user)) return 0 activate() var/obj/machinery/door/airlock/T = new door_type(A) + T.name = door_name T.autoclose = 1 if(one_access) T.req_one_access = door_accesses.Copy() diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 7cbe5783a9a..47cf88f9bbc 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -6,8 +6,8 @@ RSF /obj/item/weapon/rsf name = "\improper Rapid-Service-Fabricator" desc = "A device used to rapidly deploy service items." - icon = 'icons/obj/items.dmi' - icon_state = "rcd" + icon = 'icons/obj/tools.dmi' + icon_state = "rsf" opacity = 0 density = 0 anchored = 0.0 diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm index e966f5500e5..00b85d8ebe1 100644 --- a/code/game/objects/items/weapons/scissors.dm +++ b/code/game/objects/items/weapons/scissors.dm @@ -78,7 +78,7 @@ species_hair = hair_styles_list var/h_new_style = input(user, "Select a hair style", "Grooming") as null|anything in species_hair user.visible_message("[user] starts cutting [M]'s hair!", "You start cutting [M]'s hair!") //arguments for this are: 1. what others see 2. what the user sees. --Fixed grammar, (TGameCo) - playsound(loc, "sound/goonstation/misc/Scissor.ogg", 100, 1) + playsound(loc, 'sound/goonstation/misc/Scissor.ogg', 100, 1) if(do_after(user, 50, target = H)) //this is the part that adds a delay. delay is in deciseconds. --Made it 5 seconds, because hair isn't cut in one second in real life, and I want at least a little bit longer time, (TGameCo) if(!(M in view(1))) //Adjacency test user.visible_message("[user] stops cutting [M]'s hair.", "You stop cutting [M]'s hair.") @@ -111,9 +111,9 @@ if(!is_cutting) is_cutting = 1 user.visible_message("[user] starts cutting [M]'s hair!", "You start cutting [M]'s hair!") - playsound(loc, "sound/goonstation/misc/Scissor.ogg", 100, 1) + playsound(loc, 'sound/goonstation/misc/Scissor.ogg', 100, 1) if(do_after(user, 50, target = H)) - playsound(loc, "sound/weapons/bladeslice.ogg", 50, 1, -1) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) user.visible_message("[user] abruptly stops cutting [M]'s hair and slices their throat!", "You stop cutting [M]'s hair and slice their throat!") //Just a little off the top. H.AdjustLoseBreath(10) //30 Oxy damage over time H.apply_damage(18, BRUTE, "head", sharp =1, edge =1, used_weapon = "scissors") diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index fd44bacbf53..74d4093beb5 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -13,7 +13,7 @@ materials = list(MAT_METAL = 500) origin_tech = "combat=1" attack_verb = list("robusted") - hitsound = "sound/weapons/smash.ogg" + hitsound = 'sound/weapons/smash.ogg' New() ..() diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 122643238ec..428c4885814 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -184,7 +184,6 @@ name = "vox specialized nitrogen tank" desc = "A high-tech nitrogen tank designed specifically for Vox." icon_state = "emergency_vox" - item_state = "emergency_vox" volume = 25 /obj/item/weapon/tank/emergency_oxygen/vox/New() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index b7f5e370b95..7e0c7296fc9 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -12,47 +12,42 @@ * Revolver Conversion Kit */ -/* - * Wrench - */ +//Wrench /obj/item/weapon/wrench name = "wrench" desc = "A wrench with common uses. Can be found in your hand." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "wrench" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 + force = 5 + throwforce = 7 w_class = 2 materials = list(MAT_METAL=150) origin_tech = "materials=1;engineering=1" attack_verb = list("bashed", "battered", "bludgeoned", "whacked") - -/* - * Screwdriver - */ +//Screwdriver /obj/item/weapon/screwdriver name = "screwdriver" desc = "You can be totally screwy with this." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "screwdriver" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 + force = 5 w_class = 1 - throwforce = 5.0 + throwforce = 5 throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=75) attack_verb = list("stabbed") hitsound = 'sound/weapons/bladeslice.ogg' - suicide_act(mob/user) - to_chat(viewers(user), pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ - "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.")) - return(BRUTELOSS) +/obj/item/weapon/screwdriver/suicide_act(mob/user) + to_chat(viewers(user), pick("[user] is stabbing the [name] into \his temple! It looks like \he's trying to commit suicide.", \ + "[user] is stabbing the [name] into \his heart! It looks like \he's trying to commit suicide.")) + return(BRUTELOSS) /obj/item/weapon/screwdriver/New() switch(pick("red","blue","purple","brown","green","cyan","yellow")) @@ -82,7 +77,7 @@ src.pixel_y = rand(0, 16) return -/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) if(!istype(M) || user.a_intent == I_HELP) return ..() if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") @@ -91,72 +86,60 @@ M = user return eyestab(M,user) -/* - * Wirecutters - */ +//Wirecutters /obj/item/weapon/wirecutters name = "wirecutters" desc = "This cuts wires." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "cutters" flags = CONDUCT slot_flags = SLOT_BELT - force = 6.0 + force = 6 throw_speed = 3 throw_range = 7 w_class = 2 materials = list(MAT_METAL=80) origin_tech = "materials=1;engineering=1" attack_verb = list("pinched", "nipped") - hitsound = "sound/items/Wirecutter.ogg" + hitsound = 'sound/items/Wirecutter.ogg' sharp = 1 edge = 1 -/obj/item/weapon/wirecutters/New(loc, var/param_color = null) +/obj/item/weapon/wirecutters/New(loc, param_color = null) ..() if((!param_color && prob(50)) || param_color == "yellow") icon_state = "cutters-y" item_state = "cutters_yellow" -/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/C as mob, mob/user as mob) - if(istype(C) && C.handcuffed) - if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable)) - usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\ - "You cut \the [C]'s restraints with \the [src]!",\ +/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/H, mob/user) + if(istype(H) && H.handcuffed) + if(istype(H.handcuffed, /obj/item/weapon/restraints/handcuffs/cable)) + usr.visible_message("\The [usr] cuts \the [H]'s restraints with \the [src]!",\ + "You cut \the [H]'s restraints with \the [src]!",\ "You hear cable being cut.") - C.handcuffed = null - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob() - C.update_handcuffed() + H.handcuffed = null + if(H.buckled && H.buckled.buckle_requires_restraints) + H.buckled.unbuckle_mob() + H.update_handcuffed() return else ..() -/* - * Welding Tool - */ +//Welding Tool /obj/item/weapon/weldingtool name = "welding tool" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "welder" item_state = "welder" flags = CONDUCT slot_flags = SLOT_BELT - - //Amount of OUCH when it's thrown force = 3 throwforce = 5 throw_speed = 3 throw_range = 5 w_class = 2 - - //Cost to make in the autolathe materials = list(MAT_METAL=70, MAT_GLASS=30) - - //R&D tech level origin_tech = "engineering=1" - - //Welding tool specific stuff var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) var/status = 1 //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) var/max_fuel = 20 //The max amount of fuel the welder can hold @@ -169,7 +152,6 @@ create_reagents(max_fuel) reagents.add_reagent("fuel", max_fuel) update_icon() - return /obj/item/weapon/weldingtool/examine(mob/user) if(..(user, 0)) @@ -196,10 +178,9 @@ else icon_state = "[initial(icon_state)][ratio]" update_torch() - return -/obj/item/weapon/weldingtool/attackby(obj/item/I as obj, mob/user as mob, params) - if(istype(I, /obj/item/weapon/screwdriver)) +/obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params) + if(isscrewdriver(I)) flamethrower_screwdriver(I, user) if(istype(I, /obj/item/stack/rods)) flamethrower_rods(I, user) @@ -231,7 +212,7 @@ if(isturf(location)) location.hotspot_expose(700, 5) -/obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/weldingtool/attack(mob/M, mob/user) if(ishuman(M)) var/mob/living/carbon/human/H = M var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting] @@ -289,7 +270,7 @@ return reagents.get_reagent_amount("fuel") //Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() -/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/living/M = null) +/obj/item/weapon/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) if(!welding || !check_fuel()) return 0 if(get_fuel() >= amount) @@ -402,7 +383,7 @@ /obj/item/weapon/weldingtool/hugetank name = "Upgraded Welding Tool" - desc = "An upgraded welder based of the industrial welder." + desc = "An upgraded welder based off the industrial welder." icon_state = "upindwelder" item_state = "upindwelder" max_fuel = 80 @@ -419,10 +400,10 @@ w_class = 3 materials = list(MAT_METAL=70, MAT_GLASS=120) origin_tech = "engineering=4;plasmatech=3" - var/last_gen = 0 change_icons = 0 can_off_process = 1 light_intensity = 1 + var/last_gen = 0 /obj/item/weapon/weldingtool/experimental/proc/fuel_gen() if(!welding && !last_gen) @@ -436,19 +417,16 @@ if(reagents.total_volume < max_fuel) fuel_gen() -/* - * Crowbar - */ - +//Crowbar /obj/item/weapon/crowbar name = "pocket crowbar" desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "crowbar" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 + force = 5 + throwforce = 7 item_state = "crowbar" w_class = 2 materials = list(MAT_METAL=50) @@ -456,7 +434,6 @@ attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") /obj/item/weapon/crowbar/red - icon = 'icons/obj/items.dmi' icon_state = "red_crowbar" item_state = "crowbar_red" @@ -480,14 +457,14 @@ origin_tech = "combat=2" var/open = 0 - New() - ..() - update_icon() - +/obj/item/weapon/conversion_kit/New() + ..() update_icon() - icon_state = "[initial(icon_state)]_[open]" - attack_self(mob/user as mob) - open = !open - to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.") - update_icon() +/obj/item/weapon/conversion_kit/update_icon() + icon_state = "[initial(icon_state)]_[open]" + +/obj/item/weapon/conversion_kit/attack_self(mob/user) + open = !open + to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.") + update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index e859c0348f1..89aef25f24f 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -1,6 +1,7 @@ /obj/structure/closet/cardboard name = "large cardboard box" desc = "Just a box..." + icon = 'icons/obj/cardboard_boxes.dmi' icon_state = "cardboard" icon_opened = "cardboard_open" icon_closed = "cardboard" @@ -43,7 +44,7 @@ /mob/living/proc/do_alert_animation(atom/A) var/image/I - I = image('icons/obj/closet.dmi', A, "cardboard_special", A.layer+1) + I = image('icons/obj/cardboard_boxes.dmi', A, "cardboard_special", A.layer+1) var/list/viewing = list() for(var/mob/M in viewers(A)) if(M.client) @@ -52,6 +53,7 @@ I.alpha = 0 animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING) + /obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(src.opened) if(istype(W, /obj/item/weapon/weldingtool)) @@ -62,3 +64,25 @@ for(var/mob/M in viewers(src)) M.show_message("\The [src] has been cut apart by [user] with \the [WC].", 3, "You hear cutting.", 2) qdel(src) + return + if(istype(W, /obj/item/weapon/pen)) + var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield", "Brig Physician", "Captain", + "Cargo", "Chief Engineer", "Chaplain", "Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP", + "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot", + "Prisoner", "Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology") + if(!decalselection) + return + if(user.incapacitated()) + to_chat(user, "You're in no condition to perform this action.") + return + if(W != user.get_active_hand()) + to_chat(user, "You must be holding the pen to perform this action.") + return + if(! Adjacent(user)) + to_chat(user, "You have moved too far away from the cardboard box.") + return + decalselection = replacetext(decalselection, " ", "_") + decalselection = lowertext(decalselection) + icon_opened = ("cardboard_open_"+decalselection) + icon_closed = ("cardboard_"+decalselection) + update_icon() // a proc declared in the closets parent file used to update opened/closed sprites on normal closets diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index d14b4bbda21..31ab9c94ca2 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -79,7 +79,7 @@ if(victim.buckled) return 0 var/mob/living/H = victim - playsound(loc, "sound/effects/splat.ogg", 25, 1) + playsound(loc, 'sound/effects/splat.ogg', 25, 1) H.forceMove(loc) H.emote("scream") if(istype(H, /mob/living/carbon/human)) //So you don't get human blood when you spike a giant spidere diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index f1d9b6ac578..9b4059f1d1d 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -138,10 +138,10 @@ return data /datum/song/Topic(href, href_list) - if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained()) + if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || usr.incapacitated()) usr << browse(null, "window=instrument") usr.unset_machine() - return + return 1 instrumentObj.add_fingerprint(usr) @@ -168,6 +168,8 @@ //split into lines spawn() lines = splittext(t, "\n") + if(lines.len == 0) + return 1 if(copytext(lines[1],1,6) == "BPM: ") tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6))) lines.Cut(1,2) @@ -291,7 +293,7 @@ ui_interact(user) /obj/structure/piano/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(!user || !anchored) + if(!isliving(user) || user.incapacitated() || !anchored) return song.ui_interact(user, ui_key, ui, force_open) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 6cf81f70180..1ce1165a8a5 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -5,6 +5,9 @@ #define ERT_TYPE_RED 2 #define ERT_TYPE_GAMMA 3 +/datum/game_mode + var/list/datum/mind/ert = list() + var/list/response_team_members = list() var/responseteam_age = 21 // Minimum account age to play as an ERT member var/datum/response_team/active_team = null @@ -93,7 +96,7 @@ var/ert_request_answered = 0 if(response_team_members.len > 6) to_chat(src, "The emergency response team is already full!") return 0 - + return 1 /proc/trigger_armed_response_team(var/datum/response_team/response_team_type) @@ -106,7 +109,7 @@ var/ert_request_answered = 0 active_team.cannot_send_team() send_emergency_team = 0 return 0 - + // Respawnable players get first dibs for(var/mob/dead/observer/M in ert_candidates) if((M in respawnable_list) && M.JoinResponseTeam()) @@ -115,7 +118,7 @@ var/ert_request_answered = 0 for(var/mob/dead/observer/M in (ert_candidates - respawnable_list)) if(M.JoinResponseTeam()) response_team_members |= M - + if(!response_team_members.len) active_team.cannot_send_team() send_emergency_team = 0 @@ -125,14 +128,14 @@ var/ert_request_answered = 0 for(var/mob/M in response_team_members) if(index > emergencyresponseteamspawn.len) index = 1 - + var/client/C = M.client var/mob/living/carbon/human/new_commando = C.create_response_team(emergencyresponseteamspawn[index]) new_commando.mind.key = M.key new_commando.key = M.key new_commando.update_icons() index++ - + send_emergency_team = 0 active_team.announce_team() return 1 @@ -170,8 +173,8 @@ var/ert_request_answered = 0 head_organ.b_hair = color2B(hair_c) M.change_eye_color(color2R(eye_c), color2G(eye_c), color2B(eye_c)) M.s_tone = skin_tone - head_organ.h_style = random_hair_style(M.gender, head_organ.species.name) - head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name) + head_organ.h_style = random_hair_style(M.gender, head_organ.species.name) + head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name) M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]" M.name = M.real_name @@ -187,6 +190,7 @@ var/ert_request_answered = 0 M.mind.special_role = SPECIAL_ROLE_ERT if(!(M.mind in ticker.minds)) ticker.minds += M.mind //Adds them to regular mind list. + ticker.mode.ert += M.mind M.forceMove(spawn_location) active_team.equip_officer(class, M) @@ -256,6 +260,7 @@ var/ert_request_answered = 0 pda.name = "PDA-[M.real_name] ([pda.ownjob])" pda.icon_state = "pda-engineer" M.equip_to_slot_or_del(pda, slot_wear_pda) + M.job = "ERT Engineering" if("Security") @@ -280,7 +285,7 @@ var/ert_request_answered = 0 pda.name = "PDA-[M.real_name] ([pda.ownjob])" pda.icon_state = "pda-security" M.equip_to_slot_or_del(pda, slot_wear_pda) - + M.job = "ERT Security" if("Medic") medical_slots -= 1 @@ -302,7 +307,7 @@ var/ert_request_answered = 0 pda.name = "PDA-[M.real_name] ([pda.ownjob])" pda.icon_state = "pda-medical" M.equip_to_slot_or_del(pda, slot_wear_pda) - + M.job = "ERT Medical" if("Commander") command_slots = 0 @@ -329,6 +334,7 @@ var/ert_request_answered = 0 pda.ownjob = "Emergency Response Team Leader" pda.name = "PDA-[M.real_name] ([pda.ownjob])" M.equip_to_slot_or_del(pda, slot_wear_pda) + M.job = "ERT Commander" /datum/response_team/proc/cannot_send_team() event_announcement.Announce("[station_name()], we are unfortunately unable to send you an Emergency Response Team at this time.", "ERT Unavailable") diff --git a/code/game/sound.dm b/code/game/sound.dm index ed5f0d15b4c..14269acb81f 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -12,6 +12,9 @@ var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pagetur var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg') var/list/computer_ambience = list('sound/goonstation/machines/ambicomp1.ogg', 'sound/goonstation/machines/ambicomp2.ogg', 'sound/goonstation/machines/ambicomp3.ogg') var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg','sound/weapons/effects/ric3.ogg','sound/weapons/effects/ric4.ogg','sound/weapons/effects/ric5.ogg') +var/list/terminal_type = list('sound/machines/terminal_button01.ogg', 'sound/machines/terminal_button02.ogg', 'sound/machines/terminal_button03.ogg', + 'sound/machines/terminal_button04.ogg', 'sound/machines/terminal_button05.ogg', 'sound/machines/terminal_button06.ogg', + 'sound/machines/terminal_button07.ogg', 'sound/machines/terminal_button08.ogg') /proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/pitch) @@ -137,4 +140,6 @@ var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effect soundin = pick(computer_ambience) if("ricochet") soundin = pick(ricochet) + if("terminal_type") + soundin = pick(terminal_type) return soundin diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index f4f67b9007b..5af7cf30673 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -73,10 +73,10 @@ icons = list("bananium","bananium_dam") var/spam_flag = 0 -/turf/simulated/floor/mineral/bananium/Entered(mob/AM) +/turf/simulated/floor/mineral/bananium/Entered(mob/living/M) .=..() if(!.) - if(istype(AM)) + if(istype(M)) squeek() /turf/simulated/floor/mineral/bananium/attackby(obj/item/weapon/W, mob/user, params) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ab2b6beb9e7..a029e529856 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -2,7 +2,8 @@ var/list/admin_verbs_default = list( /client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/ /client/proc/hide_verbs, /*hides all our adminverbs*/ - /client/proc/cmd_mentor_check_new_players + /client/proc/cmd_mentor_check_new_players, + /client/proc/cmd_mentor_check_player_exp /* shows players by playtime */ ) var/list/admin_verbs_admin = list( /client/proc/check_antagonists, /*shows all antags*/ @@ -75,7 +76,6 @@ var/list/admin_verbs_admin = list( /client/proc/debug_variables, /client/proc/show_snpc_verbs, /client/proc/reset_all_tcs, /*resets all telecomms scripts*/ - /client/proc/cmd_admin_check_player_exp, /* shows players by playtime */ /client/proc/toggle_mentor_chat, /client/proc/toggle_advanced_interaction, /*toggle admin ability to interact with not only machines, but also atoms such as buttons and doors*/ ) @@ -111,7 +111,8 @@ var/list/admin_verbs_event = list( /client/proc/response_team, // Response Teams admin verb /client/proc/cmd_admin_create_centcom_report, /client/proc/fax_panel, - /client/proc/event_manager_panel + /client/proc/event_manager_panel, + /client/proc/modify_goals ) var/list/admin_verbs_spawn = list( @@ -167,7 +168,7 @@ var/list/admin_verbs_debug = list( /client/proc/admin_serialize, /client/proc/admin_deserialize, /client/proc/jump_to_ruin, - /client/proc/toggle_medal_disable + /client/proc/toggle_medal_disable ) var/list/admin_verbs_possess = list( /proc/possess, @@ -214,6 +215,10 @@ var/list/admin_verbs_snpc = list( /client/proc/hide_snpc_verbs ) +/client/proc/on_holder_add() + if(chatOutput && chatOutput.loaded) + chatOutput.loadAdmin() + /client/proc/add_admin_verbs() if(holder) verbs += admin_verbs_default diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 7ee714090cc..de22d5ea098 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -32,6 +32,7 @@ var/list/admin_datums = list() if(istype(C)) owner = C owner.holder = src + owner.on_holder_add() owner.add_admin_verbs() //TODO owner.verbs -= /client/proc/readmin admins |= C diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index dc5754836d9..1f76781b90d 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -531,6 +531,16 @@ if(ticker.mode.greyshirts.len) dat += check_role_table("Greyshirts", ticker.mode.greyshirts) + if(ts_spiderlist.len) + var/list/spider_minds = list() + for(var/mob/living/simple_animal/hostile/poison/terror_spider/S in ts_spiderlist) + if(S.ckey) + spider_minds += S.mind + dat += check_role_table("Terror Spiders", spider_minds) + + if(ticker.mode.ert.len) + dat += check_role_table("ERT", ticker.mode.ert) + dat += "" usr << browse(dat, "window=roundstatus;size=400x500") else diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 4a01b1161e8..ef3199b3484 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1533,6 +1533,23 @@ else if(href_list["check_antagonist"]) check_antagonists() + else if(href_list["take_question"]) + var/mob/M = locateUID(href_list["take_question"]) + var/is_mhelp = href_list["is_mhelp"] + if(ismob(M)) + var/helptype = "ADMINHELP" + if(is_mhelp) + helptype = "MENTORHELP" + var/take_msg = "[helptype]: [key_name(usr.client)] is attending to [key_name(M)]'s question." + for(var/client/X in admins) + if(check_rights(R_ADMIN, 0, X.mob)) + to_chat(X, take_msg) + else if(is_mhelp && check_rights(R_MOD|R_MENTOR, 0, X.mob)) + to_chat(X, take_msg) + to_chat(M, "Your question is being attended to by [key_name(usr.client)]. Thanks for your patience!") + else + to_chat(usr, "Unable to locate mob.") + else if(href_list["cult_nextobj"]) if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes") return @@ -1710,6 +1727,103 @@ to_chat(src.owner, "You sent a [eviltype] fax to [H]") log_admin("[key_name(src.owner)] sent [key_name(H)] a [eviltype] fax") message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a [eviltype] fax") + else if(href_list["Bless"]) + if(!check_rights(R_ADMIN)) + return + var/mob/living/M = locateUID(href_list["Bless"]) + if(!istype(M)) + to_chat(usr, "This can only be used on instances of type /mob/living") + return + var/btypes = list("To Arrivals", "Moderate Heal") + var/mob/living/carbon/human/H + if(ishuman(M)) + H = M + btypes += "Heal Over Time" + btypes += "Permanent Regeneration" + btypes += "Super Powers" + var/blessing = input(src.owner, "How would you like to bless [M]?", "Its good to be good...", "") as null|anything in btypes + if(!(blessing in btypes)) + return + switch(blessing) + if("To Arrivals") + M.forceMove(pick(latejoin)) + to_chat(M, "You are abruptly pulled through space!") + if("Moderate Heal") + M.adjustBruteLoss(-25) + M.adjustFireLoss(-25) + M.adjustToxLoss(-25) + M.adjustOxyLoss(-25) + to_chat(M,"You feel invigorated!") + if("Heal Over Time") + H.reagents.add_reagent("salglu_solution", 30) + H.reagents.add_reagent("salbutamol", 20) + H.reagents.add_reagent("spaceacillin", 20) + if("Permanent Regeneration") + H.dna.SetSEState(REGENERATEBLOCK, 1) + genemutcheck(H, REGENERATEBLOCK, null, MUTCHK_FORCED) + H.update_mutations() + if("Super Powers") + var/list/default_genes = list(REGENERATEBLOCK, NOBREATHBLOCK, COLDBLOCK) + for(var/gene in default_genes) + H.dna.SetSEState(gene, 1) + genemutcheck(H, gene, null, MUTCHK_FORCED) + H.update_mutations() + else if(href_list["Smite"]) + if(!check_rights(R_ADMIN)) + return + var/mob/living/M = locateUID(href_list["Smite"]) + var/mob/living/carbon/human/H + if(!istype(M)) + to_chat(usr, "This can only be used on instances of type /mob/living") + return + var/ptypes = list("Lightning bolt", "Fire Death", "Gib") + if(ishuman(M)) + H = M + ptypes += "Brain Damage" + ptypes += "Honk Tumor" + ptypes += "Cluwne" + ptypes += "Mutagen Cookie" + ptypes += "Hellwater Cookie" + var/punishment = input(src.owner, "How would you like to smite [M]?", "Its good to be baaaad...", "") as null|anything in ptypes + if(!(punishment in ptypes)) + return + switch(punishment) + if("Lightning bolt") + M.electrocute_act(5, "Lightning Bolt", safety=1) + playsound(get_turf(M), 'sound/magic/LightningShock.ogg', 50, 1, -1) + M.adjustFireLoss(75) + M.Weaken(5) + to_chat(M, "The gods have punished you for your sins!") + if("Brain Damage") + H.adjustBrainLoss(75) + if("Fire Death") + to_chat(M,"You feel hotter than usual. Maybe you should lowe-wait, is that your hand melting?") + var/turf/simulated/T = get_turf(M) + new /obj/effect/hotspot(T) + M.adjustFireLoss(150) + if("Honk Tumor") + if(!H.get_int_organ(/obj/item/organ/internal/honktumor)) + var/obj/item/organ/internal/organ = new /obj/item/organ/internal/honktumor + to_chat(H, "Life seems funnier, somehow.") + organ.insert(H) + if("Cluwne") + H.makeCluwne() + if("Mutagen Cookie") + var/obj/item/weapon/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/weapon/reagent_containers/food/snacks/cookie + evilcookie.reagents.add_reagent("mutagen", 10) + evilcookie.desc = "It has a faint green glow." + evilcookie.bitesize = 100 + H.drop_l_hand() + H.equip_to_slot_or_del(evilcookie, slot_l_hand) + if("Hellwater Cookie") + var/obj/item/weapon/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/weapon/reagent_containers/food/snacks/cookie + evilcookie.reagents.add_reagent("hell_water", 25) + evilcookie.desc = "Sulphur-flavored." + evilcookie.bitesize = 100 + H.drop_l_hand() + H.equip_to_slot_or_del(evilcookie, slot_l_hand) + if("Gib") + M.gib(FALSE) else if(href_list["FaxReplyTemplate"]) if(!check_rights(R_ADMIN)) return @@ -2031,7 +2145,7 @@ if(!M) to_chat(usr, "ERROR: Mob not found.") return - cmd_show_exp_panel(M.client) + cmd_mentor_show_exp_panel(M.client) else if(href_list["jumpto"]) if(!check_rights(R_ADMIN)) return @@ -3018,6 +3132,80 @@ error_viewer.showTo(usr, locate(href_list["viewruntime_backto"]), href_list["viewruntime_linear"]) else error_viewer.showTo(usr, null, href_list["viewruntime_linear"]) + + else if(href_list["add_station_goal"]) + if(!check_rights(R_EVENT)) + return + var/list/type_choices = typesof(/datum/station_goal) + var/picked = input("Choose goal type") in type_choices|null + if(!picked) + return + var/datum/station_goal/G = new picked() + if(picked == /datum/station_goal) + var/newname = input("Enter goal name:") as text|null + if(!newname) + return + G.name = newname + var/description = input("Enter [command_name()] message contents:") as message|null + if(!description) + return + G.report_message = description + message_admins("[key_name_admin(usr)] created \"[G.name]\" station goal.") + ticker.mode.station_goals += G + modify_goals() + + // Library stuff + else if(href_list["library_book_id"]) + var/isbn = sanitizeSQL(href_list["library_book_id"]) + + if(href_list["view_library_book"]) + var/DBQuery/query_view_book = dbcon.NewQuery("SELECT content, title FROM [format_table_name("library")] WHERE id=[isbn]") + if(!query_view_book.Execute()) + var/err = query_view_book.ErrorMsg() + log_game("SQL ERROR viewing book. Error : \[[err]\]\n") + return + + var/content = "" + var/title = "" + while(query_view_book.NextRow()) + content = query_view_book.item[1] + title = html_encode(query_view_book.item[2]) + + var/dat = "
"
+ dat += "[html_encode(html_to_pencode(content))]"
+ dat += "" + if(check_rights(R_ADMIN)) + msg += "[key_name_admin(C.mob)]: [C.player_age] days old
" + else + msg += "[key_name_mentor(C.mob)]: [C.player_age] days old
" if(missing_ages) to_chat(src, "Some accounts did not have proper ages set in their clients. This function requires database to be present") @@ -561,36 +564,22 @@ Traitors and the like can also be revived with the previous role mostly intact. if("Yes") communications_announcement.Announce(input, customname, , , , from); if("No") - to_chat(world, "\red [from] available at all communications consoles.") - - for(var/obj/machinery/computer/communications/C in machines) - if(! (C.stat & (BROKEN|NOPOWER) ) ) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) - P.name = "[from]" - P.info = input - P.update_icon() - C.messagetitle.Add("[from]") - C.messagetext.Add(P.info) + to_chat(world, "[from] available at all communications consoles.") + print_command_report(input, from) if(type == "Centcom Report") if(!customname) customname = "Nanotrasen Update" - switch(alert("Should this be announced to the general population?",,"Yes","No")) + var/announce = alert("Should this be announced to the general population?",,"Yes","No") + switch(announce) if("Yes") command_announcement.Announce(input, customname); if("No") - to_chat(world, "\red New Nanotrasen Update available at all communication consoles.") + to_chat(world, "New Nanotrasen Update available at all communication consoles.") - for(var/obj/machinery/computer/communications/C in machines) - if(! (C.stat & (BROKEN|NOPOWER) ) ) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) - P.name = "'[command_name()] Update.'" - P.info = input - P.update_icon() - C.messagetitle.Add("[command_name()] Update") - C.messagetext.Add(P.info) + print_command_report(input, "[announce == "No" ? "Classified " : ""][command_name()] Update") // world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a communications report: [input]") @@ -892,7 +881,6 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("[key_name_admin(usr)] blanked all telecomms scripts.") feedback_add_details("admin_verb","RAT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /client/proc/toggle_ert_calling() set category = "Event" set name = "Toggle ERT" @@ -911,3 +899,19 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr, "\red ERT has been Disabled.") log_admin("Admin [key_name(src)] has disabled ERT calling.") message_admins("Admin [key_name_admin(usr)] has disabled ERT calling.", 1) + +/client/proc/modify_goals() + set category = "Event" + set name = "Modify Station Goals" + + if(!check_rights(R_EVENT)) + return + + holder.modify_goals() + +/datum/admins/proc/modify_goals() + var/dat = "" + for(var/datum/station_goal/S in ticker.mode.station_goals) + dat += "[S.name] - Announce | Remove
" + dat += "
Add New Goal" + usr << browse(dat, "window=goals;size=400x400") \ No newline at end of file diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm deleted file mode 100644 index 1da3d3bfc55..00000000000 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ /dev/null @@ -1,79 +0,0 @@ -/obj/machinery/computer/artillerycontrol - name = "bluespace artillery control" - icon_screen = "accelerator" - icon_keyboard = "accelerator_key" - icon_state = "computer-wires" - req_access = list(access_cent_commander) - var/last_fire = 0 - var/reload_cooldown = 180 // 3 minute cooldown - var/area/targetarea - - light_color = LIGHT_COLOR_LIGHTBLUE - -/obj/machinery/computer/artillerycontrol/attack_ai(user as mob) - to_chat(user, "Access denied.") - return - -/obj/machinery/computer/artillerycontrol/attack_hand(user as mob) - ui_interact(user) - -/obj/machinery/computer/artillerycontrol/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "bluespace_artillery.tmpl", "Bluespace Control", 400, 260) - ui.open() - ui.set_auto_update(1) - -/obj/machinery/computer/artillerycontrol/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) - var/data[0] - - var/time_to_wait = round(reload_cooldown - ((world.time / 10) - last_fire), 1) - var/mins = round(time_to_wait / 60) - var/seconds = time_to_wait - (60*mins) - data["reloadtime_mins"] = mins - data["reloadtime_secs"] = (seconds < 10) ? "0[seconds]" : seconds - if(targetarea) - var/areaname = sanitize(targetarea.name) - data["target"] = "Locked on to [areaname]" - else - data["target"] = "No Lock" - - return data - -/obj/machinery/computer/artillerycontrol/Topic(href, href_list) - if(..()) - return 1 - - if(href_list["area"]) - var/A - A = input("Select the target area.", "Select Area", A) in ghostteleportlocs|null - var/area/thearea = ghostteleportlocs[A] - if(..() || !istype(thearea)) - return - - targetarea = thearea - - if(href_list["fire"]) - var/delta = (world.time / 10) - last_fire - if(reload_cooldown > delta) - return 1 - - event_announcement.Announce("Bluespace artillery fire detected. Brace for impact.") - message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1) - var/list/L = list() - for(var/turf/T in get_area_turfs(targetarea.type)) - L += T - var/loc = pick(L) - explosion(loc,2,5,11) - last_fire = world.time / 10 - - nanomanager.update_uis(src) - -/obj/structure/artilleryplaceholder - name = "artillery" - icon = 'icons/obj/machines/artillery.dmi' - anchored = 1 - density = 1 - -/obj/structure/artilleryplaceholder/decorative - density = 0 diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index a5e64a29c7f..7313de43815 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -335,6 +335,7 @@ world.update_status() if(holder) + on_holder_add() add_admin_verbs() admin_memo_output("Show", 0, 1) @@ -408,10 +409,12 @@ if(IsGuestKey(key)) return + establish_db_connection() if(!dbcon.IsConnected()) return + var/DBQuery/query = dbcon.NewQuery("SELECT id, datediff(Now(),firstseen) as age FROM [format_table_name("player")] WHERE ckey = '[ckey]'") query.Execute() var/sql_id = 0 @@ -421,6 +424,7 @@ player_age = text2num(query.item[2]) break + var/DBQuery/query_ip = dbcon.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE ip = '[address]'") query_ip.Execute() related_accounts_ip = list() @@ -428,6 +432,7 @@ if(ckey != query_ip.item[1]) related_accounts_ip.Add("[query_ip.item[1]]") + var/DBQuery/query_cid = dbcon.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE computerid = '[computer_id]'") query_cid.Execute() related_accounts_cid = list() @@ -435,6 +440,7 @@ if(ckey != query_cid.item[1]) related_accounts_cid.Add("[query_cid.item[1]]") + var/admin_rank = "Player" if(holder) admin_rank = holder.rank @@ -443,15 +449,18 @@ if(check_randomizer(connectiontopic)) return + //Log all the alts if(related_accounts_cid.len) log_access("Alts: [key_name(src)]:[jointext(related_accounts_cid, " - ")]") + var/watchreason = check_watchlist(ckey) if(watchreason) message_admins("Notice: [key_name_admin(src)] is on the watchlist and has just connected - Reason: [watchreason]") send2irc(config.admin_notify_irc, "Watchlist - [key_name(src)] is on the watchlist and has just connected - Reason: [watchreason]") + //Just the standard check to see if it's actually a number if(sql_id) if(istext(sql_id)) @@ -467,17 +476,24 @@ if(sql_id) //Player already identified previously, we need to just update the 'lastseen', 'ip' and 'computer_id' variables var/DBQuery/query_update = dbcon.NewQuery("UPDATE [format_table_name("player")] SET lastseen = Now(), ip = '[sql_ip]', computerid = '[sql_computerid]', lastadminrank = '[sql_admin_rank]' WHERE id = [sql_id]") - query_update.Execute() + if(!query_update.Execute()) + var/err = query_update.ErrorMsg() + log_game("SQL ERROR during log_client_to_db (update). Error : \[[err]\]\n") + message_admins("SQL ERROR during log_client_to_db (update). Error : \[[err]\]\n") else //New player!! Need to insert all the stuff var/DBQuery/query_insert = dbcon.NewQuery("INSERT INTO [format_table_name("player")] (id, ckey, firstseen, lastseen, ip, computerid, lastadminrank) VALUES (null, '[ckey]', Now(), Now(), '[sql_ip]', '[sql_computerid]', '[sql_admin_rank]')") - query_insert.Execute() + if(!query_insert.Execute()) + var/err = query_insert.ErrorMsg() + log_game("SQL ERROR during log_client_to_db (insert). Error : \[[err]\]\n") + message_admins("SQL ERROR during log_client_to_db (insert). Error : \[[err]\]\n") //Logging player access var/serverip = "[world.internet_address]:[world.port]" var/DBQuery/query_accesslog = dbcon.NewQuery("INSERT INTO `[format_table_name("connection_log")]`(`id`,`datetime`,`serverip`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),'[serverip]','[ckey]','[sql_ip]','[sql_computerid]');") query_accesslog.Execute() + #undef TOPIC_SPAM_DELAY #undef UPLOAD_LIMIT #undef MIN_CLIENT_VERSION diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 764e88f02fa..15af19c19e4 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -95,6 +95,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/UI_style_alpha = 255 var/windowflashing = TRUE + //ghostly preferences + var/ghost_anonsay = 0 //character preferences var/real_name //our character's name @@ -283,6 +285,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Species: [species]
" if(species == "Vox") dat += "N2 Tank: [speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"]
" + if(species == "Grey") + dat += "Voice: [speciesprefs ? "Wingdings" : "Normal"]
" dat += "Secondary Language: [language]
" dat += "Blood Type: [b_type]
" if(species in list("Human", "Drask", "Vox")) @@ -444,6 +448,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
" dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]
" dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]
" + dat += "Deadchat anonymity: [ghost_anonsay ? "Anonymous" : "Not Anonymous"]
" dat += "
Special Role Settings
" @@ -1334,6 +1339,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts b_skin = 0 alt_head = "None" //No alt heads on species that don't have them. + speciesprefs = 0 //My Vox tank shouldn't change how my future Grey talks. body_accessory = null //no vulptail on humans damnit @@ -1994,6 +2000,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if("ghost_radio") toggles ^= CHAT_GHOSTRADIO + if("ghost_anonsay") + ghost_anonsay = !ghost_anonsay + if("save") save_preferences(user) save_character(user) @@ -2040,6 +2049,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.add_language(language) + character.real_name = real_name character.dna.real_name = real_name character.name = character.real_name diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index f00c9f5d735..a945af5ba2f 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -14,8 +14,9 @@ nanoui_fancy, show_ghostitem_attack, lastchangelog, - exp, - windowflashing + windowflashing, + ghost_anonsay, + exp FROM [format_table_name("player")] WHERE ckey='[C.ckey]'"} ) @@ -42,8 +43,9 @@ nanoui_fancy = text2num(query.item[11]) show_ghostitem_attack = text2num(query.item[12]) lastchangelog = query.item[13] - exp = query.item[14] - windowflashing = text2num(query.item[15]) + windowflashing = text2num(query.item[14]) + ghost_anonsay = text2num(query.item[15]) + exp = query.item[16] //Sanitize ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor)) @@ -58,8 +60,9 @@ nanoui_fancy = sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy)) show_ghostitem_attack = sanitize_integer(show_ghostitem_attack, 0, 1, initial(show_ghostitem_attack)) lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) - exp = sanitize_text(exp, initial(exp)) windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing)) + ghost_anonsay = sanitize_integer(ghost_anonsay, 0, 1, initial(ghost_anonsay)) + exp = sanitize_text(exp, initial(exp)) return 1 /datum/preferences/proc/save_preferences(client/C) @@ -84,7 +87,9 @@ volume='[volume]', nanoui_fancy='[nanoui_fancy]', show_ghostitem_attack='[show_ghostitem_attack]', - lastchangelog='[lastchangelog]' + lastchangelog='[lastchangelog]', + windowflashing='[windowflashing]', + ghost_anonsay='[ghost_anonsay]' WHERE ckey='[C.ckey]'"} ) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 00bd068e067..140b5f1a999 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -327,8 +327,8 @@ flash_protect = 0 tint = 0 var/mob/living/carbon/user = usr - user.update_inv_glasses() user.update_tint() + user.update_inv_glasses() for(var/X in actions) var/datum/action/A = X @@ -492,4 +492,4 @@ else to_chat(user, "The eye winks at you and vanishes into the abyss, you feel really unlucky.") qdel(src) - ..() \ No newline at end of file + ..() \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 88638abde76..6cfce8c0051 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -383,7 +383,7 @@ /obj/item/clothing/head/griffin/proc/caw() if(cooldown < world.time - 20) // A cooldown, to stop people being jerks - playsound(src.loc, "sound/misc/caw.ogg", 50, 1) + playsound(src.loc, 'sound/misc/caw.ogg', 50, 1) cooldown = world.time diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 67e4f697eff..4d9970adba3 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -67,9 +67,9 @@ to_chat(usr, "You push the [src] up out of your face.") flash_protect = 0 tint = 0 - var/mob/living/carbon/C = usr - C.update_tint() - usr.update_inv_head() //so our mob-overlays update + var/mob/living/carbon/user = usr + user.update_tint() + user.update_inv_head() //so our mob-overlays update for(var/X in actions) var/datum/action/A = X diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index e539b2cae77..ccf9552a5e6 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -52,7 +52,9 @@ to_chat(usr, "You push the [src] up out of your face.") flash_protect = 0 tint = 0 - usr.update_inv_wear_mask() //so our mob-overlays update + var/mob/living/carbon/user = usr + user.update_tint() + user.update_inv_wear_mask() //so our mob-overlays update for(var/X in actions) var/datum/action/A = X @@ -182,7 +184,7 @@ /obj/item/clothing/mask/gas/owl_mask/proc/hoot() if(cooldown < world.time - 35) // A cooldown, to stop people being jerks - playsound(src.loc, "sound/misc/hoot.ogg", 50, 1) + playsound(src.loc, 'sound/misc/hoot.ogg', 50, 1) cooldown = world.time // ******************************************************************** diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm index 6f62a7eecac..e457d73fb87 100644 --- a/code/modules/detective_work/evidence.dm +++ b/code/modules/detective_work/evidence.dm @@ -40,8 +40,7 @@ if(!isturf(I.loc)) //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up. if(istype(I.loc,/obj/item/weapon/storage)) //in a container. var/obj/item/weapon/storage/U = I.loc - user.client.screen -= I - U.contents.Remove(I) + U.remove_from_storage(I, src) else if(user.l_hand == I) //in a hand user.drop_l_hand() else if(user.r_hand == I) //in a hand @@ -59,6 +58,7 @@ I.pixel_x = 0 //then remove it so it'll stay within the evidence bag I.pixel_y = 0 var/image/img = image("icon"=I, "layer"=FLOAT_LAYER) //take a snapshot. (necessary to stop the underlays appearing under our inventory-HUD slots ~Carn + img.plane = FLOAT_PLANE I.pixel_x = xx //and then return it I.pixel_y = yy overlays += img @@ -69,7 +69,7 @@ w_class = I.w_class return 1 -/obj/item/weapon/evidencebag/attack_self(mob/user as mob) +/obj/item/weapon/evidencebag/attack_self(mob/user) if(contents.len) var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\ @@ -83,17 +83,16 @@ else to_chat(user, "[src] is empty.") icon_state = "evidenceobj" - return /obj/item/weapon/storage/box/evidence name = "evidence bag box" desc = "A box claiming to contain evidence bags." - New() - new /obj/item/weapon/evidencebag(src) - new /obj/item/weapon/evidencebag(src) - new /obj/item/weapon/evidencebag(src) - new /obj/item/weapon/evidencebag(src) - new /obj/item/weapon/evidencebag(src) - new /obj/item/weapon/evidencebag(src) - ..() - return \ No newline at end of file + +/obj/item/weapon/storage/box/evidence/New() + new /obj/item/weapon/evidencebag(src) + new /obj/item/weapon/evidencebag(src) + new /obj/item/weapon/evidencebag(src) + new /obj/item/weapon/evidencebag(src) + new /obj/item/weapon/evidencebag(src) + new /obj/item/weapon/evidencebag(src) + ..() \ No newline at end of file diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index be8e7d147a2..69aeb643263 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -66,7 +66,7 @@ if(log.len && !scanning) scanning = 1 to_chat(usr, "Printing report, please wait...") - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) spawn(100) // Create our paper diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index b583c04702f..0ff4af7b405 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -335,7 +335,7 @@ log transactions to_chat(usr, "The [src.name] flashes an error on its display.") return lastprint = world.timeofday - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) var/obj/item/weapon/paper/R = new(src.loc) R.name = "Account balance: [authenticated_account.owner_name]" R.info = {"NT Automated Teller Account Statementdiff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index 6079e62c54f..620396f7da2 100644 --- a/code/modules/economy/Accounts.dm +++ b/code/modules/economy/Accounts.dm @@ -89,7 +89,7 @@ var/global/list/all_money_accounts = list() var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(source_db.loc) var/obj/item/weapon/paper/R = new /obj/item/weapon/paper(P) - playsound(source_db.loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(source_db.loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) P.wrapped = R R.name = "Account information: [M.owner_name]" diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index 44299826454..1c9291083d7 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -220,7 +220,7 @@ if("print") var/text - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) var/obj/item/weapon/paper/P = new(loc) if(detailed_account_view) P.name = "account #[detailed_account_view.account_number] details" diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 8f408767f72..bd7a25d12b3 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -26,7 +26,7 @@ linked_account = station_account /obj/item/device/eftpos/proc/print_reference() - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) + playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) var/obj/item/weapon/paper/R = new(src.loc) R.name = "Reference: [eftpos_name]" diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm index 09c6bdcf205..6baf7103338 100644 --- a/code/modules/economy/POS.dm +++ b/code/modules/economy/POS.dm @@ -201,7 +201,7 @@ var/const/POS_HEADER = {"